Skip to content

Updated rule to ensure lines only processed once #48

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Jul 16, 2021
Merged

Updated rule to ensure lines only processed once #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c55f22
Updated rule to ensure lines only processed once
StuartFerguson Jul 16, 2021
60dffba
:|
StuartFerguson Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 78 additions & 6 deletions FileProcessor.BusinessLogic.Tests/FileRequestHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,13 @@ public void FileRequestHandler_SafaricomTopupRequest_FileIsEmpty_RequestIsHandle
fileAggregateRepository.Verify(f => f.SaveChanges(It.IsAny<FileAggregate>(), It.IsAny<CancellationToken>()), Times.Never);
}

[Fact]
public void FileRequestHandler_ProcessTransactionForFileLineRequest_RequestIsHandled()
[Theory]
[InlineData("Safaricom")]
[InlineData("Voucher")]
public void FileRequestHandler_ProcessTransactionForFileLineRequest_RequestIsHandled(String operatorName)
{
Mock<IFileProcessorManager> fileProcessorManager = new Mock<IFileProcessorManager>();
fileProcessorManager.Setup(f => f.GetFileProfile(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.FileProfileSafaricom);
fileProcessorManager.Setup(f => f.GetFileProfile(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileProfile(operatorName));
Mock<IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent>> fileImportLogAggregateRepository =
new Mock<IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent>>();

Expand Down Expand Up @@ -867,12 +869,21 @@ public void FileRequestHandler_ProcessTransactionLineForFileRequest_LineInReques
fileFormatHandlerResolver,
fileSystem);

ProcessTransactionForFileLineRequest processTransactionForFileLineRequest =
new ProcessTransactionForFileLineRequest(TestData.FileId, TestData.LineNumber, TestData.FileLine);
ProcessTransactionForFileLineRequest processTransactionForFileLineRequest1 =
new ProcessTransactionForFileLineRequest(TestData.FileId, 1, TestData.FileLine);
ProcessTransactionForFileLineRequest processTransactionForFileLineRequest2 =
new ProcessTransactionForFileLineRequest(TestData.FileId, 2, TestData.FileLine);
ProcessTransactionForFileLineRequest processTransactionForFileLineRequest3 =
new ProcessTransactionForFileLineRequest(TestData.FileId, 3, TestData.FileLine);
ProcessTransactionForFileLineRequest processTransactionForFileLineRequest4 =
new ProcessTransactionForFileLineRequest(TestData.FileId, 4, TestData.FileLine);

Should.NotThrow(async () =>
{
await fileRequestHandler.Handle(processTransactionForFileLineRequest, CancellationToken.None);
await fileRequestHandler.Handle(processTransactionForFileLineRequest1, CancellationToken.None);
await fileRequestHandler.Handle(processTransactionForFileLineRequest2, CancellationToken.None);
await fileRequestHandler.Handle(processTransactionForFileLineRequest3, CancellationToken.None);
await fileRequestHandler.Handle(processTransactionForFileLineRequest4, CancellationToken.None);
});
}

Expand Down Expand Up @@ -1041,6 +1052,67 @@ public void FileRequestHandler_ProcessTransactionForFileLineRequest_EmptyFileLin
fileFormatHandler.Verify(f => f.ParseFileLine(It.IsAny<String>()), Times.Never);
}

[Fact]
public void FileRequestHandler_ProcessTransactionForFileLineRequest_FileParsingFailed_RequestIsHandled()
{
Mock<IFileProcessorManager> fileProcessorManager = new Mock<IFileProcessorManager>();
fileProcessorManager.Setup(f => f.GetFileProfile(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.FileProfileSafaricom);
Mock<IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent>> fileImportLogAggregateRepository =
new Mock<IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent>>();

Mock<IAggregateRepository<FileAggregate, DomainEventRecord.DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEventRecord.DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileAggregateWithLines);

Mock<ITransactionProcessorClient> transactionProcessorClient = new Mock<ITransactionProcessorClient>();
transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny<String>(), It.IsAny<SerialisedMessage>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.SerialisedMessageResponseSale);

Mock<IEstateClient> estateClient = new Mock<IEstateClient>();
estateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetMerchantResponseWithOperator);

estateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetMerchantContractsResponse);

Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());

Mock<IFileFormatHandler> fileFormatHandler = new Mock<IFileFormatHandler>();
Dictionary<String, String> transactionMetadata = null;
fileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
fileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Throws<InvalidDataException>();

Func<String, IFileFormatHandler> fileFormatHandlerResolver = (format) =>
{
return fileFormatHandler.Object;
};

MockFileSystem fileSystem = new MockFileSystem();

IConfigurationRoot configurationRoot = new ConfigurationBuilder().AddInMemoryCollection(TestData.DefaultAppSettings).Build();
ConfigurationReader.Initialise(configurationRoot);
Logger.Initialise(NullLogger.Instance);

FileRequestHandler fileRequestHandler = new FileRequestHandler(fileProcessorManager.Object,
fileImportLogAggregateRepository.Object,
fileAggregateRepository.Object,
transactionProcessorClient.Object,
estateClient.Object,
securityServiceClient.Object,
fileFormatHandlerResolver,
fileSystem);

ProcessTransactionForFileLineRequest processTransactionForFileLineRequest =
new ProcessTransactionForFileLineRequest(TestData.FileId, TestData.LineNumber, TestData.FileLine);

Should.NotThrow(async () =>
{
await fileRequestHandler.Handle(processTransactionForFileLineRequest, CancellationToken.None);
});
estateClient.Verify(f => f.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()), Times.Never);
}

[Fact]
public void FileRequestHandler_ProcessTransactionForFileLineRequest_MerchantNotFound_RequestIsHandled()
{
Expand Down
2 changes: 1 addition & 1 deletion FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public async Task<Unit> Handle(ProcessTransactionForFileLineRequest request,
throw new NotFoundException($"File Line Number {request.LineNumber} not found in File Id {request.FileId}");
}

if (fileLine.TransactionId != Guid.Empty)
if (fileLine.ProcessingResult != ProcessingResult.NotProcessed)
{
// Line already processed
return new Unit();
Expand Down
Loading