diff --git a/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs b/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs index a00845d..58ad214 100644 --- a/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs +++ b/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs @@ -5,13 +5,13 @@ using System.Threading.Tasks; using FileProcessor.Models; using SimpleResults; +using TransactionProcessor.Database.Contexts; +using TransactionProcessor.Database.Entities; namespace FileProcessor.BusinessLogic.Tests { using System.Threading; using Common; - using EstateManagement.Database.Contexts; - using EstateManagement.Database.Entities; using FileAggregate; using FileProcessor.Models; using Managers; @@ -319,19 +319,19 @@ private void VerifyFile(FileAggregate source, Result fileDetails) } } - private void VerifyImportLogs(List source, Result> importLogs, Guid? merchantId = null) + private void VerifyImportLogs(List source, Result> importLogs, Guid? merchantId = null) { importLogs.Data.ShouldNotBeNull(); importLogs.Data.ShouldNotBeEmpty(); importLogs.Data.Count.ShouldBe(TestData.FileImportLogs.Count); - foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in source) + foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in source) { var importLog = importLogs.Data.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId); VerifyImportLog(fileImportLog, importLog, merchantId); } } - private void VerifyImportLog(EstateManagement.Database.Entities.FileImportLog source, Result importLog, Guid? merchantId = null) + private void VerifyImportLog(TransactionProcessor.Database.Entities.FileImportLog source, Result importLog, Guid? merchantId = null) { importLog.Data.ShouldNotBeNull(); importLog.Data.FileImportLogDateTime.ShouldBe(source.ImportLogDateTime); diff --git a/FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs b/FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs index 6f9ef4c..9c7e889 100644 --- a/FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs +++ b/FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs @@ -1,5 +1,6 @@ -using EstateManagement.DataTransferObjects.Responses.Operator; -using SimpleResults; +using SimpleResults; +using TransactionProcessor.DataTransferObjects.Responses.Contract; +using TransactionProcessor.DataTransferObjects.Responses.Operator; namespace FileProcessor.BusinessLogic.Tests; @@ -10,8 +11,6 @@ namespace FileProcessor.BusinessLogic.Tests; using System.IO.Abstractions.TestingHelpers; using System.Threading; using System.Threading.Tasks; -using EstateManagement.Client; -using EstateManagement.DataTransferObjects.Responses.Contract; using FileAggregate; using FileFormatHandlers; using FileImportLogAggregate; @@ -41,9 +40,7 @@ public class FileProcessorDomainServiceTests private Mock> FileAggregateRepository; private Mock TransactionProcessorClient; - - private Mock EstateClient; - + private Mock SecurityServiceClient; private Mock FileFormatHandler; @@ -64,7 +61,6 @@ public FileProcessorDomainServiceTests() this.FileAggregateRepository = new Mock>(); this.TransactionProcessorClient = new Mock(); - this.EstateClient = new Mock(); this.SecurityServiceClient = new Mock(); this.FileFormatHandler = new Mock(); this.FileSystem = new MockFileSystem(); @@ -78,7 +74,6 @@ public FileProcessorDomainServiceTests() this.FileImportLogAggregateRepository.Object, this.FileAggregateRepository.Object, this.TransactionProcessorClient.Object, - this.EstateClient.Object, this.SecurityServiceClient.Object, fileFormatHandlerResolver, this.FileSystem); @@ -230,7 +225,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_RequestIsHandled this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -251,7 +246,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileNotFound_Req this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -273,7 +268,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_NoFileProfiles_R this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -296,7 +291,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_GetFileProfileFa this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -319,7 +314,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_NoOperatorsFound this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.NotFound()); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.NotFound()); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -341,7 +336,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_ProfileOperatorN this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(new List())); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(new List())); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -362,7 +357,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_NullOperatorList this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.NotFound()); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.NotFound()); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsFailed.ShouldBeTrue(); @@ -385,7 +380,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_ProcessedDirecto this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -408,7 +403,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FailedDirectoryN this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -433,7 +428,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileIsEmpty_Requ this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -459,7 +454,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileIsInFailedFo this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -485,7 +480,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileIsInProcesse this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); - this.EstateClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); + this.TransactionProcessorClient.Setup(e => e.GetOperators(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(TestData.OperatorList); Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); @@ -508,10 +503,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Reques this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -537,10 +532,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_SaveFa this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -566,10 +561,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Except this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -594,10 +589,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_WithOp this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -695,10 +690,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_FileLi this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -720,10 +715,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_EmptyF this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success( TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -742,10 +737,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_FilePa this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -755,7 +750,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_FilePa var result = await this.FileProcessorDomainService.ProcessTransactionForFileLine(TestData.ProcessTransactionForFileLineCommand, CancellationToken.None); result.IsSuccess.ShouldBeTrue(); - this.EstateClient.Verify(f => f.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); + this.TransactionProcessorClient.Verify(f => f.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } [Fact] @@ -768,10 +763,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Mercha this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient + this.TransactionProcessorClient .Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.NotFound()); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -794,10 +789,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_NoMerc this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.NotFound()); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -820,10 +815,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_EmptyM this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(new List())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -846,10 +841,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Contra this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(new List { new ContractResponse { OperatorName = "Other Operator" @@ -876,10 +871,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_NoMerc this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.NotFound()); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -902,10 +897,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Mercha this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponseNoNullValueProduct())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -928,10 +923,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Transa this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Failure()); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); @@ -954,10 +949,10 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Transa this.TransactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.SerialisedMessageResponseFailedSale); - this.EstateClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchant(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(TestData.GetMerchantResponseWithOperator); - this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + this.TransactionProcessorClient.Setup(e => e.GetMerchantContracts(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse())); this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(TestData.TokenResponse())); diff --git a/FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs b/FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs index 6a373a2..ea679f2 100644 --- a/FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs +++ b/FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs @@ -1,13 +1,13 @@ -namespace FileProcessor.BusinessLogic.Tests{ +using FileProcessor.Models; +using TransactionProcessor.Database.Entities; + +namespace FileProcessor.BusinessLogic.Tests{ using System.Collections.Generic; using System.Linq; using Common; - using EstateManagement.Database.Entities; - using FileProcessor.Models; using Shouldly; using Testing; using Xunit; - using FileImportLog = EstateManagement.Database.Entities.FileImportLog; public class ModelFactoryTests{ #region Methods @@ -15,7 +15,7 @@ public class ModelFactoryTests{ [Fact] public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){ IModelFactory modelFactory = new ModelFactory(); - List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant)); FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files); this.VerifyImportLog(TestData.FileImportLogs.First(), files, result); @@ -24,7 +24,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){ [Fact] public void ModelFactory_ConvertFrom_FileImportLog_NoFiles_IsConverted(){ IModelFactory modelFactory = new ModelFactory(); - List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files); this.VerifyImportLog(TestData.FileImportLogs.First(), files, result); @@ -33,8 +33,8 @@ public void ModelFactory_ConvertFrom_FileImportLog_NoFiles_IsConverted(){ [Fact] public void ModelFactory_ConvertFrom_FileImportLog_NoImportLogs_IsConverted(){ IModelFactory modelFactory = new ModelFactory(); - List fileImportLogs = new List(); - List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>(); + List fileImportLogs = new List(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); List result = modelFactory.ConvertFrom(TestData.EstateId, fileImportLogs, files); @@ -45,7 +45,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_NoImportLogs_IsConverted(){ [Fact] public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){ IModelFactory modelFactory = new ModelFactory(); - List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant)); files.Add((TestData.FileImportLog1Files[1], TestData.Files1[1], TestData.Merchant)); List result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files); @@ -56,18 +56,18 @@ public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){ [Fact] public void ModelFactory_ConvertFrom_FileImportLogs_NoFiles_IsConverted(){ IModelFactory modelFactory = new ModelFactory(); - List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); List result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files); this.VerifyImportLogs(TestData.FileImportLogs, files, result); } - private void VerifyImportLog(FileImportLog sourceImportLog, List<(FileImportLogFile, File, Merchant)> sourceFiles, FileProcessor.Models.FileImportLog importLog){ + private void VerifyImportLog(TransactionProcessor.Database.Entities.FileImportLog sourceImportLog, List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceFiles, FileProcessor.Models.FileImportLog importLog){ importLog.ShouldNotBeNull(); importLog.FileImportLogDateTime.ShouldBe(sourceImportLog.ImportLogDateTime); importLog.Files.Count.ShouldBe(sourceFiles.Count); - foreach ((FileImportLogFile, File, Merchant) sourceFile in sourceFiles){ + foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant) sourceFile in sourceFiles){ ImportLogFile file = importLog.Files.SingleOrDefault(impfile => impfile.FileId == sourceFile.Item2.FileId); file.ShouldNotBeNull(); file.MerchantId.ShouldBe(sourceFile.Item3.MerchantId); @@ -78,13 +78,13 @@ private void VerifyImportLog(FileImportLog sourceImportLog, List<(FileImportLogF } } - private void VerifyImportLogs(List sourceImportLogs, List<(FileImportLogFile, File, Merchant)> sourceImportLogFiles, List importLogs){ + private void VerifyImportLogs(List sourceImportLogs, List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceImportLogFiles, List importLogs){ importLogs.ShouldNotBeNull(); importLogs.ShouldNotBeEmpty(); importLogs.Count.ShouldBe(TestData.FileImportLogs.Count); - foreach (FileImportLog fileImportLog in sourceImportLogs){ + foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in sourceImportLogs){ FileProcessor.Models.FileImportLog importLog = importLogs.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId); - List<(FileImportLogFile, File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList(); this.VerifyImportLog(fileImportLog, sourceFiles, importLog); } } diff --git a/FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs b/FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs index 47c54ba..10ce2df 100644 --- a/FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs +++ b/FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using MySqlConnector; namespace FileProcessor.BusinessLogic.Common { @@ -10,7 +11,6 @@ namespace FileProcessor.BusinessLogic.Common using System.Diagnostics.CodeAnalysis; using System.Threading; using Microsoft.Data.SqlClient; - using MySqlConnector; using Shared.General; using Shared.Repositories; diff --git a/FileProcessor.BusinessLogic/Common/IModelFactory.cs b/FileProcessor.BusinessLogic/Common/IModelFactory.cs index 66b5d8d..04bb254 100644 --- a/FileProcessor.BusinessLogic/Common/IModelFactory.cs +++ b/FileProcessor.BusinessLogic/Common/IModelFactory.cs @@ -1,8 +1,9 @@ -namespace FileProcessor.BusinessLogic.Common +using TransactionProcessor.Database.Entities; + +namespace FileProcessor.BusinessLogic.Common { using System; using System.Collections.Generic; - using EstateManagement.Database.Entities; using FileImportLogModel = FileProcessor.Models.FileImportLog; /// @@ -13,12 +14,14 @@ public interface IModelFactory #region Methods List ConvertFrom(Guid estateId, - List importLogs, - List<(FileImportLogFile, File, Merchant)> importLogFilesList); + List importLogs, + List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, + TransactionProcessor.Database.Entities.Merchant)> importLogFilesList); FileImportLogModel ConvertFrom(Guid estateId, - EstateManagement.Database.Entities.FileImportLog importLog, - List<(FileImportLogFile, File, Merchant)> importLogFilesList); + TransactionProcessor.Database.Entities.FileImportLog importLog, + List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, + TransactionProcessor.Database.Entities.Merchant)> importLogFilesList); #endregion } diff --git a/FileProcessor.BusinessLogic/Common/ModelFactory.cs b/FileProcessor.BusinessLogic/Common/ModelFactory.cs index b7dc80f..85f98b3 100644 --- a/FileProcessor.BusinessLogic/Common/ModelFactory.cs +++ b/FileProcessor.BusinessLogic/Common/ModelFactory.cs @@ -1,9 +1,10 @@ -namespace FileProcessor.BusinessLogic.Common +using TransactionProcessor.Database.Entities; + +namespace FileProcessor.BusinessLogic.Common { using System; using System.Collections.Generic; using System.Linq; - using EstateManagement.Database.Entities; using FileProcessor.Models; using FileImportLog = FileProcessor.Models.FileImportLog; @@ -22,12 +23,12 @@ public class ModelFactory : IModelFactory /// The import log files list. /// public List ConvertFrom(Guid estateId, - List importLogs, - List<(FileImportLogFile, File, Merchant)> importLogFilesList) + List importLogs, + List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList) { List models = new List(); - foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in importLogs) + foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in importLogs) { FileImportLog model = new FileImportLog(); @@ -36,9 +37,9 @@ public List ConvertFrom(Guid estateId, model.EstateId = estateId; model.Files = new List(); - IEnumerable<(FileImportLogFile, File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == fileImportLog.FileImportLogId); + IEnumerable<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == fileImportLog.FileImportLogId); - foreach ((FileImportLogFile, File, Merchant) importLogFile in currentImportLogFiles) + foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant) importLogFile in currentImportLogFiles) { model.Files.Add(new ImportLogFile { @@ -65,8 +66,8 @@ public List ConvertFrom(Guid estateId, /// The import log files list. /// public FileImportLog ConvertFrom(Guid estateId, - EstateManagement.Database.Entities.FileImportLog importLog, - List<(FileImportLogFile, File, Merchant)> importLogFilesList) + TransactionProcessor.Database.Entities.FileImportLog importLog, + List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList) { FileImportLog model = new FileImportLog(); @@ -75,9 +76,9 @@ public FileImportLog ConvertFrom(Guid estateId, model.EstateId = estateId; model.Files = new List(); - IEnumerable<(FileImportLogFile, File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == importLog.FileImportLogId); + IEnumerable<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == importLog.FileImportLogId); - foreach ((FileImportLogFile, File,Merchant) importLogFile in currentImportLogFiles) + foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant) importLogFile in currentImportLogFiles) { model.Files.Add(new ImportLogFile { diff --git a/FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs b/FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs index 518b816..ecff6dd 100644 --- a/FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs +++ b/FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs @@ -6,7 +6,6 @@ namespace FileProcessor.BusinessLogic.EventHandling { using System.Threading; - using EstateManagement.Client; using File.DomainEvents; using FileAggregate; using FileImportLog.DomainEvents; diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj index dcede87..8e7ec4c 100644 --- a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj +++ b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj @@ -5,18 +5,17 @@ - - - + + diff --git a/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs b/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs index cc1dd63..d31f608 100644 --- a/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs +++ b/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs @@ -1,6 +1,8 @@ using FileProcessor.Models; using Shared.Results; using SimpleResults; +using TransactionProcessor.Database.Contexts; +using TransactionProcessor.Database.Entities; namespace FileProcessor.BusinessLogic.Managers { @@ -11,8 +13,6 @@ namespace FileProcessor.BusinessLogic.Managers using System.Threading; using System.Threading.Tasks; using Common; - using EstateManagement.Database.Contexts; - using EstateManagement.Database.Entities; using FileAggregate; using FileProcessor.Models; using Microsoft.EntityFrameworkCore; @@ -91,8 +91,8 @@ public async Task>> GetFileImportLogs(Guid estateId, { EstateManagementGenericContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken); - List importLogQuery = - await context.FileImportLogs.AsAsyncEnumerable().Where(f => f.ImportLogDateTime >= startDateTime).ToListAsync(cancellationToken); + List importLogQuery = + await context.FileImportLogs.Where(f => f.ImportLogDateTime >= startDateTime).ToListAsync(cancellationToken); var importLogFileQuery = await context.FileImportLogFiles .Join(context.Files, @@ -109,7 +109,6 @@ public async Task>> GetFileImportLogs(Guid estateId, file, merchant }) - .AsAsyncEnumerable() .Where(fi => importLogQuery.Select(f => f.FileImportLogId).Contains(fi.file.fileImportLogFile.FileImportLogId)) .ToListAsync(cancellationToken); @@ -118,7 +117,7 @@ public async Task>> GetFileImportLogs(Guid estateId, importLogFileQuery = importLogFileQuery.Where(i => i.file.fileImportLogFile.MerchantId == merchant.MerchantId).ToList(); } - List<(FileImportLogFile, File,Merchant)> entityData = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> entityData = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); foreach (var file in importLogFileQuery){ entityData.Add((file.file.fileImportLogFile, file.file.file, file.merchant)); } @@ -134,8 +133,8 @@ public async Task> GetFileImportLog(Guid fileImportLogId, { EstateManagementGenericContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken); - EstateManagement.Database.Entities.FileImportLog importLogQuery = - await context.FileImportLogs.AsAsyncEnumerable().SingleOrDefaultAsync(f => f.FileImportLogId == fileImportLogId, cancellationToken); + TransactionProcessor.Database.Entities.FileImportLog importLogQuery = + await context.FileImportLogs.SingleOrDefaultAsync(f => f.FileImportLogId == fileImportLogId, cancellationToken); var importLogFileQuery = await context.FileImportLogFiles .Join(context.Files, @@ -152,7 +151,6 @@ public async Task> GetFileImportLog(Guid fileImportLogId, file, merchant }) - .AsAsyncEnumerable() .Where(fi => fi.file.fileImportLogFile.FileImportLogId == importLogQuery.FileImportLogId) .ToListAsync(cancellationToken); @@ -162,7 +160,7 @@ public async Task> GetFileImportLog(Guid fileImportLogId, importLogFileQuery = importLogFileQuery.Where(i => i.file.fileImportLogFile.MerchantId == merchant.MerchantId).ToList(); } - List<(FileImportLogFile, File,Merchant)> entityData = new List<(FileImportLogFile, File, Merchant)>(); + List<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> entityData = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>(); foreach (var file in importLogFileQuery) { entityData.Add((file.file.fileImportLogFile, file.file.file, file.merchant)); @@ -191,7 +189,7 @@ public async Task> GetFile(Guid fileId, EstateManagementGenericContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken); - Merchant merchant = await context.Merchants.AsAsyncEnumerable() + Merchant merchant = await context.Merchants .SingleOrDefaultAsync(m => m.MerchantId == fileDetails.MerchantId, cancellationToken); if (merchant != null) @@ -199,7 +197,7 @@ public async Task> GetFile(Guid fileId, fileDetails.MerchantName = merchant.Name; } - EstateSecurityUser userDetails = await context.EstateSecurityUsers.AsAsyncEnumerable() + EstateSecurityUser userDetails = await context.EstateSecurityUsers .SingleOrDefaultAsync(u => u.SecurityUserId == fileDetails.UserId, cancellationToken: cancellationToken); if (userDetails != null) { diff --git a/FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs b/FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs index 70db5b7..ab42d9c 100644 --- a/FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs +++ b/FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs @@ -11,8 +11,7 @@ namespace FileProcessor.BusinessLogic.RequestHandlers using Requests; using Services; using FileProcessor.BusinessLogic.Managers; - using EstateManagement.Database.Entities; - + public class FileRequestHandler : IRequestHandler, IRequestHandler, IRequestHandler>, diff --git a/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs b/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs index c93fba0..4e4a628 100644 --- a/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs +++ b/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs @@ -3,6 +3,8 @@ using FileProcessor.Models; using Shared.Results; using SimpleResults; +using TransactionProcessor.DataTransferObjects.Responses.Contract; +using TransactionProcessor.DataTransferObjects.Responses.Operator; namespace FileProcessor.BusinessLogic.Services; @@ -17,10 +19,6 @@ namespace FileProcessor.BusinessLogic.Services; using System.Threading.Tasks; using Azure.Core; using Common; -using EstateManagement.Client; -using EstateManagement.DataTransferObjects.Responses; -using EstateManagement.DataTransferObjects.Responses.Contract; -using EstateManagement.DataTransferObjects.Responses.Operator; using FileAggregate; using FileFormatHandlers; using FileImportLogAggregate; @@ -41,7 +39,6 @@ namespace FileProcessor.BusinessLogic.Services; using TransactionProcessor.DataTransferObjects; using FileDetails = FileProcessor.Models.FileDetails; using FileLine = FileProcessor.Models.FileLine; -using MerchantResponse = EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse; public class FileProcessorDomainService : IFileProcessorDomainService { @@ -53,8 +50,6 @@ public class FileProcessorDomainService : IFileProcessorDomainService private readonly ITransactionProcessorClient TransactionProcessorClient; - private readonly IEstateClient EstateClient; - private readonly ISecurityServiceClient SecurityServiceClient; private readonly Func FileFormatHandlerResolver; @@ -65,7 +60,6 @@ public FileProcessorDomainService(IFileProcessorManager fileProcessorManager, IAggregateRepository fileImportLogAggregateRepository, IAggregateRepository fileAggregateRepository, ITransactionProcessorClient transactionProcessorClient, - IEstateClient estateClient, ISecurityServiceClient securityServiceClient, Func fileFormatHandlerResolver, IFileSystem fileSystem) { @@ -73,7 +67,6 @@ public FileProcessorDomainService(IFileProcessorManager fileProcessorManager, this.FileImportLogAggregateRepository = fileImportLogAggregateRepository; this.FileAggregateRepository = fileAggregateRepository; this.TransactionProcessorClient = transactionProcessorClient; - this.EstateClient = estateClient; this.SecurityServiceClient = securityServiceClient; this.FileFormatHandlerResolver = fileFormatHandlerResolver; this.FileSystem = fileSystem; @@ -254,7 +247,7 @@ private async Task> GetOperatorIdForFileProfile(Guid estateId, Guid var fileProfile = fileProfileResult.Data; this.TokenResponse = await this.GetToken(cancellationToken); - Result> getOperatorsResult = await this.EstateClient.GetOperators(this.TokenResponse.AccessToken, estateId, cancellationToken); + Result> getOperatorsResult = await this.TransactionProcessorClient.GetOperators(this.TokenResponse.AccessToken, estateId, cancellationToken); if (getOperatorsResult.IsFailed) { return ResultHelpers.CreateFailure(getOperatorsResult); } @@ -333,7 +326,7 @@ public async Task ProcessTransactionForFileLine(FileCommands.ProcessTran Interlocked.Increment(ref FileProcessorDomainService.TransactionNumber); // Get the merchant details - var getMerchantResult = await this.EstateClient.GetMerchant(this.TokenResponse.AccessToken, fileDetails.EstateId, fileDetails.MerchantId, cancellationToken); + var getMerchantResult = await this.TransactionProcessorClient.GetMerchant(this.TokenResponse.AccessToken, fileDetails.EstateId, fileDetails.MerchantId, cancellationToken); if (getMerchantResult.IsFailed) { return ResultHelpers.CreateFailure(getMerchantResult); @@ -341,7 +334,7 @@ public async Task ProcessTransactionForFileLine(FileCommands.ProcessTran var merchant = getMerchantResult.Data; - var getContractsResult = await this.EstateClient.GetMerchantContracts(this.TokenResponse.AccessToken, fileDetails.EstateId, fileDetails.MerchantId, cancellationToken); + var getContractsResult = await this.TransactionProcessorClient.GetMerchantContracts(this.TokenResponse.AccessToken, fileDetails.EstateId, fileDetails.MerchantId, cancellationToken); if (getContractsResult.IsFailed) { return ResultHelpers.CreateFailure(getContractsResult); diff --git a/FileProcessor.IntegrationTesting.Helpers/Class1.cs b/FileProcessor.IntegrationTesting.Helpers/Class1.cs index 613eceb..fe5da3f 100644 --- a/FileProcessor.IntegrationTesting.Helpers/Class1.cs +++ b/FileProcessor.IntegrationTesting.Helpers/Class1.cs @@ -1,10 +1,11 @@ -namespace FileProcessor.IntegrationTesting.Helpers +using TransactionProcessor.IntegrationTesting.Helpers; + +namespace FileProcessor.IntegrationTesting.Helpers { using System; using System.Collections.Generic; using System.Linq; using DataTransferObjects.Responses; - using EstateManagement.IntegrationTesting.Helpers; namespace FileProcessor.IntegrationTests.Steps { diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj index dcc4a46..cb9f55b 100644 --- a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj +++ b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj @@ -7,8 +7,8 @@ - + diff --git a/FileProcessor.IntegrationTests/Common/DockerHelper.cs b/FileProcessor.IntegrationTests/Common/DockerHelper.cs index fd4909e..057ac69 100644 --- a/FileProcessor.IntegrationTests/Common/DockerHelper.cs +++ b/FileProcessor.IntegrationTests/Common/DockerHelper.cs @@ -1,40 +1,19 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; namespace FileProcessor.IntegrationTests.Common { - using System.Data; - using System.IO; - using System.Net; using System.Net.Http; - using System.Threading; using Client; - using Ductus.FluentDocker.Builders; - using Ductus.FluentDocker.Common; - using Ductus.FluentDocker.Model.Builders; - using Ductus.FluentDocker.Services; - using Ductus.FluentDocker.Services.Extensions; - using EstateManagement.Client; using EventStore.Client; - using Microsoft.Data.SqlClient; - using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; using SecurityService.Client; using Shared.IntegrationTesting; - using Shared.Logger; using TransactionProcessor.Client; - using ILogger = Shared.Logger.ILogger; public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper{ #region Fields - - /// - /// The estate client - /// - public IEstateClient EstateClient; - + public HttpClient TestHostHttpClient; /// @@ -73,13 +52,9 @@ public DockerHelper(){ public override async Task CreateSubscriptions(){ List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new(); subscriptions.AddRange(MessagingService.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions()); - subscriptions.AddRange(EstateManagement.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions()); subscriptions.AddRange(TransactionProcessor.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions()); subscriptions.AddRange(FileProcessor.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions()); - - // TODO: this needs moved to Estate Management nuget - subscriptions.Add(("$ce-FileImportLogAggregate", "Estate Management", 0)); - + foreach ((String streamName, String groupName, Int32 maxRetries) subscription in subscriptions) { var x = subscription; @@ -92,7 +67,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do await base.StartContainersForScenarioRun(scenarioName, dockerServices); // 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}"; String FileProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.FileProcessorPort}"; String TransactionProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TransactionProcessorPort}"; @@ -115,7 +89,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do } }; HttpClient httpClient = new HttpClient(httpMessageHandler); - this.EstateClient = new EstateClient(EstateManagementBaseAddressResolver, httpClient, 2); this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient); this.FileProcessorClient = new FileProcessorClient(FileProcessorBaseAddressResolver, httpClient); this.TransactionProcessorClient = new TransactionProcessorClient(TransactionProcessorBaseAddressResolver, httpClient); diff --git a/FileProcessor.IntegrationTests/Common/EstateDetails.cs b/FileProcessor.IntegrationTests/Common/EstateDetails.cs deleted file mode 100644 index a70ff87..0000000 --- a/FileProcessor.IntegrationTests/Common/EstateDetails.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FileProcessor.IntegrationTests.Common -{ - using System; - using System.Collections.Generic; - using System.Linq; - using DataTransferObjects.Responses; - using EstateManagement.IntegrationTesting.Helpers; - - -} \ No newline at end of file diff --git a/FileProcessor.IntegrationTests/Common/GenericSteps.cs b/FileProcessor.IntegrationTests/Common/GenericSteps.cs index 56c112b..9ddb053 100644 --- a/FileProcessor.IntegrationTests/Common/GenericSteps.cs +++ b/FileProcessor.IntegrationTests/Common/GenericSteps.cs @@ -36,7 +36,7 @@ public async Task StartSystem() logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName); LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly); - DockerServices dockerServices = DockerServices.EstateManagement | DockerServices.EventStore | DockerServices.FileProcessor | DockerServices.MessagingService | + DockerServices dockerServices = DockerServices.EventStore | DockerServices.FileProcessor | DockerServices.MessagingService | DockerServices.SecurityService | DockerServices.SqlServer | DockerServices.TestHost | DockerServices.TransactionProcessor | DockerServices.TestHost | DockerServices.CallbackHandler | DockerServices.TransactionProcessorAcl; diff --git a/FileProcessor.IntegrationTests/Common/Product.cs b/FileProcessor.IntegrationTests/Common/Product.cs index f618217..67ab835 100644 --- a/FileProcessor.IntegrationTests/Common/Product.cs +++ b/FileProcessor.IntegrationTests/Common/Product.cs @@ -1,10 +1,10 @@ -namespace FileProcessor.IntegrationTests.Common +using TransactionProcessor.DataTransferObjects.Responses.Contract; + +namespace FileProcessor.IntegrationTests.Common { using System; using System.Collections.Generic; using System.Linq; - using EstateManagement.DataTransferObjects; - using EstateManagement.DataTransferObjects.Responses.Contract; public class Product { diff --git a/FileProcessor.IntegrationTests/Common/TestingContext.cs b/FileProcessor.IntegrationTests/Common/TestingContext.cs index 04c0cf0..50abb5e 100644 --- a/FileProcessor.IntegrationTests/Common/TestingContext.cs +++ b/FileProcessor.IntegrationTests/Common/TestingContext.cs @@ -4,14 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using TransactionProcessor.IntegrationTesting.Helpers; namespace FileProcessor.IntegrationTests.Common { using Shared.Logger; using Shouldly; using System.IO; - using EstateManagement.DataTransferObjects.Responses; - using EstateManagement.IntegrationTesting.Helpers; using IntegrationTesting.Helpers; public class ClientDetails diff --git a/FileProcessor.IntegrationTests/Common/TransactionFee.cs b/FileProcessor.IntegrationTests/Common/TransactionFee.cs index c89c721..553988f 100644 --- a/FileProcessor.IntegrationTests/Common/TransactionFee.cs +++ b/FileProcessor.IntegrationTests/Common/TransactionFee.cs @@ -1,9 +1,9 @@ -namespace FileProcessor.IntegrationTests.Common +using TransactionProcessor.DataTransferObjects.Responses.Contract; + +namespace FileProcessor.IntegrationTests.Common { using System; - using EstateManagement.DataTransferObjects; - using EstateManagement.DataTransferObjects.Responses.Contract; - + public class TransactionFee { #region Properties diff --git a/FileProcessor.IntegrationTests/Features/GetFileImportDetailsSteps.cs b/FileProcessor.IntegrationTests/Features/GetFileImportDetailsSteps.cs index 0187002..5d333e7 100644 --- a/FileProcessor.IntegrationTests/Features/GetFileImportDetailsSteps.cs +++ b/FileProcessor.IntegrationTests/Features/GetFileImportDetailsSteps.cs @@ -1,25 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; namespace FileProcessor.IntegrationTests.Features { - using System.Configuration; - using System.Net; - using System.Net.Http; - using System.Net.Http.Headers; - using System.Threading; using Common; - using DataTransferObjects.Responses; - using EstateManagement.IntegrationTesting.Helpers; using IntegrationTesting.Helpers.FileProcessor.IntegrationTests.Steps; - using Newtonsoft.Json; using Reqnroll; - using Shared.IntegrationTesting; - using Shouldly; - using Steps; using ReqnrollExtensions = IntegrationTesting.Helpers.FileProcessor.IntegrationTests.Steps.ReqnrollExtensions; [Binding] diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj index ec42345..9c91ef6 100644 --- a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj +++ b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj @@ -11,12 +11,10 @@ - - @@ -29,8 +27,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/FileProcessor.IntegrationTests/Steps/SharedSteps.cs b/FileProcessor.IntegrationTests/Steps/SharedSteps.cs index a465e85..32b614f 100644 --- a/FileProcessor.IntegrationTests/Steps/SharedSteps.cs +++ b/FileProcessor.IntegrationTests/Steps/SharedSteps.cs @@ -1,24 +1,23 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; +using TransactionProcessor.DataTransferObjects.Requests.Contract; +using TransactionProcessor.DataTransferObjects.Requests.Estate; +using TransactionProcessor.DataTransferObjects.Requests.Merchant; +using TransactionProcessor.DataTransferObjects.Requests.Operator; +using TransactionProcessor.DataTransferObjects.Responses.Contract; +using TransactionProcessor.DataTransferObjects.Responses.Estate; +using TransactionProcessor.DataTransferObjects.Responses.Merchant; +using TransactionProcessor.IntegrationTesting.Helpers; +using AssignOperatorRequest = TransactionProcessor.DataTransferObjects.Requests.Estate.AssignOperatorRequest; namespace FileProcessor.IntegrationTests.Steps { using System.IO; - using System.Linq.Expressions; - using System.Net; - using System.Net.Http; - using System.Net.Http.Headers; using System.Threading; using Common; using DataTransferObjects; - using DataTransferObjects.Responses; - using EstateManagement.DataTransferObjects.Requests; - using EstateManagement.DataTransferObjects.Responses; - using EstateManagement.DataTransferObjects; - using EstateManagement.IntegrationTesting.Helpers; using IntegrationTesting.Helpers; using IntegrationTesting.Helpers.FileProcessor.IntegrationTests.Steps; using Newtonsoft.Json; @@ -26,22 +25,9 @@ namespace FileProcessor.IntegrationTests.Steps using SecurityService.IntegrationTesting.Helpers; using Shared.IntegrationTesting; using Shouldly; - using TransactionProcessor.DataTransferObjects; - using Contract = Common.Contract; - using Product = Common.Product; using Newtonsoft.Json.Linq; using System.Text.Json; - using EstateManagement.DataTransferObjects.Requests.Contract; - using EstateManagement.DataTransferObjects.Requests.Estate; - using EstateManagement.DataTransferObjects.Requests.Merchant; - using EstateManagement.DataTransferObjects.Requests.Operator; - using EstateManagement.DataTransferObjects.Responses.Contract; - using EstateManagement.DataTransferObjects.Responses.Estate; using Reqnroll; - using Shared.Logger; - using AssignOperatorRequest = EstateManagement.DataTransferObjects.Requests.Estate.AssignOperatorRequest; - using MerchantOperatorResponse = EstateManagement.DataTransferObjects.Responses.Merchant.MerchantOperatorResponse; - using MerchantResponse = EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse; [Binding] [Scope(Tag = "shared")] @@ -53,7 +39,7 @@ public class SharedSteps private readonly SecurityServiceSteps SecurityServiceSteps; - private readonly EstateManagementSteps EstateManagementSteps; + private readonly TransactionProcessorSteps TransactionProcessorSteps; private readonly FileProcessorSteps FileProcessorSteps; @@ -63,7 +49,7 @@ public SharedSteps(ScenarioContext scenarioContext, ScenarioContext = scenarioContext; TestingContext = testingContext; this.SecurityServiceSteps = new SecurityServiceSteps(testingContext.DockerHelper.SecurityServiceClient); - this.EstateManagementSteps = new EstateManagementSteps(testingContext.DockerHelper.EstateClient, testingContext.DockerHelper.TestHostHttpClient); + this.TransactionProcessorSteps = new TransactionProcessorSteps(testingContext.DockerHelper.TransactionProcessorClient,testingContext.DockerHelper.TestHostHttpClient, testingContext.DockerHelper.ProjectionManagementClient); this.FileProcessorSteps = new FileProcessorSteps(testingContext.DockerHelper.FileProcessorClient); } @@ -130,7 +116,7 @@ public async Task WhenICreateTheFollowingEstates(DataTable table) { List requests = table.Rows.ToCreateEstateRequests(); - List verifiedEstates = await this.EstateManagementSteps.WhenICreateTheFollowingEstates(this.TestingContext.AccessToken, requests); + List verifiedEstates = await this.TransactionProcessorSteps.WhenICreateTheFollowingEstatesX(this.TestingContext.AccessToken, requests); foreach (EstateResponse verifiedEstate in verifiedEstates) { @@ -152,9 +138,9 @@ public async Task GivenICreateTheFollowingApiScopes(DataTable table) [When(@"I assign the following operator to the merchants")] public async Task WhenIAssignTheFollowingOperatorToTheMerchants(DataTable table){ var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); - List<(EstateDetails, Guid, EstateManagement.DataTransferObjects.Requests.Merchant.AssignOperatorRequest)> requests = table.Rows.ToAssignOperatorRequests(estates); + List<(EstateDetails, Guid, TransactionProcessor.DataTransferObjects.Requests.Merchant.AssignOperatorRequest)> requests = table.Rows.ToAssignOperatorRequests(estates); - List<(EstateDetails, EstateManagement.DataTransferObjects.Responses.Merchant.MerchantOperatorResponse)> results = await this.EstateManagementSteps.WhenIAssignTheFollowingOperatorToTheMerchants(this.TestingContext.AccessToken, requests); + List<(EstateDetails, TransactionProcessor.DataTransferObjects.Responses.Merchant.MerchantOperatorResponse)> results = await this.TransactionProcessorSteps.WhenIAssignTheFollowingOperatorToTheMerchants(this.TestingContext.AccessToken, requests); foreach ((EstateDetails, MerchantOperatorResponse) result in results) { @@ -169,7 +155,7 @@ public async Task WhenICreateTheFollowingOperators(DataTable table) var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); List<(EstateDetails estate, CreateOperatorRequest request)> requests = table.Rows.ToCreateOperatorRequests(estates); - List<(Guid, EstateOperatorResponse)> results = await this.EstateManagementSteps.WhenICreateTheFollowingOperators(this.TestingContext.AccessToken, requests); + List<(Guid, EstateOperatorResponse)> results = await this.TransactionProcessorSteps.WhenICreateTheFollowingOperators(this.TestingContext.AccessToken, requests); foreach ((Guid, EstateOperatorResponse) result in results) { @@ -182,7 +168,7 @@ public async Task GivenIHaveAssignedTheFollowingOperatorsToTheEstates(DataTable { List<(EstateDetails estate, AssignOperatorRequest request)> requests = dataTable.Rows.ToAssignOperatorToEstateRequests(this.TestingContext.Estates.Select(s => s.EstateDetails).ToList()); - await this.EstateManagementSteps.GivenIHaveAssignedTheFollowingOperatorsToTheEstates(this.TestingContext.AccessToken, requests); + await this.TransactionProcessorSteps.GivenIHaveAssignedTheFollowingOperatorsToTheEstates(this.TestingContext.AccessToken, requests); // TODO Verify } @@ -194,9 +180,9 @@ public async Task WhenICreateTheFollowingMerchants(DataTable table) var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); List<(EstateDetails estate, CreateMerchantRequest)> requests = table.Rows.ToCreateMerchantRequests(estates); - List verifiedMerchants = await this.EstateManagementSteps.WhenICreateTheFollowingMerchants(this.TestingContext.AccessToken, requests); + List verifiedMerchants = await this.TransactionProcessorSteps.WhenICreateTheFollowingMerchants(this.TestingContext.AccessToken, requests); - foreach (EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse verifiedMerchant in verifiedMerchants) + foreach (TransactionProcessor.DataTransferObjects.Responses.Merchant.MerchantResponse verifiedMerchant in verifiedMerchants) { EstateDetails estateDetails = estates.SingleOrDefault(e => e.EstateId==verifiedMerchant.EstateId); estateDetails.AddMerchant(verifiedMerchant); @@ -209,7 +195,7 @@ public async Task GivenICreateAContractWithTheFollowingValues(DataTable table) { var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); List<(EstateDetails, CreateContractRequest)> requests = table.Rows.ToCreateContractRequests(estates); - List responses = await this.EstateManagementSteps.GivenICreateAContractWithTheFollowingValues(this.TestingContext.AccessToken, requests); + List responses = await this.TransactionProcessorSteps.GivenICreateAContractWithTheFollowingValues(this.TestingContext.AccessToken, requests); foreach (ContractResponse contractResponse in responses) { EstateDetails1 estate = this.TestingContext.Estates.Single(e => e.EstateDetails.EstateId == contractResponse.EstateId); @@ -222,16 +208,16 @@ public async Task WhenICreateTheFollowingProducts(DataTable table) { var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); - List<(EstateDetails, EstateManagement.IntegrationTesting.Helpers.Contract, AddProductToContractRequest)> requests = table.Rows.ToAddProductToContractRequest(estates); - await this.EstateManagementSteps.WhenICreateTheFollowingProducts(this.TestingContext.AccessToken, requests); + List<(EstateDetails, TransactionProcessor.IntegrationTesting.Helpers.Contract, AddProductToContractRequest)> requests = table.Rows.ToAddProductToContractRequest(estates); + await this.TransactionProcessorSteps.WhenICreateTheFollowingProducts(this.TestingContext.AccessToken, requests); } [When(@"I add the following Transaction Fees")] public async Task WhenIAddTheFollowingTransactionFees(DataTable table) { var estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); - List<(EstateDetails, EstateManagement.IntegrationTesting.Helpers.Contract, EstateManagement.IntegrationTesting.Helpers.Product, AddTransactionFeeForProductToContractRequest)> requests = table.Rows.ToAddTransactionFeeForProductToContractRequests(estates); - await this.EstateManagementSteps.WhenIAddTheFollowingTransactionFees(this.TestingContext.AccessToken, requests); + List<(EstateDetails, TransactionProcessor.IntegrationTesting.Helpers.Contract, TransactionProcessor.IntegrationTesting.Helpers.Product, AddTransactionFeeForProductToContractRequest)> requests = table.Rows.ToAddTransactionFeeForProductToContractRequests(estates); + await this.TransactionProcessorSteps.WhenIAddTheFollowingTransactionFees(this.TestingContext.AccessToken, requests); } [Given(@"the following api resources exist")] @@ -268,7 +254,7 @@ public async Task GivenIHaveAssignedTheFollowingDevicesToTheMerchants(DataTable List estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); List<(EstateDetails, Guid, AddMerchantDeviceRequest)> requests = table.Rows.ToAddMerchantDeviceRequests(estates); - List<(EstateDetails, EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse, String)> results = await this.EstateManagementSteps.GivenIHaveAssignedTheFollowingDevicesToTheMerchants(this.TestingContext.AccessToken, requests); + List<(EstateDetails, TransactionProcessor.DataTransferObjects.Responses.Merchant.MerchantResponse, String)> results = await this.TransactionProcessorSteps.GivenIHaveAssignedTheFollowingDevicesToTheMerchants(this.TestingContext.AccessToken, requests); foreach ((EstateDetails, MerchantResponse, String) result in results) { this.TestingContext.Logger.LogInformation($"Device {result.Item3} assigned to Merchant {result.Item2.MerchantName} Estate {result.Item1.EstateName}"); @@ -280,7 +266,7 @@ public async Task WhenIAddTheFollowingContractsToTheFollowingMerchants(DataTable { List estates = this.TestingContext.Estates.Select(e => e.EstateDetails).ToList(); List<(EstateDetails, Guid, Guid)> requests = table.Rows.ToAddContractToMerchantRequests(estates); - await this.EstateManagementSteps.WhenIAddTheFollowingContractsToTheFollowingMerchants(this.TestingContext.AccessToken, requests); + await this.TransactionProcessorSteps.WhenIAddTheFollowingContractsToTheFollowingMerchants(this.TestingContext.AccessToken, requests); } private async Task GetMerchantBalance(Guid merchantId) @@ -300,7 +286,7 @@ public async Task GivenIMakeTheFollowingManualMerchantDeposits(DataTable table) foreach ((EstateDetails, Guid, MakeMerchantDepositRequest) request in requests){ Decimal previousMerchantBalance = await this.GetMerchantBalance(request.Item2); - await this.EstateManagementSteps.GivenIMakeTheFollowingManualMerchantDeposits(this.TestingContext.AccessToken, request); + await this.TransactionProcessorSteps.GivenIMakeTheFollowingManualMerchantDeposits(this.TestingContext.AccessToken, request); await Retry.For(async () => { Decimal currentMerchantBalance = await this.GetMerchantBalance(request.Item2); diff --git a/FileProcessor.Testing/TestData.cs b/FileProcessor.Testing/TestData.cs index ddf6c0c..53184bb 100644 --- a/FileProcessor.Testing/TestData.cs +++ b/FileProcessor.Testing/TestData.cs @@ -1,25 +1,21 @@ using System; +using FileProcessor.DataTransferObjects.Responses; +using TransactionProcessor.DataTransferObjects.Responses.Contract; +using TransactionProcessor.DataTransferObjects.Responses.Merchant; +using TransactionProcessor.DataTransferObjects.Responses.Operator; namespace FileProcessor.Testing { using System.Collections.Generic; - using BusinessLogic.Managers; using BusinessLogic.Requests; - using EstateManagement.Database.Entities; - using EstateManagement.DataTransferObjects.Responses.Contract; - using EstateManagement.DataTransferObjects.Responses.Merchant; - using EstateManagement.DataTransferObjects.Responses.Operator; using File.DomainEvents; - using FileImportLog.DomainEvents; using FileAggregate; + using FileImportLog.DomainEvents; using FileImportLogAggregate; using FileProcessor.Models; using Newtonsoft.Json; using SecurityService.DataTransferObjects.Responses; using TransactionProcessor.DataTransferObjects; - using ContractProduct = EstateManagement.DataTransferObjects.Responses.Contract.ContractProduct; - using FileImportLog = EstateManagement.Database.Entities.FileImportLog; - using FileLine = EstateManagement.Database.Entities.FileLine; public class TestData { @@ -106,7 +102,8 @@ public static String GetVoucherDetailLine(String voucherOperatorIdentifier, Stri public static FileProfile FileProfileNull => null; - public static Merchant Merchant => new Merchant{ + public static TransactionProcessor.Database.Entities.Merchant Merchant => new TransactionProcessor.Database.Entities.Merchant + { EstateId = TestData.EstateId, MerchantId = TestData.MerchantId, MerchantReportingId = TestData.MerchantReportingId, @@ -676,8 +673,8 @@ public static List GetMerchantContractsResponseNoNullValueProd } }; - public static List FileImportLogs => - new List + public static List FileImportLogs => + new List { TestData.FileImportLog1, TestData.FileImportLog2 @@ -763,7 +760,7 @@ public static List GetMerchantContractsResponseNoNullValueProd }; - public static FileImportLog FileImportLog1 => new FileImportLog + public static TransactionProcessor.Database.Entities.FileImportLog FileImportLog1 => new TransactionProcessor.Database.Entities.FileImportLog { FileImportLogId = TestData.FileImportLogId1, ImportLogDateTime = TestData.ImportLogStartDate, @@ -771,9 +768,9 @@ public static List GetMerchantContractsResponseNoNullValueProd FileImportLogReportingId = TestData.FileImportLogReportingId1 }; - public static List FileImportLog1Files => new List + public static List FileImportLog1Files => new List { - new FileImportLogFile + new TransactionProcessor.Database.Entities.FileImportLogFile { FileImportLogId = TestData.FileImportLogId1, FileId = TestData.FileId1, @@ -784,7 +781,7 @@ public static List GetMerchantContractsResponseNoNullValueProd UserId = TestData.UserId, FileUploadedDateTime = TestData.FileUploadedDateTime }, - new FileImportLogFile + new TransactionProcessor.Database.Entities.FileImportLogFile { FileImportLogId = TestData.FileImportLogId1, FileId = TestData.FileId2, @@ -798,9 +795,9 @@ public static List GetMerchantContractsResponseNoNullValueProd }; - public static List Files1 => - new List{ - new File(){ + public static List Files1 => + new List{ + new TransactionProcessor.Database.Entities.File(){ FileImportLogId = TestData.FileImportLogId1, FileReportingId = TestData.FileReportingId1, MerchantId = TestData.MerchantId, @@ -808,7 +805,7 @@ public static List GetMerchantContractsResponseNoNullValueProd UserId = TestData.UserId, FileId = TestData.FileId1 }, - new File{ + new TransactionProcessor.Database.Entities.File{ FileImportLogId = TestData.FileImportLogId1, FileReportingId = TestData.FileReportingId2, MerchantId = TestData.MerchantId, @@ -819,7 +816,7 @@ public static List GetMerchantContractsResponseNoNullValueProd }; - public static FileImportLog FileImportLog2 => new FileImportLog + public static TransactionProcessor.Database.Entities.FileImportLog FileImportLog2 => new TransactionProcessor.Database.Entities.FileImportLog { FileImportLogId = TestData.FileImportLogId2, ImportLogDateTime = TestData.ImportLogEndDate, @@ -827,9 +824,9 @@ public static List GetMerchantContractsResponseNoNullValueProd FileImportLogReportingId = TestData.FileImportLogReportingId2 }; - public static List FileImportLog2Files => new List + public static List FileImportLog2Files => new List { - new FileImportLogFile + new TransactionProcessor.Database.Entities.FileImportLogFile { FileImportLogId = TestData.FileImportLogId2, MerchantId = TestData.MerchantId, @@ -840,7 +837,7 @@ public static List GetMerchantContractsResponseNoNullValueProd UserId = TestData.UserId, FileUploadedDateTime = TestData.FileUploadedDateTime }, - new FileImportLogFile + new TransactionProcessor.Database.Entities.FileImportLogFile { FileImportLogId = TestData.FileImportLogId2, MerchantId = TestData.MerchantId, diff --git a/FileProcessor/Bootstrapper/ClientRegistry.cs b/FileProcessor/Bootstrapper/ClientRegistry.cs index c09c57a..1598af6 100644 --- a/FileProcessor/Bootstrapper/ClientRegistry.cs +++ b/FileProcessor/Bootstrapper/ClientRegistry.cs @@ -3,7 +3,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Net.Http; -using EstateManagement.Client; using Lamar; using Microsoft.Extensions.DependencyInjection; using SecurityService.Client; @@ -20,8 +19,6 @@ public class ClientRegistry : ServiceRegistry /// public ClientRegistry() { this.AddSingleton(); - //this.AddSingleton(); - this.AddSingleton(); //this.AddSingleton>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; }); @@ -41,8 +38,6 @@ public ClientRegistry() { HttpClient httpClient = new(httpMessageHandler); this.AddSingleton(httpClient); - - this.AddSingleton(new EstateClient(resolver1(), httpClient, 2)); } #endregion diff --git a/FileProcessor/Bootstrapper/MiddlewareRegistry.cs b/FileProcessor/Bootstrapper/MiddlewareRegistry.cs index e6930bb..6197f84 100644 --- a/FileProcessor/Bootstrapper/MiddlewareRegistry.cs +++ b/FileProcessor/Bootstrapper/MiddlewareRegistry.cs @@ -37,7 +37,7 @@ public MiddlewareRegistry() userCredentials: eventStoreClientSettings.DefaultCredentials, name:"Eventstore", failureStatus:HealthStatus.Unhealthy, - tags:new[] {"db", "eventstore"}).AddEstateManagementService().AddTransactionProcessorService() + tags:new[] {"db", "eventstore"}).AddTransactionProcessorService() .AddSecurityService(this.ApiEndpointHttpHandler); this.AddSwaggerGen(c => diff --git a/FileProcessor/Bootstrapper/RepositoryRegistry.cs b/FileProcessor/Bootstrapper/RepositoryRegistry.cs index da204fb..d4478fc 100644 --- a/FileProcessor/Bootstrapper/RepositoryRegistry.cs +++ b/FileProcessor/Bootstrapper/RepositoryRegistry.cs @@ -1,13 +1,11 @@ -namespace FileProcessor.Bootstrapper; +using TransactionProcessor.Database.Contexts; + +namespace FileProcessor.Bootstrapper; using System; using System.Diagnostics.CodeAnalysis; -using System.Net.Http; -using System.Net.Security; using BusinessLogic.Common; using BusinessLogic.Managers; -using Common; -using EstateManagement.Database.Contexts; using FileAggregate; using FileImportLogAggregate; using Lamar; @@ -18,7 +16,6 @@ using Shared.EntityFramework.ConnectionStringConfiguration; using Shared.EventStore.Aggregate; using Shared.EventStore.EventStore; -using Shared.EventStore.Extensions; using Shared.EventStore.SubscriptionWorker; using Shared.General; using Shared.Repositories; diff --git a/FileProcessor/Startup.cs b/FileProcessor/Startup.cs index ef4eada..6be16cb 100644 --- a/FileProcessor/Startup.cs +++ b/FileProcessor/Startup.cs @@ -23,7 +23,6 @@ namespace FileProcessor using BusinessLogic.RequestHandlers; using BusinessLogic.Requests; using Common; - using EstateManagement.Client; using EventStore.Client; using File.DomainEvents; using FileImportLog.DomainEvents;