Skip to content

Commit 5b27866

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #637 from TransactionProcessing/refactor/#611_reduce_appsettings_hardcoded_string
Refactor voucher methods to use Result<T> for responses
2 parents 0b4a3b5 + 71365a8 commit 5b27866

4 files changed

Lines changed: 75 additions & 157 deletions

File tree

‎TransactionProcessorACL.BusinessLogic.Tests/MediatorTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,20 @@ public async Task<Result<ProcessReconciliationResponse>> ProcessReconciliation(G
128128
Decimal transactionValue,
129129
CancellationToken cancellationToken) => Result.Success(new ProcessReconciliationResponse());
130130

131-
public async Task<GetVoucherResponse> GetVoucher(Guid estateId,
132-
Guid contractId,
133-
String voucherCode,
134-
CancellationToken cancellationToken)
131+
public async Task<Result<GetVoucherResponse>> GetVoucher(Guid estateId,
132+
Guid contractId,
133+
String voucherCode,
134+
CancellationToken cancellationToken)
135135
{
136-
return new GetVoucherResponse();
136+
return Result.Success(new GetVoucherResponse());
137137
}
138138

139-
public async Task<RedeemVoucherResponse> RedeemVoucher(Guid estateId,
140-
Guid contractId,
141-
String voucherCode,
139+
public async Task<Result<RedeemVoucherResponse>> RedeemVoucher(Guid estateId,
140+
Guid contractId,
141+
String voucherCode,
142142
CancellationToken cancellationToken)
143143
{
144-
return new RedeemVoucherResponse();
144+
return Result.Success(new RedeemVoucherResponse());
145145
}
146146

147147
public async Task<Result<List<ContractResponse>>> GetMerchantContracts(Guid estateId,

‎TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -416,26 +416,26 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_VoucherRetri
416416
.ReturnsAsync(TestData.GetVoucherResponse);
417417
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
418418

419-
GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
420-
421-
voucherResponse.ShouldNotBeNull();
422-
voucherResponse.VoucherCode.ShouldBe(TestData.GetVoucherResponse.VoucherCode);
423-
voucherResponse.ContractId.ShouldBe(TestData.ContractId);
424-
voucherResponse.EstateId.ShouldBe(TestData.EstateId);
425-
voucherResponse.ExpiryDate.ShouldBe(TestData.GetVoucherResponse.ExpiryDate);
426-
voucherResponse.Value.ShouldBe(TestData.GetVoucherResponse.Value);
427-
voucherResponse.VoucherId.ShouldBe(TestData.GetVoucherResponse.VoucherId);
419+
Result<GetVoucherResponse> voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
420+
421+
voucherResponse.IsSuccess.ShouldBeTrue();
422+
voucherResponse.Data.ShouldNotBeNull();
423+
voucherResponse.Data.VoucherCode.ShouldBe(TestData.GetVoucherResponse.VoucherCode);
424+
voucherResponse.Data.ContractId.ShouldBe(TestData.ContractId);
425+
voucherResponse.Data.EstateId.ShouldBe(TestData.EstateId);
426+
voucherResponse.Data.ExpiryDate.ShouldBe(TestData.GetVoucherResponse.ExpiryDate);
427+
voucherResponse.Data.Value.ShouldBe(TestData.GetVoucherResponse.Value);
428+
voucherResponse.Data.VoucherId.ShouldBe(TestData.GetVoucherResponse.VoucherId);
428429
}
429430

430431
[Fact]
431432
public async Task VoucherManagementACLApplicationService_GetVoucher_GetTokenFailed_ResultIsFailed()
432433
{
433434
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Failure());
434435

435-
GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
436+
Result<GetVoucherResponse> voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
436437

437-
voucherResponse.ShouldNotBeNull();
438-
voucherResponse.ResponseCode.ShouldBe("0004");
438+
voucherResponse.IsFailed.ShouldBeTrue();
439439
}
440440

441441
[Fact]
@@ -445,10 +445,9 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_GetVoucherFa
445445
.ReturnsAsync(Result.Failure());
446446
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
447447

448-
GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
448+
Result<GetVoucherResponse> voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
449449

