From 94473d636fcca4c62c7e336bf8e3a0ee39e1bb3d Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sun, 24 Nov 2024 15:05:25 +0000 Subject: [PATCH] clients updates --- ...tionProcessorACLApplicationServiceTests.cs | 42 +++++++++---------- ...ansactionProcessorACL.BusinessLogic.csproj | 10 ++--- .../Common/DockerHelper.cs | 27 ++++++++++-- ...actionProcessorACL.IntegrationTests.csproj | 20 ++++----- .../TransactionProcessorACL.Testing.csproj | 6 +-- .../Controllers/VoucherController.cs | 1 + .../TransactionProcessorACL.csproj | 2 +- TransactionProcessorACL/nlog.config | 4 +- 8 files changed, 66 insertions(+), 46 deletions(-) diff --git a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs index 7fdef23..3a09cfc 100644 --- a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs +++ b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using SimpleResults; namespace TransactionProcessorACL.BusinesssLogic.Tests { @@ -55,7 +56,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessLogonTransact { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseLogon); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync( Result.Success(TestData.TokenResponse)); ProcessLogonTransactionResponse logonResponse = await applicationService.ProcessLogonTransaction(TestData.EstateId, TestData.MerchantId, @@ -74,7 +75,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessLogonTransact { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new InvalidOperationException(TestData.InvalidOperationErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessLogonTransactionResponse logonResponse = await applicationService.ProcessLogonTransaction(TestData.EstateId, TestData.MerchantId, @@ -93,7 +94,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessLogonTransact { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new HttpRequestException(TestData.HttpRequestErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessLogonTransactionResponse logonResponse = await applicationService.ProcessLogonTransaction(TestData.EstateId, TestData.MerchantId, @@ -112,7 +113,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessLogonTransact { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new Exception(TestData.GeneralErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessLogonTransactionResponse logonResponse = await applicationService.ProcessLogonTransaction(TestData.EstateId, TestData.MerchantId, @@ -131,7 +132,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessSaleTransactionResponse saleResponse = await applicationService.ProcessSaleTransaction(TestData.EstateId, TestData.MerchantId, @@ -155,7 +156,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new InvalidOperationException(TestData.InvalidOperationErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessSaleTransactionResponse saleResponse = await applicationService.ProcessSaleTransaction(TestData.EstateId, TestData.MerchantId, @@ -179,7 +180,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new HttpRequestException(TestData.HttpRequestErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessSaleTransactionResponse saleResponse = await applicationService.ProcessSaleTransaction(TestData.EstateId, TestData.MerchantId, @@ -203,7 +204,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new Exception(TestData.GeneralErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessSaleTransactionResponse saleResponse = await applicationService.ProcessSaleTransaction(TestData.EstateId, TestData.MerchantId, @@ -227,7 +228,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessReconciliatio { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseReconciliation); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessReconciliationResponse reconciliationResponse = await applicationService.ProcessReconciliation(TestData.EstateId, TestData.MerchantId, @@ -247,7 +248,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessReconciliatio { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new InvalidOperationException(TestData.InvalidOperationErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessReconciliationResponse reconciliationResponse = await applicationService.ProcessReconciliation(TestData.EstateId, TestData.MerchantId, @@ -267,7 +268,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessReconciliatio { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new HttpRequestException(TestData.HttpRequestErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessReconciliationResponse reconciliationResponse = await applicationService.ProcessReconciliation(TestData.EstateId, TestData.MerchantId, @@ -287,7 +288,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessReconciliatio { transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new Exception(TestData.GeneralErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); ProcessReconciliationResponse reconciliationResponse = await applicationService.ProcessReconciliation(TestData.EstateId, TestData.MerchantId, @@ -307,7 +308,7 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_VoucherRetri { this.transactionProcessorClient.Setup(v => v.GetVoucherByCode(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetVoucherResponse); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -325,7 +326,7 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_InvalidOpera { transactionProcessorClient.Setup(v => v.GetVoucherByCode(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new InvalidOperationException(TestData.InvalidOperationErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -339,7 +340,7 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_HttpRequestE { transactionProcessorClient.Setup(v => v.GetVoucherByCode(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new HttpRequestException(TestData.HttpRequestErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -353,7 +354,7 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_OtherExcepti { transactionProcessorClient.Setup(v => v.GetVoucherByCode(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new Exception(TestData.GeneralErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -367,7 +368,7 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_VoucherRe { transactionProcessorClient.Setup(v => v.RedeemVoucher(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.RedeemVoucherResponse); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -385,7 +386,7 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_InvalidOp transactionProcessorClient.Setup(v => v.RedeemVoucher(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new InvalidOperationException(TestData.InvalidOperationErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -399,7 +400,7 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_HttpReque { transactionProcessorClient.Setup(v => v.RedeemVoucher(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new HttpRequestException(TestData.HttpRequestErrorResponseMessage))); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); @@ -413,8 +414,7 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_OtherExce { transactionProcessorClient.Setup(v => v.RedeemVoucher(It.IsAny(), It.IsAny(), It.IsAny())) .ThrowsAsync(new Exception("Error", new Exception(TestData.GeneralErrorResponseMessage))); - Mock securityServiceClient = new Mock(); - securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.TokenResponse); + securityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse)); RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None); diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj index 16749fc..37010e9 100644 --- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj +++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs index 6ad3e39..84f6f3d 100644 --- a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs +++ b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs @@ -1,4 +1,6 @@ -namespace TransactionProcessor.IntegrationTests.Common +using System.Linq; + +namespace TransactionProcessor.IntegrationTests.Common { using System; using System.Collections.Generic; @@ -7,6 +9,7 @@ using System.Threading.Tasks; using Client; using Ductus.FluentDocker.Builders; + using Ductus.FluentDocker.Executors; using Ductus.FluentDocker.Services; using Ductus.FluentDocker.Services.Extensions; using EstateManagement.Client; @@ -88,9 +91,23 @@ public override async Task CreateSubscriptions(){ /// Name of the scenario. public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices) { - await base.StartContainersForScenarioRun(scenarioName, dockerServices); + try { + await base.StartContainersForScenarioRun(scenarioName, dockerServices); + } + catch (Exception ex) { + var contaner = this.Containers.SingleOrDefault(c => c.Item1 == DockerServices.TransactionProcessorAcl); + if (contaner.Item2 != null) { + var logs = contaner.Item2.Logs(); + String line; + while ((line = logs.Read()) != null) + { + Console.WriteLine(line); + } + + } + } + - // Setup the base address resolvers String EstateManagementBaseAddressResolver(String api) => $"http://127.0.0.1:{this.EstateManagementPort}"; String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}"; @@ -119,9 +136,11 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do this.HttpClient.BaseAddress = new Uri(TransactionProcessorAclBaseAddressResolver(string.Empty)); this.ProjectionManagementClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings()); - + } #endregion } + + } \ No newline at end of file diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj index 978777f..01cca21 100644 --- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj +++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj @@ -7,13 +7,13 @@ - + - - - + + + - + @@ -22,12 +22,12 @@ - - - + + + - - + + all diff --git a/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj b/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj index 7632fea..ca61e7f 100644 --- a/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj +++ b/TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/TransactionProcessorACL/Controllers/VoucherController.cs b/TransactionProcessorACL/Controllers/VoucherController.cs index 977c471..87acc77 100644 --- a/TransactionProcessorACL/Controllers/VoucherController.cs +++ b/TransactionProcessorACL/Controllers/VoucherController.cs @@ -8,6 +8,7 @@ using System; using EstateManagement.Client; using JasperFx.Core; +using Shared.Results; using SimpleResults; using TransactionProcessorACL.BusinessLogic.Common; using TransactionProcessorACL.BusinessLogic.Requests; diff --git a/TransactionProcessorACL/TransactionProcessorACL.csproj b/TransactionProcessorACL/TransactionProcessorACL.csproj index 0228f83..f3b05bc 100644 --- a/TransactionProcessorACL/TransactionProcessorACL.csproj +++ b/TransactionProcessorACL/TransactionProcessorACL.csproj @@ -26,7 +26,7 @@ - + diff --git a/TransactionProcessorACL/nlog.config b/TransactionProcessorACL/nlog.config index 843531c..9d844c4 100644 --- a/TransactionProcessorACL/nlog.config +++ b/TransactionProcessorACL/nlog.config @@ -33,12 +33,12 @@ - + - +