From ca72965d320f3f9d28cb279482c286dbbc24e208 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Sat, 26 Sep 2026 21:49:49 +0100 Subject: [PATCH] correct correlation id use --- .../Program.cs | 3 --- ...ionProcessing.MerchantFileProcessor.csproj | 16 ++++++------- TransactionProcessing.MerchantPos/Program.cs | 2 -- .../TransactionProcessing.MerchantPos.csproj | 14 +++++------ .../EstateSetupFunctions.cs | 24 +++++++++---------- ...ransactionProcessor.SystemSetupTool.csproj | 8 +++---- 6 files changed, 30 insertions(+), 37 deletions(-) diff --git a/TransactionProcessing.MerchantFileProcessor/Program.cs b/TransactionProcessing.MerchantFileProcessor/Program.cs index 64bf25b..11e78e1 100644 --- a/TransactionProcessing.MerchantFileProcessor/Program.cs +++ b/TransactionProcessing.MerchantFileProcessor/Program.cs @@ -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; diff --git a/TransactionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj b/TransactionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj index 03e7022..64f3854 100644 --- a/TransactionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj +++ b/TransactionProcessing.MerchantFileProcessor/TransactionProcessing.MerchantFileProcessor.csproj @@ -8,17 +8,17 @@ - - + + - - - - - - + + + + + + diff --git a/TransactionProcessing.MerchantPos/Program.cs b/TransactionProcessing.MerchantPos/Program.cs index bc75f21..5685741 100644 --- a/TransactionProcessing.MerchantPos/Program.cs +++ b/TransactionProcessing.MerchantPos/Program.cs @@ -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; diff --git a/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj b/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj index 32844a7..42de799 100644 --- a/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj +++ b/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj @@ -8,16 +8,16 @@ - + - - - - - - + + + + + + diff --git a/TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs b/TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs index 25dd0e3..cb07ab7 100644 --- a/TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs +++ b/TransactionProcessor.SystemSetupTool/EstateSetupFunctions.cs @@ -576,20 +576,18 @@ private async Task CreateMerchants(CancellationToken cancellationToken) private async Task 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(); diff --git a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj index eed14eb..7516ab9 100644 --- a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj +++ b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj @@ -21,13 +21,13 @@ - + - - - + + +