450-
voucherResponse.ShouldNotBeNull();
451-
voucherResponse.ResponseCode.ShouldBe("0005");
450+
voucherResponse.IsFailed.ShouldBeTrue();
452451
}
453452

454453
[Fact]
@@ -458,11 +457,9 @@ public async Task VoucherManagementACLApplicationService_GetVoucher_ExceptionErr
458457
.ThrowsAsync(new Exception("Error"));
459458
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
460459

461-
GetVoucherResponse voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
460+
Result<GetVoucherResponse> voucherResponse = await applicationService.GetVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
462461

463-
voucherResponse.ShouldNotBeNull();
464-
voucherResponse.ResponseMessage.ShouldBe(TestData.VoucherExceptionResponseMessage);
465-
voucherResponse.ResponseCode.ShouldBe(TestData.ExceptionErrorResponseCode);
462+
voucherResponse.IsFailed.ShouldBeTrue();
466463
}
467464

468465
[Fact]
@@ -472,11 +469,11 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_VoucherRe
472469
.ReturnsAsync(Result.Success);
473470
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
474471

475-
RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
472+
Result<RedeemVoucherResponse> voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
476473

477-
voucherResponse.ShouldNotBeNull();
478-
voucherResponse.ContractId.ShouldBe(TestData.ContractId);
479-
voucherResponse.EstateId.ShouldBe(TestData.EstateId);
474+
voucherResponse.IsSuccess.ShouldBeTrue();
475+
voucherResponse.Data.ContractId.ShouldBe(TestData.ContractId);
476+
voucherResponse.Data.EstateId.ShouldBe(TestData.EstateId);
480477
}
481478

482479
[Fact]
@@ -486,10 +483,9 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_GetTokenF
486483
.ReturnsAsync(Result.Failure);
487484
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Failure());
488485

489-
RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
486+
Result<RedeemVoucherResponse> voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
490487

491-
voucherResponse.ShouldNotBeNull();
492-
voucherResponse.ResponseCode.ShouldBe("0004");
488+
voucherResponse.IsFailed.ShouldBeTrue();
493489
}
494490

495491
[Fact]
@@ -499,10 +495,9 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_RedeemVou
499495
.ReturnsAsync(Result.Failure());
500496
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
501497

502-
RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
498+
Result<RedeemVoucherResponse> voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
503499

504-
voucherResponse.ShouldNotBeNull();
505-
voucherResponse.ResponseCode.ShouldBe("0005");
500+
voucherResponse.IsFailed.ShouldBeTrue();
506501
}
507502

508503
[Fact]
@@ -513,11 +508,9 @@ public async Task VoucherManagementACLApplicationService_RedeemVoucher_Exception
513508

514509
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));
515510

516-
RedeemVoucherResponse voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
511+
Result<RedeemVoucherResponse> voucherResponse = await applicationService.RedeemVoucher(TestData.EstateId, TestData.ContractId, TestData.VoucherCode, CancellationToken.None);
517512

518-
voucherResponse.ShouldNotBeNull();
519-
voucherResponse.ResponseMessage.ShouldBe(TestData.RedeemVoucherExceptionResponseMessage);
520-
voucherResponse.ResponseCode.ShouldBe(TestData.ExceptionErrorResponseCode);
513+
voucherResponse.IsFailed.ShouldBeTrue();
521514
}
522515

523516
[Theory]

‎TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ Task<Result<ProcessReconciliationResponse>> ProcessReconciliation(Guid estateId,
4242
Decimal transactionValue,
4343
CancellationToken cancellationToken);
4444

45-
Task<GetVoucherResponse> GetVoucher(Guid estateId,
45+
Task<Result<GetVoucherResponse>> GetVoucher(Guid estateId,
4646
Guid contractId,
4747
String voucherCode,
4848
CancellationToken cancellationToken);
4949

50-
Task<RedeemVoucherResponse> RedeemVoucher(Guid estateId,
50+
Task<Result<RedeemVoucherResponse>> RedeemVoucher(Guid estateId,
5151
Guid contractId,
5252
String voucherCode,
5353
CancellationToken cancellationToken);

0 commit comments

Comments
 (0)