Skip to content

Refactor: centralize response model creation in Factory #535

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 1 commit into from
Apr 15, 2026
Merged

Refactor: centralize response model creation in Factory #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 74 additions & 0 deletions TransactionProcessor.Mobile.BusinessLogic/Services/Factory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using TransactionProcessor.Mobile.BusinessLogic.Common;
using TransactionProcessor.Mobile.BusinessLogic.Models;
using TransactionProcessorACL.DataTransferObjects.Responses;

namespace TransactionProcessor.Mobile.BusinessLogic.Services;

public static class Factory {
public static PerformBillPaymentGetAccountResponseModel ToPerformBillPaymentGetAccountResponseModel(SaleTransactionResponseMessage responseMessage) {
return new PerformBillPaymentGetAccountResponseModel() {
BillDetails = responseMessage.AdditionalResponseMetadata.ToBillDetails()
};
}

public static PerformBillPaymentMakePaymentResponseModel ToPerformBillPaymentMakePaymentResponseModel(SaleTransactionResponseMessage responseMessage) {
return new()
{
EstateId = responseMessage.EstateId,
MerchantId = responseMessage.MerchantId,
ResponseCode = responseMessage.ResponseCode,
ResponseMessage = responseMessage.ResponseMessage
};
}

public static PerformBillPaymentGetMeterResponseModel ToPerformBillPaymentGetMeterResponseModel(SaleTransactionResponseMessage responseMessage, String meterNumber) {
MeterDetails meterDetails = responseMessage.AdditionalResponseMetadata switch{
null => null,
_ => responseMessage.AdditionalResponseMetadata.ToMeterDetails(meterNumber)
};
return new PerformBillPaymentGetMeterResponseModel() {
MeterDetails = meterDetails
};
}

public static PerformLogonResponseModel ToPerformLogonResponseModel(LogonTransactionResponseMessage responseMessage) {
return new()
{
EstateId = responseMessage.EstateId,
MerchantId = responseMessage.MerchantId,
ResponseCode = responseMessage.ResponseCode,
ResponseMessage = responseMessage.ResponseMessage,
};
}

public static PerformMobileTopupResponseModel ToPerformMobileTopupResponseModel(SaleTransactionResponseMessage responseMessage)
{
return new()
{
EstateId = responseMessage.EstateId,
MerchantId = responseMessage.MerchantId,
ResponseCode = responseMessage.ResponseCode,
ResponseMessage = responseMessage.ResponseMessage,
};
}

public static PerformReconciliationResponseModel ToPerformReconciliationResponseModel(ReconciliationResponseMessage responseMessage) {
return new()
{
EstateId = responseMessage.EstateId,
MerchantId = responseMessage.MerchantId,
ResponseCode = responseMessage.ResponseCode,
ResponseMessage = responseMessage.ResponseMessage
};
}

public static PerformVoucherIssueResponseModel ToPerformVoucherIssueResponseModel(SaleTransactionResponseMessage responseMessage) {
return new()
{
EstateId = responseMessage.EstateId,
MerchantId = responseMessage.MerchantId,
ResponseCode = responseMessage.ResponseCode,
ResponseMessage = responseMessage.ResponseMessage
};
}
}
73 changes: 11 additions & 62 deletions TransactionProcessor.Mobile.BusinessLogic/Services/TransactionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public interface ITransactionService
#endregion
}

//[ExcludeFromCodeCoverage(Justification = "Need to refactor to allow injection of client for mocking")]
public class TransactionService : ClientProxyBase.ClientProxyBase, ITransactionService
{
#region Fields
Expand Down Expand Up @@ -66,16 +65,12 @@ public async Task<Result<PerformBillPaymentGetAccountResponseModel>> PerformBill

Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(), "api/saletransactions", cancellationToken);

if (result.IsSuccess == false)
{
if (result.IsSuccess == false) {
Logger.LogWarning("Error performing bill payment - get account transaction");
return Result.Failure("Error performing bill payment - get account transaction");
}

PerformBillPaymentGetAccountResponseModel responseModel = new()
{
BillDetails = result.Data.AdditionalResponseMetadata.ToBillDetails()
};
PerformBillPaymentGetAccountResponseModel responseModel = Factory.ToPerformBillPaymentGetAccountResponseModel(result.Data);

Logger.LogInformation("Bill payment - get account transaction performed successfully");

Expand All @@ -87,22 +82,13 @@ public async Task<Result<PerformBillPaymentMakePaymentResponseModel>> PerformBil
Logger.LogInformation("About to perform bill payment make payment transaction");

Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(),"api/saletransactions", cancellationToken);

