Skip to content

Fix txns with operator comms errors becoming incomplete #125

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
Feb 11, 2021
Merged

Fix txns with operator comms errors becoming incomplete #125

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
d9c6a54
Fix txns with operator comms errors becoming incomplete
StuartFerguson Feb 10, 2021
c50b3ff
Fixes from review
StuartFerguson Feb 11, 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
55 changes: 53 additions & 2 deletions TransactionProcessor.BusinessLogic.Tests/Services/TransactionDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,6 @@ public async Task TransactionDomainService_ProcessReconciliationTransaction_Inva
this.ValidateResponse(response, TransactionResponseCode.InvalidMerchantId);
}

//######

[Fact]
public async Task TransactionDomainService_ProcessLogonTransaction_TransactionIsProcessed()
{
Expand Down Expand Up @@ -1119,6 +1117,59 @@ public async Task TransactionDomainService_ProcessSaleTransaction_OperatorNotSup
this.ValidateResponse(response, TransactionResponseCode.OperatorNotValidForMerchant);
}

[Fact]
public async Task TransactionDomainService_ProcessSaleTransaction_ErrorInOperatorComms_TransactionIsProcessed()
{
IConfigurationRoot configurationRoot = new ConfigurationBuilder().AddInMemoryCollection(TestData.DefaultAppSettings).Build();
ConfigurationReader.Initialise(configurationRoot);

Logger.Initialise(NullLogger.Instance);

Mock<ITransactionAggregateManager> transactionAggregateManager = new Mock<ITransactionAggregateManager>();
Mock<IEstateClient> estateClient = new Mock<IEstateClient>();
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();

securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
estateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetEstateResponseWithOperator1);
estateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);
transactionAggregateManager.Setup(t => t.GetAggregate(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(TestData.GetLocallyDeclinedTransactionAggregate(TransactionResponseCode.OperatorCommsError));

Mock<IOperatorProxy> operatorProxy = new Mock<IOperatorProxy>();
operatorProxy.Setup(o => o.ProcessSaleMessage(It.IsAny<String>(),
It.IsAny<Guid>(),
It.IsAny<String>(),
It.IsAny<MerchantResponse>(),
It.IsAny<DateTime>(),
It.IsAny<String>(),
It.IsAny<Dictionary<String, String>>(),
It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("Comms Error"));
Func<String, IOperatorProxy> operatorProxyResolver = (operatorName) => { return operatorProxy.Object; };

Mock<IAggregateRepository<ReconciliationAggregate>> reconciliationAggregateRepository =
new Mock<IAggregateRepository<ReconciliationAggregate>>();

TransactionDomainService transactionDomainService =
new TransactionDomainService(transactionAggregateManager.Object, estateClient.Object, securityServiceClient.Object,
operatorProxyResolver, reconciliationAggregateRepository.Object);

ProcessSaleTransactionResponse response = await transactionDomainService.ProcessSaleTransaction(TestData.TransactionId,
TestData.EstateId,
TestData.MerchantId,
TestData.TransactionDateTime,
TestData.TransactionNumber,
TestData.DeviceIdentifier,
TestData.OperatorIdentifier1,
TestData.CustomerEmailAddress,
TestData.AdditionalTransactionMetaData,
TestData.ContractId,
TestData.ProductId,
CancellationToken.None);

this.ValidateResponse(response, TransactionResponseCode.OperatorCommsError);
}

private void ValidateResponse(ProcessLogonTransactionResponse response,
TransactionResponseCode transactionResponseCode)
{
Expand Down
108 changes: 73 additions & 35 deletions TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,50 +218,58 @@ await this.TransactionAggregateManager.RecordAdditionalRequestData(estateId,

// Do the online processing with the operator here
MerchantResponse merchant = await this.GetMerchant(estateId, merchantId, cancellationToken);
IOperatorProxy operatorProxy = this.OperatorProxyResolver(operatorIdentifier);
OperatorResponse operatorResponse =
await operatorProxy.ProcessSaleMessage(this.TokenResponse.AccessToken,
transactionId,
operatorIdentifier,
merchant,
transactionDateTime,
transactionReference,
additionalTransactionMetadata,
cancellationToken);

if (operatorResponse.IsSuccessful)
{
TransactionResponseCode transactionResponseCode = TransactionResponseCode.Success;
String responseMessage = "SUCCESS";

await this.TransactionAggregateManager.AuthoriseTransaction(estateId,
transactionId,
operatorIdentifier,
operatorResponse,
transactionResponseCode,
responseMessage,
cancellationToken);
}
else
OperatorResponse operatorResponse = await this.ProcessMessageWithOperator(merchant, transactionId, transactionDateTime, operatorIdentifier, additionalTransactionMetadata, transactionReference, cancellationToken);

// Act on the operator response
if (operatorResponse == null)
{
TransactionResponseCode transactionResponseCode = TransactionResponseCode.TransactionDeclinedByOperator;
String responseMessage = "DECLINED BY OPERATOR";
// Failed to perform sed/receive with the operator
TransactionResponseCode transactionResponseCode = TransactionResponseCode.OperatorCommsError;
String responseMessage = "OPERATOR COMMS ERROR";

await this.TransactionAggregateManager.DeclineTransaction(estateId,
await this.TransactionAggregateManager.DeclineTransactionLocally(estateId,
transactionId,
operatorIdentifier,
operatorResponse,
transactionResponseCode,
responseMessage,
(responseMessage, transactionResponseCode),
cancellationToken);
}
else
{

// Record any additional operator response metadata
await this.TransactionAggregateManager.RecordAdditionalResponseData(estateId,

if (operatorResponse.IsSuccessful)
{
TransactionResponseCode transactionResponseCode = TransactionResponseCode.Success;
String responseMessage = "SUCCESS";

await this.TransactionAggregateManager.AuthoriseTransaction(estateId,
transactionId,
operatorIdentifier,
operatorResponse.AdditionalTransactionResponseMetadata,
operatorResponse,
transactionResponseCode,
responseMessage,
cancellationToken);
}
else
{
TransactionResponseCode transactionResponseCode = TransactionResponseCode.TransactionDeclinedByOperator;
String responseMessage = "DECLINED BY OPERATOR";

await this.TransactionAggregateManager.DeclineTransaction(estateId,
transactionId,
operatorIdentifier,
operatorResponse,
transactionResponseCode,
responseMessage,
cancellationToken);
}

// Record any additional operator response metadata
await this.TransactionAggregateManager.RecordAdditionalResponseData(estateId,
transactionId,
operatorIdentifier,
operatorResponse.AdditionalTransactionResponseMetadata,
cancellationToken);
}
}
else
{
Expand Down Expand Up @@ -292,6 +300,36 @@ await this.TransactionAggregateManager.RecordAdditionalResponseData(estateId,
};
}

private async Task<OperatorResponse> ProcessMessageWithOperator(MerchantResponse merchant,
Guid transactionId,
DateTime transactionDateTime,
String operatorIdentifier,
Dictionary<String, String> additionalTransactionMetadata,
String transactionReference,
CancellationToken cancellationToken)
{
IOperatorProxy operatorProxy = this.OperatorProxyResolver(operatorIdentifier);
OperatorResponse operatorResponse = null;
try
{
operatorResponse = await operatorProxy.ProcessSaleMessage(this.TokenResponse.AccessToken,
transactionId,
operatorIdentifier,
merchant,
transactionDateTime,
transactionReference,
additionalTransactionMetadata,
cancellationToken);
}
catch(Exception e)
{
// Log out the error
Logger.LogError(e);
}

return operatorResponse;
}

/// <summary>
/// Processes the reconciliation transaction.
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessor.BusinessLogic/Services/TransactionResponseCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public enum TransactionResponseCode
OperatorNotValidForMerchant = 1007,
TransactionDeclinedByOperator = 1008,
MerchantDoesNotHaveEnoughCredit = 1009,
OperatorCommsError = 1010,

// A Catch All generic Error where reason has not been identified
UnknownFailure = 9999
Expand Down
Loading