Skip to content

correct correlation id use #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 1 commit into from
Sep 26, 2026
Merged

correct correlation id use #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions TransactionProcessing.MerchantFileProcessor/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
using HealthMonitoring.Client;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NLog;
using NLog.Extensions.Logging;
using SecurityService.Client;
using Shared.Monitoring;
using Shared.Serialisation;
using System.Reflection;
using TransactionProcessing.MerchantFileProcessor;
Expand Down
16 changes: 8 additions & 8 deletions ...actionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FileProcessor.Client" Version="2026.9.2.153" />
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.2.30" />
<PackageReference Include="FileProcessor.Client" Version="2026.9.4.161" />
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.3.34" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.2.0" />
<PackageReference Include="SecurityService.Client" Version="2026.9.2.179" />
<PackageReference Include="Shared" Version="2026.9.4" />
<PackageReference Include="Shared.Logger" Version="2026.9.4" />
<PackageReference Include="Shared.Results" Version="2026.9.4" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.2.398" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.2.1" />
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
<PackageReference Include="Shared" Version="2026.9.7" />
<PackageReference Include="Shared.Logger" Version="2026.9.7" />
<PackageReference Include="Shared.Results" Version="2026.9.7" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions TransactionProcessing.MerchantPos/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
using NLog.Extensions.Logging;
using NLog.Web;
using SecurityService.Client;
using Shared.Monitoring;
using Shared.Serialisation;
using System.Reflection;
using System.Text.Json;
using HealthMonitoring.Client;
using TransactionProcessing.MerchantPos.Persistence;
using TransactionProcessing.MerchantPos.Runtime;
Expand Down
14 changes: 7 additions & 7 deletions TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
<None Include="appsettings.development.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.2.30" />
<PackageReference Include="HealthMonitoring.Client" Version="2026.9.3.34" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
<PackageReference Include="NLog.Web.AspNetCore" Version="6.2.0" />
<PackageReference Include="SecurityService.Client" Version="2026.9.2.179" />
<PackageReference Include="Shared" Version="2026.9.4" />
<PackageReference Include="Shared.Logger" Version="2026.9.4" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.2.398" />
<PackageReference Include="TransactionProcessorACL.DataTransferObjects" Version="2026.9.2.157" />
<PackageReference Include="NLog.Web.AspNetCore" Version="6.2.1" />
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
<PackageReference Include="Shared" Version="2026.9.7" />
<PackageReference Include="Shared.Logger" Version="2026.9.7" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
<PackageReference Include="TransactionProcessorACL.DataTransferObjects" Version="2026.9.3.159" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
24 changes: 11 additions & 13 deletions TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,20 +576,18 @@ private async Task<Result> CreateMerchants(CancellationToken cancellationToken)

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

var getContractsResult = await this.TransactionProcessorClient.GetContracts(this.TokenResponse.AccessToken, this.EstateId, cancellationToken);
if (getContractsResult.IsFailed)
return ResultHelpers.CreateFailure(getContractsResult);
var getOperatorsResult = await this.TransactionProcessorClient.GetOperators(this.TokenResponse.AccessToken, this.EstateId, cancellationToken);
if (getOperatorsResult.IsFailed)
return ResultHelpers.CreateFailure(getOperatorsResult);

foreach (ContractResponse contractResponse in getContractsResult.Data) {
foreach (ContractProduct contractProduct in contractResponse.Products) {

// Create the required floats
CreateFloatForContractProductRequest request = new CreateFloatForContractProductRequest { ContractId = contractResponse.ContractId, ProductId = contractProduct.ProductId, CreateDateTime = DateTime.Now };

Result createFloatResult = await this.TransactionProcessorClient.CreateFloatForContractProduct(this.TokenResponse.AccessToken, this.EstateId, request, cancellationToken);
if (createFloatResult.IsFailed)
return ResultHelpers.CreateFailure(createFloatResult);
}
foreach (var operatorResponse in getOperatorsResult.Data)
{
// Create the required floats
CreateFloatRequest request = new CreateFloatRequest { FloatId = operatorResponse.OperatorId, CreateDateTime = DateTime.Now };

Result createFloatResult = await this.TransactionProcessorClient.CreateFloat(this.TokenResponse.AccessToken, this.EstateId, request, cancellationToken);
if (createFloatResult.IsFailed)
return ResultHelpers.CreateFailure(createFloatResult);
}

return Result.Success();
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<ItemGroup>
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
<PackageReference Include="FileProcessor.Client" Version="2026.8.1" />
<PackageReference Include="FileProcessor.Client" Version="2026.9.4.161" />
<PackageReference Include="KurrentDB.Client" Version="1.4.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.11" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.11" />
<PackageReference Include="SecurityService.Client" Version="2026.8.1" />
<PackageReference Include="Shared" Version="2026.8.3" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.8.1" />
<PackageReference Include="SecurityService.Client" Version="2026.9.3.183" />
<PackageReference Include="Shared" Version="2026.9.7" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.9.3.403" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading