Skip to content

Commit 4d3e134

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #502 from TransactionProcessing/task/#479_update_shared_nugets
Update dependencies, MediatR config, and logging setup
2 parents 2935051 + a3b7f8f commit 4d3e134

7 files changed

Lines changed: 42 additions & 74 deletions

File tree

‎EstateReportingAPI.BusinessLogic/EstateReportingAPI.BusinessLogic.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="MediatR" Version="14.0.0" />
10+
<PackageReference Include="MediatR" Version="14.1.0" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.1" />
12-
<PackageReference Include="Shared" Version="2026.2.2" />
13-
<PackageReference Include="Shared.Results" Version="2026.2.2" />
14-
<PackageReference Include="TransactionProcessor.Database" Version="2026.2.1" />
12+
<PackageReference Include="Shared" Version="2026.3.1" />
13+
<PackageReference Include="Shared.Results" Version="2026.3.1" />
14+
<PackageReference Include="TransactionProcessor.Database" Version="2026.3.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎EstateReportingAPI.Client/EstateReportingAPI.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="2026.2.2" />
10+
<PackageReference Include="ClientProxyBase" Version="2026.3.1" />
1111
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
12-
<PackageReference Include="Shared.Results" Version="2026.2.2" />
12+
<PackageReference Include="Shared.Results" Version="2026.3.1" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎EstateReportingAPI.IntegrationTests/EstateReportingAPI.IntegrationTests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
11-
<PackageReference Include="TransactionProcessor.Database" Version="2026.2.1" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
10+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
11+
<PackageReference Include="TransactionProcessor.Database" Version="2026.3.1" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.4" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.4" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
1515
<PackageReference Include="xunit" Version="2.9.3" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
@@ -22,13 +22,13 @@
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
2424
<PackageReference Include="Shouldly" Version="4.3.0" />
25-
<PackageReference Include="Shared" Version="2026.2.2" />
26-
<PackageReference Include="Shared.Logger" Version="2026.2.2" />
27-
<PackageReference Include="Shared.IntegrationTesting" Version="2026.2.2" />
25+
<PackageReference Include="Shared" Version="2026.3.1" />
26+
<PackageReference Include="Shared.Logger" Version="2026.3.1" />
27+
<PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
2828
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
29-
<PackageReference Include="NLog" Version="6.1.0" />
30-
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.1" />
31-
<PackageReference Include="SecurityService.Client" Version="2026.2.1" />
29+
<PackageReference Include="NLog" Version="6.1.1" />
30+
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.2" />
31+
<PackageReference Include="SecurityService.Client" Version="2026.2.3" />
3232
<PackageReference Include="Lamar" Version="15.0.1" />
3333
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
3434

‎EstateReportingAPI.Tests/EstateReportingAPI.Tests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.4" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.4" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.4" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.4" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.4">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
2020
<PackageReference Include="Moq" Version="4.20.72" />
2121
<PackageReference Include="Shouldly" Version="4.3.0" />
22-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
23-
<PackageReference Include="TransactionProcessor.Database" Version="2026.2.1" />
22+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
23+
<PackageReference Include="TransactionProcessor.Database" Version="2026.3.1" />
2424
<PackageReference Include="xunit" Version="2.9.3" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2626
<PrivateAssets>all</PrivateAssets>

‎EstateReportingAPI/Bootstrapper/MediatorRegistry.cs‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,15 @@
55
using SimpleResults;
66
using System.Diagnostics.CodeAnalysis;
77
using EstateReportingAPI.BusinessLogic.Queries;
8+
using Shared.General;
89

910
namespace EstateReportingAPI.Bootstrapper;
1011

