Skip to content

Reduce ProcessLogonTransaction complexity by extracting logon validation flow #1596

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
Mar 12, 2026
Merged

Reduce ProcessLogonTransaction complexity by extracting logon validation flow #1596

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
18b8f63
Initial plan
Copilot Mar 12, 2026
5470fd1
Refactor logon transaction flow
Copilot Mar 12, 2026
6074521
Merge branch 'master' into copilot/fix-cyclomatic-complexity-issue
StuartFerguson Mar 12, 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
2 changes: 2 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 @@ -102,6 +102,8 @@ public async Task TransactionDomainService_ProcessLogonTransaction_DeviceNeedsAd
result.Data.MerchantId.ShouldBe(TestData.MerchantId);
result.Data.ResponseCode.ShouldBe("0001");
result.Data.TransactionId.ShouldBe(TestData.TransactionId);
this.AggregateService.Verify(t => t.GetLatest<MerchantAggregate>(TestData.MerchantId, It.IsAny<CancellationToken>()), Times.Once);
this.AggregateService.Verify(t => t.Save(It.IsAny<MerchantAggregate>(), It.IsAny<CancellationToken>()), Times.Once);
}

[Fact]
Expand Down
58 changes: 34 additions & 24 deletions TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,9 @@ public async Task<Result<ProcessLogonTransactionResponse>> ProcessLogonTransacti
return ResultHelpers.CreateFailure(stateResult);

Result<TransactionValidationResult> validationResult = await this.TransactionValidationService.ValidateLogonTransaction(command.EstateId, command.MerchantId, command.DeviceIdentifier, cancellationToken);

if (validationResult.IsSuccess && (validationResult.Data.ResponseCode == TransactionResponseCode.Success || validationResult.Data.ResponseCode == TransactionResponseCode.SuccessNeedToAddDevice)) {
if (validationResult.Data.ResponseCode == TransactionResponseCode.SuccessNeedToAddDevice) {
await this.AddDeviceToMerchant(command.MerchantId, command.DeviceIdentifier, cancellationToken);
}

// Record the successful validation
stateResult = transactionAggregate.AuthoriseTransactionLocally(TransactionHelpers.GenerateAuthCode(), validationResult.Data.ResponseCode, validationResult.Data.ResponseMessage);
if (stateResult.IsFailed)
return ResultHelpers.CreateFailure(stateResult);
}
else {
// Record the failure
stateResult = transactionAggregate.DeclineTransactionLocally(validationResult.Data.ResponseCode, validationResult.Data.ResponseMessage);
if (stateResult.IsFailed)
return ResultHelpers.CreateFailure(stateResult);
}
stateResult = await this.RecordLogonTransactionValidation(command, transactionAggregate, validationResult, cancellationToken);
if (stateResult.IsFailed)
return ResultHelpers.CreateFailure(stateResult);

stateResult = transactionAggregate.CompleteTransaction();
if (stateResult.IsFailed)
Expand All @@ -136,13 +122,7 @@ public async Task<Result<ProcessLogonTransactionResponse>> ProcessLogonTransacti
Result saveResult = await this.AggregateService.Save(transactionAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);
return Result.Success(new ProcessLogonTransactionResponse {
ResponseMessage = transactionAggregate.ResponseMessage,
ResponseCode = transactionAggregate.ResponseCode,
EstateId = command.EstateId,
MerchantId = command.MerchantId,
TransactionId = command.TransactionId
});
return Result.Success(this.CreateLogonTransactionResponse(command, transactionAggregate));
}
catch (Exception ex) {
return Result.Failure(ex.GetExceptionMessages());
Expand Down Expand Up @@ -427,6 +407,36 @@ private async Task<Result> AddDeviceToMerchant(Guid merchantId,
return await this.AggregateService.Save(merchantAggregate.Data, cancellationToken);
}

private ProcessLogonTransactionResponse CreateLogonTransactionResponse(TransactionCommands.ProcessLogonTransactionCommand command,
TransactionAggregate transactionAggregate) {
return new ProcessLogonTransactionResponse {
ResponseMessage = transactionAggregate.ResponseMessage,
ResponseCode = transactionAggregate.ResponseCode,
EstateId = command.EstateId,
MerchantId = command.MerchantId,
TransactionId = command.TransactionId
};
}

private async Task<Result> RecordLogonTransactionValidation(TransactionCommands.ProcessLogonTransactionCommand command,
TransactionAggregate transactionAggregate,
Result<TransactionValidationResult> validationResult,
CancellationToken cancellationToken) {
if (validationResult.IsSuccess && this.IsSuccessfulLogonValidation(validationResult.Data.ResponseCode)) {
if (validationResult.Data.ResponseCode == TransactionResponseCode.SuccessNeedToAddDevice) {
await this.AddDeviceToMerchant(command.MerchantId, command.DeviceIdentifier, cancellationToken);
}

return transactionAggregate.AuthoriseTransactionLocally(TransactionHelpers.GenerateAuthCode(), validationResult.Data.ResponseCode, validationResult.Data.ResponseMessage);
}

return transactionAggregate.DeclineTransactionLocally(validationResult.Data.ResponseCode, validationResult.Data.ResponseMessage);
}

private Boolean IsSuccessfulLogonValidation(TransactionResponseCode responseCode) {
return responseCode == TransactionResponseCode.Success || responseCode == TransactionResponseCode.SuccessNeedToAddDevice;
}



private async Task<Result<Merchant>> GetMerchant(Guid merchantId,
Expand Down
Loading