if (result.IsSuccess == false)
{

if (result.IsSuccess == false) {
Logger.LogWarning("Error performing bill payment - make payment transaction");
return Result.Failure("Error performing bill payment - make payment transaction");

}

// TODO: Factory
PerformBillPaymentMakePaymentResponseModel responseModel = new()
{
EstateId = result.Data.EstateId,
MerchantId = result.Data.EstateId,
ResponseCode = result.Data.ResponseCode,
ResponseMessage = result.Data.ResponseMessage
};
PerformBillPaymentMakePaymentResponseModel responseModel = Factory.ToPerformBillPaymentMakePaymentResponseModel(result.Data);

Logger.LogInformation("Bill payment - make payment transaction performed successfully");

Expand All @@ -114,22 +100,12 @@ public async Task<Result<PerformBillPaymentGetMeterResponseModel>> PerformBillPa

Result<SaleTransactionResponseMessage> result = await this.SendTransactionRequest<SaleTransactionRequestMessage, SaleTransactionResponseMessage>(model.ToSaleTransactionRequest(), "api/saletransactions", cancellationToken);

if (result.IsSuccess == false)
{
if (result.IsSuccess == false) {
Logger.LogWarning("Error performing bill payment - get meter transaction");
return Result.Failure("Error performing bill payment - get meter transaction");

}

MeterDetails meterDetails = result.Data.AdditionalResponseMetadata switch{
null => null,
_ => result.Data.AdditionalResponseMetadata.ToMeterDetails(model.MeterNumber)
};

PerformBillPaymentGetMeterResponseModel responseModel = new()
{
MeterDetails = meterDetails
};
PerformBillPaymentGetMeterResponseModel responseModel = Factory.ToPerformBillPaymentGetMeterResponseModel(result.Data, model.MeterNumber);

Logger.LogInformation("Bill payment - get meter transaction performed successfully");

Expand All @@ -148,14 +124,7 @@ public async Task<Result<PerformLogonResponseModel>> PerformLogon(PerformLogonRe
return Result.Failure("Error performing Logon transaction");
}

// TODO: Factory
PerformLogonResponseModel responseModel = new()
{
EstateId = result.Data.EstateId,
MerchantId = result.Data.MerchantId,
ResponseCode = result.Data.ResponseCode,
ResponseMessage = result.Data.ResponseMessage,
};
PerformLogonResponseModel responseModel = Factory.ToPerformLogonResponseModel(result.Data);

Logger.LogInformation("Logon transaction performed successfully");

Expand All @@ -172,15 +141,9 @@ public async Task<Result<PerformMobileTopupResponseModel>> PerformMobileTopup(Pe
if (result.IsSuccess == false) {
Logger.LogWarning("Error performing Mobile top-up transaction");
return Result.Failure("Error performing Mobile top-up transaction");

}

PerformMobileTopupResponseModel responseModel = new (){
EstateId = result.Data.EstateId,
MerchantId = result.Data.MerchantId,
ResponseCode = result.Data.ResponseCode,
ResponseMessage = result.Data.ResponseMessage
};
PerformMobileTopupResponseModel responseModel = Factory.ToPerformMobileTopupResponseModel(result.Data);

Logger.LogInformation("Mobile top-up transaction performed successfully");

Expand All @@ -198,17 +161,9 @@ public async Task<Result<PerformReconciliationResponseModel>> PerformReconciliat
{
Logger.LogWarning("Error performing Reconciliation transaction");
return Result.Failure("Error performing Reconciliation transaction");

}

// TODO: Factory
PerformReconciliationResponseModel responseModel = new()
{
EstateId = result.Data.EstateId,
MerchantId = result.Data.MerchantId,
ResponseCode = result.Data.ResponseCode,
ResponseMessage = result.Data.ResponseMessage
};
PerformReconciliationResponseModel responseModel = Factory.ToPerformReconciliationResponseModel(result.Data);

Logger.LogInformation("Reconciliation transaction performed successfully");

Expand All @@ -228,13 +183,7 @@ public async Task<Result<PerformVoucherIssueResponseModel>> PerformVoucherIssue(
return Result.Failure("Error performing Voucher transaction");
}

PerformVoucherIssueResponseModel responseModel = new()
{
EstateId = result.Data.EstateId,
MerchantId = result.Data.MerchantId,
ResponseCode = result.Data.ResponseCode,
ResponseMessage = result.Data.ResponseMessage
};
PerformVoucherIssueResponseModel responseModel = Factory.ToPerformVoucherIssueResponseModel(result.Data);

Logger.LogInformation("Voucher transaction performed successfully");

Expand Down
Loading