Skip to content

fixes for file processing scenarios #1973

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 3 commits into from
Oct 13, 2026
Merged

fixes for file processing scenarios #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4d8d0b
fixes for file processing scenarios
StuartFerguson Oct 13, 2026
30fa5ea
Merge branch 'task/#1966_integration_test_hardening' of https://githu…
StuartFerguson Oct 13, 2026
97d1742
Merge branch 'main' into task/#1966_integration_test_hardening
StuartFerguson Oct 13, 2026
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
50 changes: 46 additions & 4 deletions TransactionProcessor.Aggregates.Tests/TransactionAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ public void TransactionAggregate_StartTransaction_TransactionAlreadyCompleted_Er
[InlineData(true, "ABCD", TransactionType.Logon, "ABCDEFG", true, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Logon, "ABCDEFG", false, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Logon, "ABCDEFG", true, false, "A1234567890")]
[InlineData(true, "0001", TransactionType.Logon, "ABCDEFG", true, true, "")]
[InlineData(true, "0001", TransactionType.Logon, "ABCDEFG", true, true, null)]
[InlineData(true, "0001", (TransactionType)99, "ABCDEFG", true, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Logon, "", true, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Logon, null, true, true, "A1234567890")]
Expand All @@ -120,8 +118,6 @@ public void TransactionAggregate_StartTransaction_TransactionAlreadyCompleted_Er
[InlineData(true, "ABCD", TransactionType.Sale, "ABCDEFG", true, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Sale, "ABCDEFG", false, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Sale, "ABCDEFG", true, false, "A1234567890")]
[InlineData(true, "0001", TransactionType.Sale, "ABCDEFG", true, true, "")]
[InlineData(true, "0001", TransactionType.Sale, "ABCDEFG", true, true, null)]
[InlineData(true, "0001", TransactionType.Sale, "", true, true, "A1234567890")]
[InlineData(true, "0001", TransactionType.Sale, null, true, true, "A1234567890")]
public void TransactionAggregate_StartTransaction_InvalidData_ErrorThrown(Boolean validTransactionDateTime,
Expand Down Expand Up @@ -151,6 +147,52 @@ public void TransactionAggregate_StartTransaction_NullContext_ErrorThrown() {
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Theory]
[InlineData(TransactionSource.NotSet, "")]
[InlineData(TransactionSource.NotSet, null)]
[InlineData(TransactionSource.FileImport, "")]
[InlineData(TransactionSource.FileImport, null)]
public void TransactionAggregate_StartTransaction_NonOnlineSaleWithoutDeviceIdentifier_TransactionIsStarted(TransactionSource transactionSource,
String deviceIdentifier) {
Aggregates.TransactionAggregate transactionAggregate = Aggregates.TransactionAggregate.Create(TestData.TransactionId);

Result result = transactionAggregate.StartTransaction(TestData.TransactionDateTime,
TestData.TransactionNumber,
TransactionType.Sale,
TestData.TransactionReference,
new TransactionStartContext {
EstateId = TestData.EstateId,
MerchantId = TestData.MerchantId,
DeviceIdentifier = deviceIdentifier,
TransactionSource = transactionSource
},
TestData.TransactionAmount);

result.IsSuccess.ShouldBeTrue();
}

[Theory]
[InlineData("")]
[InlineData(null)]
public void TransactionAggregate_StartTransaction_OnlineSaleWithoutDeviceIdentifier_ErrorThrown(String deviceIdentifier) {
Aggregates.TransactionAggregate transactionAggregate = Aggregates.TransactionAggregate.Create(TestData.TransactionId);

Result result = transactionAggregate.StartTransaction(TestData.TransactionDateTime,
TestData.TransactionNumber,
TransactionType.Sale,
TestData.TransactionReference,
new TransactionStartContext {
EstateId = TestData.EstateId,
MerchantId = TestData.MerchantId,
DeviceIdentifier = deviceIdentifier,
TransactionSource = TransactionSource.OnlineSale
},
TestData.TransactionAmount);

result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Theory]
[InlineData(TransactionType.Sale)]
public void TransactionAggregate_AddProductDetails_ProductDetailsAdded(TransactionType transactionType){
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.Aggregates/TransactionAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class TransactionStartContext
public Guid EstateId { get; init; }
public Guid MerchantId { get; init; }
public String DeviceIdentifier { get; init; }
public TransactionSource TransactionSource { get; set; }
}

public static class TransactionAggregateExtensions{
Expand Down Expand Up @@ -556,7 +557,7 @@ private static Result ValidateContext(TransactionStartContext transactionStartCo
return Result.Invalid($"Estate Id must not be [{Guid.Empty}]");
if (transactionStartContext.MerchantId == Guid.Empty)
return Result.Invalid($"Merchant Id must not be [{Guid.Empty}]");
if (String.IsNullOrEmpty(transactionStartContext.DeviceIdentifier))
if (String.IsNullOrEmpty(transactionStartContext.DeviceIdentifier) && transactionStartContext.TransactionSource == TransactionSource.OnlineSale)
return Result.Invalid("Device Identifier must not be null or empty");

return Result.Success();
Expand Down
6 changes: 6 additions & 0 deletions TransactionProcessor.BusinessLogic.Tests/Services/TransactionDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_DeclinedByOper
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(TransactionResponseCode.Success, "SUCCESS")));

this.OperatorProxy.ProcessSaleMessage(Arg<Guid>.Any(),
Expand Down Expand Up @@ -303,6 +304,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_OperatorProxyT
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(TransactionResponseCode.Success, "SUCCESS")));

this.OperatorProxy.ProcessSaleMessage(Arg<Guid>.Any(), Arg<Guid>.Any(), Arg<Models.Merchant.Merchant>.Any(), Arg<DateTime>.Any(), Arg<String>.Any(), Arg<Dictionary<String, String>>.Any(), Arg<CancellationToken>.Any()).Throws(new Exception());
Expand Down Expand Up @@ -349,6 +351,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_TransactionIsP
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(TransactionResponseCode.Success, "SUCCESS")));

this.OperatorProxy.ProcessSaleMessage(Arg<Guid>.Any(),
Expand Down Expand Up @@ -412,6 +415,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_NoFloatFound_T
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(TransactionResponseCode.Success, "SUCCESS")));

this.OperatorProxy.ProcessSaleMessage(Arg<Guid>.Any(),
Expand Down Expand Up @@ -470,6 +474,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_ValidationFail
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(responseCode, responseCode.ToString())));

this.AggregateService.GetLatest<FloatAggregate>(Arg<Guid>.Any(), Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(TestData.GetEmptyFloatAggregate()));
Expand Down Expand Up @@ -883,6 +888,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_SaveFailed_Res
Arg<String>.Any(),
Arg<Guid>.Any(),
Arg<Decimal?>.Any(),
Arg<TransactionSource>.Any(),
Arg<CancellationToken>.Any()).ReturnsAsync(Result.Success(new TransactionValidationResult(TransactionResponseCode.Success, "SUCCESS")));
this.OperatorProxy.ProcessSaleMessage(Arg<Guid>.Any(),
Arg<Guid>.Any(),
Expand Down
Loading
Loading