1112
[ExcludeFromCodeCoverage]
1213
public class MediatorRegistry : ServiceRegistry {
1314
public MediatorRegistry() {
14-
this.AddTransient<IMediator, Mediator>();
15-
16-
this.AddSingleton<IRequestHandler<EstateQueries.GetEstateQuery, Result<Estate>>, EstateRequestHandler >();
17-
this.AddSingleton<IRequestHandler<EstateQueries.GetEstateOperatorsQuery, Result<List<EstateOperator>>>, EstateRequestHandler>();
18-
19-
this.AddSingleton<IRequestHandler<OperatorQueries.GetOperatorsQuery, Result<List<Operator>>>, OperatorRequestHandler>();
20-
this.AddSingleton<IRequestHandler<OperatorQueries.GetOperatorQuery, Result<Operator>>, OperatorRequestHandler>();
21-
22-
this.AddSingleton<IRequestHandler<TransactionQueries.TodaysSalesQuery, Result<TodaysSales>>, TransactionRequestHandler>();
23-
this.AddSingleton<IRequestHandler<TransactionQueries.TodaysFailedSales, Result<TodaysSales>>, TransactionRequestHandler>();
24-
this.AddSingleton<IRequestHandler<TransactionQueries.TransactionDetailReportQuery, Result<TransactionDetailReportResponse>>, TransactionRequestHandler>();
25-
this.AddSingleton<IRequestHandler<TransactionQueries.TransactionSummaryByMerchantQuery, Result<TransactionSummaryByMerchantResponse>>, TransactionRequestHandler>();
26-
this.AddSingleton<IRequestHandler<TransactionQueries.TransactionSummaryByOperatorQuery, Result<TransactionSummaryByOperatorResponse>>, TransactionRequestHandler>();
27-
this.AddSingleton<IRequestHandler<TransactionQueries.ProductPerformanceQuery, Result<ProductPerformanceResponse>>, TransactionRequestHandler>();
28-
this.AddSingleton<IRequestHandler<TransactionQueries.TodaysSalesByHour, Result<List<TodaysSalesByHour>>>, TransactionRequestHandler>();
29-
30-
this.AddSingleton<IRequestHandler<SettlementQueries.TodaysSettlementQuery, Result<TodaysSettlement>>,SettlementRequestHandler>();
31-
32-
33-
this.AddSingleton<IRequestHandler<CalendarQueries.GetYearsQuery, Result<List<Int32>>>, CalendarRequestHandler>();
34-
this.AddSingleton<IRequestHandler<CalendarQueries.GetAllDatesQuery, Result<List<Calendar>>>, CalendarRequestHandler>();
35-
this.AddSingleton<IRequestHandler<CalendarQueries.GetComparisonDatesQuery, Result<List<Calendar>>>, CalendarRequestHandler>();
36-
37-
this.AddSingleton<IRequestHandler<MerchantQueries.GetRecentMerchantsQuery, Result<List<Merchant>>>, MerchantRequestHandler>();
38-
this.AddSingleton<IRequestHandler<MerchantQueries.GetTransactionKpisQuery, Result<MerchantKpi>>, MerchantRequestHandler>();
39-
this.AddSingleton<IRequestHandler<MerchantQueries.GetMerchantsQuery, Result<List<Merchant>>>, MerchantRequestHandler>();
40-
this.AddSingleton<IRequestHandler<MerchantQueries.GetMerchantQuery, Result<Merchant>>, MerchantRequestHandler>();
41-
this.AddSingleton<IRequestHandler<MerchantQueries.GetMerchantContractsQuery, Result<List<MerchantContract>>>, MerchantRequestHandler>();
42-
this.AddSingleton<IRequestHandler<MerchantQueries.GetMerchantOperatorsQuery, Result<List<MerchantOperator>>>, MerchantRequestHandler>();
43-
this.AddSingleton<IRequestHandler<MerchantQueries.GetMerchantDevicesQuery, Result<List<MerchantDevice>>>, MerchantRequestHandler>();
44-
45-
this.AddSingleton<IRequestHandler<ContractQueries.GetRecentContractsQuery, Result<List<Contract>>>, ContractRequestHandler>();
46-
this.AddSingleton<IRequestHandler<ContractQueries.GetContractsQuery, Result<List<Contract>>>, ContractRequestHandler>();
47-
this.AddSingleton<IRequestHandler<ContractQueries.GetContractQuery, Result<Contract>>, ContractRequestHandler>();
15+
this.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(EstateRequestHandler).Assembly));
16+
this.AddSingleton<Func<String, String>>(container => (serviceName) => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString);
4817
}
4918
}
5019

‎EstateReportingAPI/EstateReportingAPI.csproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@
1010

1111
<ItemGroup>
1212

13-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
13+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.4" />
1414
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
15-
<PackageReference Include="Shared.Results" Version="2026.2.2" />
16-
<PackageReference Include="Shared.Results.Web" Version="2026.2.2" />
15+
<PackageReference Include="Shared.Results" Version="2026.3.1" />
16+
<PackageReference Include="Shared.Results.Web" Version="2026.3.1" />
1717
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
2121
<PackageReference Include="Lamar" Version="15.0.1" />
2222
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
23-
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.1" />
24-
<PackageReference Include="Shared" Version="2026.2.2" />
23+
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.2" />
24+
<PackageReference Include="Shared" Version="2026.3.1" />
2525
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
2626
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
2727
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
2828
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.3" />
30-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.3" />
31-
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
32-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.4" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.4" />
30+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.4" />
31+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
32+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.5" />
3333
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
34-
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.4" />
35-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.4" />
36-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.4" />
37-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
38-
<PackageReference Include="TransactionProcessor.Database" Version="2026.2.1" />
34+
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.5" />
35+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.5" />
36+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.5" />
37+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.4" />
38+
<PackageReference Include="TransactionProcessor.Database" Version="2026.3.1" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎EstateReportingAPI/Startup.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
5757

5858
ConfigurationReader.Initialise(Configuration);
5959
app.UseMiddleware<TenantMiddleware>();
60-
app.AddRequestLogging();
61-
app.AddResponseLogging();
60+
app.AddRequestResponseLogging();
6261
app.AddExceptionHandler();
6362

6463
app.UseRouting();

0 commit comments

Comments
 (0)