Skip to content

Commit ca72965

Browse files
StuartFergusonStuartFerguson
committed
correct correlation id use
1 parent b05380c commit ca72965

6 files changed

Lines changed: 30 additions & 37 deletions

File tree

‎TransactionProcessing.MerchantFileProcessor/Program.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
using HealthMonitoring.Client;
55
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
66
using Microsoft.EntityFrameworkCore;
7-
using Microsoft.Extensions.Hosting;
8-
using Microsoft.Extensions.Logging;
97
using NLog;
108
using NLog.Extensions.Logging;
119
using SecurityService.Client;
12-
using Shared.Monitoring;
1310
using Shared.Serialisation;
1411
using System.Reflection;
1512
using TransactionProcessing.MerchantFileProcessor;

‎TransactionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="FileProcessor.Client" Version="2026.9.2.153" />
12-
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.2.30" />
11+
<PackageReference Include="FileProcessor.Client" Version="2026.9.4.161" />
12+
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.3.34" />
1313
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
1515
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
16-
<PackageReference Include="NLog.Extensions.Logging" Version="6.2.0" />
17-
<PackageReference Include="SecurityService.Client" Version="2026.9.2.179" />
18-
<PackageReference Include="Shared" Version="2026.9.4" />
19-
<PackageReference Include="Shared.Logger" Version="2026.9.4" />
20-
<PackageReference Include="Shared.Results" Version="2026.9.4" />
21-
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.2.398" />
16+
<PackageReference Include="NLog.Extensions.Logging" Version="6.2.1" />
17+
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
18+
<PackageReference Include="Shared" Version="2026.9.7" />
19+
<PackageReference Include="Shared.Logger" Version="2026.9.7" />
20+
<PackageReference Include="Shared.Results" Version="2026.9.7" />
21+
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
2222
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
2323
</ItemGroup>
2424

‎TransactionProcessing.MerchantPos/Program.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
using NLog.Extensions.Logging;
88
using NLog.Web;
99
using SecurityService.Client;
10-
using Shared.Monitoring;
1110
using Shared.Serialisation;
1211
using System.Reflection;
13-
using System.Text.Json;
1412
using HealthMonitoring.Client;
1513
using TransactionProcessing.MerchantPos.Persistence;
1614
using TransactionProcessing.MerchantPos.Runtime;

‎TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<None Include="appsettings.development.json" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.2.30" />
11+
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.3.34" />
1212
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
1313
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
15-
<PackageReference Include="NLog.Web.AspNetCore" Version="6.2.0" />
16-
<PackageReference Include="SecurityService.Client" Version="2026.9.2.179" />
17-
<PackageReference Include="Shared" Version="2026.9.4" />
18-
<PackageReference Include="Shared.Logger" Version="2026.9.4" />
19-
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.2.398" />
20-
<PackageReference Include="TransactionProcessorACL.DataTransferObjects" Version="2026.9.2.157" />
15+
<PackageReference Include="NLog.Web.AspNetCore" Version="6.2.1" />
16+
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
17+
<PackageReference Include="Shared" Version="2026.9.7" />
18+
<PackageReference Include="Shared.Logger" Version="2026.9.7" />
19+
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
20+
<PackageReference Include="TransactionProcessorACL.DataTransferObjects" Version="2026.9.3.159" />
2121
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
2222
</ItemGroup>
2323
<ItemGroup>

‎TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -576,20 +576,18 @@ private async Task<Result> CreateMerchants(CancellationToken cancellationToken)
576576

577577
private async Task<Result> CreateFloats(CancellationToken cancellationToken) {
578578

579-
var getContractsResult = await this.TransactionProcessorClient.GetContracts(this.TokenResponse.AccessToken, this.EstateId, cancellationToken);
580-
if (getContractsResult.IsFailed)
581-
return ResultHelpers.CreateFailure(getContractsResult);
579+
var getOperatorsResult = await this.TransactionProcessorClient.GetOperators(this.TokenResponse.AccessToken, this.EstateId, cancellationToken);
580+
if (getOperatorsResult.IsFailed)
581+
return ResultHelpers.CreateFailure(getOperatorsResult);
582582

583-
foreach (ContractResponse contractResponse in getContractsResult.Data) {
584-
foreach (ContractProduct contractProduct in contractResponse.Products) {
585-
586-
// Create the required floats
587-
CreateFloatForContractProductRequest request = new CreateFloatForContractProductRequest { ContractId = contractResponse.ContractId, ProductId = contractProduct.ProductId, CreateDateTime = DateTime.Now };
588-
589-
Result createFloatResult = await this.TransactionProcessorClient.CreateFloatForContractProduct(this.TokenResponse.AccessToken, this.EstateId, request, cancellationToken);
590-
if (createFloatResult.IsFailed)
591-
return ResultHelpers.CreateFailure(createFloatResult);
592-
}
583+
foreach (var operatorResponse in getOperatorsResult.Data)
584+
{
585+
// Create the required floats
586+
CreateFloatRequest request = new CreateFloatRequest { FloatId = operatorResponse.OperatorId, CreateDateTime = DateTime.Now };
587+
588+
Result createFloatResult = await this.TransactionProcessorClient.CreateFloat(this.TokenResponse.AccessToken, this.EstateId, request, cancellationToken);
589+
if (createFloatResult.IsFailed)
590+
return ResultHelpers.CreateFailure(createFloatResult);
593591
}
594592

595593
return Result.Success();

‎TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
24-
<PackageReference Include="FileProcessor.Client" Version="2026.8.1" />
24+
<PackageReference Include="FileProcessor.Client" Version="2026.9.4.161" />
2525
<PackageReference Include="KurrentDB.Client" Version="1.4.1" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.11" />
2727
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.11" />
28-
<PackageReference Include="SecurityService.Client" Version="2026.8.1" />
29-
<PackageReference Include="Shared" Version="2026.8.3" />
30-
<PackageReference Include="TransactionProcessor.Client" Version="2026.8.1" />
28+
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
29+
<PackageReference Include="Shared" Version="2026.9.7" />
30+
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

0 commit comments

Comments
 (0)