Skip to content

Commit 836d900

Browse files
StuartFergusonStuartFerguson
committed
Remove lookups based on operator name and use operator id
1 parent fc920f8 commit 836d900

File tree

44 files changed

+276
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+276
-247
lines changed

‎TransactionProcessor.BusinessLogic.Tests/DomainEventHandlers/TransactionDomainEventHandlerTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ public async Task TransactionDomainEventHandler_Handle_CustomerEmailReceiptReque
211211
{
212212
this.TransactionAggregateRepository.Setup(t => t.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
213213
.ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);
214+
this.EstateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetEstateResponseWithOperator1);
214215

215216
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
216217

‎TransactionProcessor.BusinessLogic.Tests/Mediator/DummyTransactionDomainService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid tr
2525
DateTime transactionDateTime,
2626
String transactionNumber,
2727
String deviceIdentifier,
28-
String operatorId,
28+
Guid operatorId,
2929
String customerEmailAddress,
3030
Dictionary<String, String> additionalTransactionMetadata,
3131
Guid contractId,

‎TransactionProcessor.BusinessLogic.Tests/Mediator/DummyVoucherDomainService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class DummyVoucherDomainService : IVoucherDomainService
1010
{
1111
public async Task<IssueVoucherResponse> IssueVoucher(Guid voucherId,
12-
String operatorId,
12+
Guid operatorId,
1313
Guid estateId,
1414
Guid transactionId,
1515
DateTime issuedDateTime,

‎TransactionProcessor.BusinessLogic.Tests/OperatorInterfaces/PataPawaPostPayProxyTests.cs‎

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

‎TransactionProcessor.BusinessLogic.Tests/OperatorInterfaces/SafaricomPinlessProxyTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_TopupSuccessful_SaleM
5555

5656
OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
5757
TestData.TransactionId,
58-
TestData.OperatorIdentifier1,
58+
TestData.OperatorId,
5959
TestData.Merchant,
6060
TestData.TransactionDateTime,
6161
TestData.TransactionReference,
@@ -87,7 +87,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_MetadataCasingTests_A
8787

8888
OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
8989
TestData.TransactionId,
90-
TestData.OperatorIdentifier1,
90+
TestData.OperatorId,
9191
TestData.Merchant,
9292
TestData.TransactionDateTime,
9393
TestData.TransactionReference,
@@ -120,7 +120,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_MetadataCasingTests_C
120120

121121
OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
122122
TestData.TransactionId,
123-
TestData.OperatorIdentifier1,
123+
TestData.OperatorId,
124124
TestData.Merchant,
125125
TestData.TransactionDateTime,
126126
TestData.TransactionReference,
@@ -149,7 +149,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_TopupFailed_SaleMessa
149149

150150
OperatorResponse operatorResponse = await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
151151
TestData.TransactionId,
152-
TestData.OperatorIdentifier1,
152+
TestData.OperatorId,
153153
TestData.Merchant,
154154
TestData.TransactionDateTime,
155155
TestData.TransactionReference,
@@ -179,7 +179,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_FailedToSend_ErrorThr
179179
{
180180
await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
181181
TestData.TransactionId,
182-
TestData.OperatorIdentifier1,
182+
TestData.OperatorId,
183183
TestData.Merchant,
184184
TestData.TransactionDateTime,
185185
TestData.TransactionReference,
@@ -217,7 +217,7 @@ public async Task SafaricomPinlessProxy_ProcessSaleMessage_InvalidData_ErrorThro
217217
{
218218
await safaricomPinlessproxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
219219
TestData.TransactionId,
220-
TestData.OperatorIdentifier1,
220+
TestData.OperatorId,
221221
TestData.Merchant,
222222
TestData.TransactionDateTime,
223223
TestData.TransactionReference,

‎TransactionProcessor.BusinessLogic.Tests/OperatorInterfaces/VoucherManagementProxyTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task VoucherManagementProxy_ProcessSaleMessage_VoucherIssueSuccessf
3636

3737
OperatorResponse operatorResponse = await voucherManagementProxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
3838
TestData.TransactionId,
39-
TestData.OperatorIdentifier1,
39+
TestData.OperatorId,
4040
TestData.Merchant,
4141
TestData.TransactionDateTime,
4242
TestData.TransactionReference,
@@ -68,7 +68,7 @@ public async Task VoucherManagementProxy_ProcessSaleMessage_InvalidData_Transact
6868
{
6969
await voucherManagementProxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
7070
TestData.TransactionId,
71-
TestData.OperatorIdentifier1,
71+
TestData.OperatorId,
7272
TestData.Merchant,
7373
TestData.TransactionDateTime,
7474
TestData.TransactionReference,
@@ -102,7 +102,7 @@ public async Task VoucherManagementProxy_ProcessSaleMessage_InvalidData_Recipien
102102
{
103103
await voucherManagementProxy.ProcessSaleMessage(TestData.TokenResponse().AccessToken,
104104
TestData.TransactionId,
105-
TestData.OperatorIdentifier1,
105+
TestData.OperatorId,
106106
TestData.Merchant,
107107
TestData.TransactionDateTime,
108108
TestData.TransactionReference,

‎TransactionProcessor.BusinessLogic.Tests/RequestHandler/VoucherManagementRequestHandlerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class VoucherManagementRequestHandlerTests
2121
public async Task VoucherManagementRequestHandler_IssueVoucherRequest_IsHandled()
2222
{
2323
Mock<IVoucherDomainService> voucherDomainService = new Mock<IVoucherDomainService>();
24-
voucherDomainService.Setup(v => v.IssueVoucher(It.IsAny<Guid>(), It.IsAny<String>(), It.IsAny<Guid>(),
24+
voucherDomainService.Setup(v => v.IssueVoucher(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(),
2525
It.IsAny<Guid>(), It.IsAny<DateTime>(),
2626
It.IsAny<Decimal>(), It.IsAny<String>(), It.IsAny<String>(),
2727
It.IsAny<CancellationToken>())).ReturnsAsync(TestData.IssueVoucherResponse);

‎TransactionProcessor.BusinessLogic.Tests/Requests/RequestTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void ProcessSaleTransactionRequest_CanBeCreated_IsCreated() {
5959
TestData.TransactionTypeLogon.ToString(),
6060
TestData.TransactionDateTime,
6161
TestData.TransactionNumber,
62-
TestData.OperatorIdentifier1,
62+
TestData.OperatorId,
6363
TestData.CustomerEmailAddress,
6464
TestData.AdditionalTransactionMetaDataForMobileTopup(),
6565
TestData.ContractId,
@@ -74,7 +74,7 @@ public void ProcessSaleTransactionRequest_CanBeCreated_IsCreated() {
7474
processSaleTransactionRequest.TransactionDateTime.ShouldBe(TestData.TransactionDateTime);
7575
processSaleTransactionRequest.TransactionNumber.ShouldBe(TestData.TransactionNumber);
7676
processSaleTransactionRequest.TransactionId.ShouldBe(TestData.TransactionId);
77-
processSaleTransactionRequest.OperatorIdentifier.ShouldBe(TestData.OperatorIdentifier1);
77+
processSaleTransactionRequest.OperatorId.ShouldBe(TestData.OperatorId);
7878
processSaleTransactionRequest.CustomerEmailAddress.ShouldBe(TestData.CustomerEmailAddress);
7979
processSaleTransactionRequest.AdditionalTransactionMetadata.ShouldNotBeNull();
8080
processSaleTransactionRequest.AdditionalTransactionMetadata.Count.ShouldBe(TestData.AdditionalTransactionMetaDataForMobileTopup().Count);
@@ -109,7 +109,7 @@ public void Test_CanBeCreated_IsCreated() {
109109
public void IssueVoucherRequest_CanBeCreated_IsCreated()
110110
{
111111
IssueVoucherRequest issueVoucherRequest = IssueVoucherRequest.Create(TestData.VoucherId,
112-
TestData.OperatorIdentifier,
112+
TestData.OperatorId,
113113
TestData.EstateId,
114114
TestData.TransactionId,
115115
TestData.IssuedDateTime,
@@ -119,7 +119,7 @@ public void IssueVoucherRequest_CanBeCreated_IsCreated()
119119

120120
issueVoucherRequest.ShouldNotBeNull();
121121
issueVoucherRequest.VoucherId.ShouldBe(TestData.VoucherId);
122-
issueVoucherRequest.OperatorIdentifier.ShouldBe(TestData.OperatorIdentifier);
122+
issueVoucherRequest.OperatorId.ShouldBe(TestData.OperatorId);
123123
issueVoucherRequest.EstateId.ShouldBe(TestData.EstateId);
124124
issueVoucherRequest.TransactionId.ShouldBe(TestData.TransactionId);
125125
issueVoucherRequest.Value.ShouldBe(TestData.Value);

0 commit comments

Comments
 (0)