Merge pull request #598 from TransactionProcessing/task/#590_remove_operatoridentifier_looukp_for_operatorid

Remove lookups based on operator name and use operator id

Author: StuartFerguson

TransactionProcessor.BusinessLogic.Tests/DomainEventHandlers/TransactionDomainEventHandlerTests.cs

@@ -76,10 +76,10 @@ public TransactionDomainEventHandlerTests()
         }
 
         [Theory]
-        [InlineData(SettlementSchedule.Immediate)]
-        [InlineData(SettlementSchedule.Weekly)]
-        [InlineData(SettlementSchedule.Monthly)]
-        public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenCompletedEvent_SuccessfulSale_EventIsHandled(SettlementSchedule settlementSchedule)
+        [InlineData(EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Immediate)]
+        [InlineData(EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Weekly)]
+        [InlineData(EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Monthly)]
+        public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenCompletedEvent_SuccessfulSale_EventIsHandled(EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule settlementSchedule)
         {
             this.FloatAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFloatAggregateWithCostValues);
 
@@ -94,7 +94,7 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
                 });
 
             this.EstateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(new MerchantResponse
+                .ReturnsAsync(new EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse
                 {
                     SettlementSchedule = settlementSchedule,
                 });
@@ -111,16 +111,16 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
 
             CalculatedFee merchantFee = transactionAggregate.GetFees().SingleOrDefault(f => f.FeeId == TestData.TransactionFeeId);
             merchantFee.ShouldNotBeNull();
-            if (settlementSchedule == SettlementSchedule.Immediate){
+            if (settlementSchedule == EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Immediate){
                 merchantFee.IsSettled.ShouldBeTrue();
             }
             else{
                 merchantFee.IsSettled.ShouldBeFalse();
             }
 
             var expectedSettlementDate = settlementSchedule switch{
-                SettlementSchedule.Monthly => transactionAggregate.TransactionDateTime.Date.AddMonths(1),
-                SettlementSchedule.Weekly => transactionAggregate.TransactionDateTime.Date.AddDays(7),
+                EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Monthly => transactionAggregate.TransactionDateTime.Date.AddMonths(1),
+                EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.Weekly => transactionAggregate.TransactionDateTime.Date.AddDays(7),
                 _ => transactionAggregate.TransactionDateTime.Date
             };
             merchantFee.SettlementDueDate.ShouldBe(expectedSettlementDate);
@@ -145,9 +145,9 @@ public async Task TransactionDomainEventHandler_Handle_TransactionHasBeenComplet
                                                                                                                                                                    });
 
             this.EstateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(new MerchantResponse
+                .ReturnsAsync(new EstateManagement.DataTransferObjects.Responses.Merchant.MerchantResponse
                               {
-                                  SettlementSchedule = SettlementSchedule.NotSet,
+                                  SettlementSchedule = EstateManagement.DataTransferObjects.Responses.Merchant.SettlementSchedule.NotSet,
                               });
             this.EstateClient.Setup(e => e.GetTransactionFeesForProduct(It.IsAny<String>(),
                                                                         It.IsAny<Guid>(),
@@ -211,6 +211,7 @@ public async Task TransactionDomainEventHandler_Handle_CustomerEmailReceiptReque
         {
             this.TransactionAggregateRepository.Setup(t => t.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);
+            this.EstateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetEstateResponseWithOperator1);
 
             this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
 

TransactionProcessor.BusinessLogic.Tests/Mediator/DummyTransactionDomainService.cs

@@ -25,7 +25,7 @@ public async Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid tr
                                                                              DateTime transactionDateTime,
                                                                              String transactionNumber,
                                                                              String deviceIdentifier,
-                                                                             String operatorId,
+                                                                             Guid operatorId,
                                                                              String customerEmailAddress,
                                                                              Dictionary<String, String> additionalTransactionMetadata,
                                                                              Guid contractId,

TransactionProcessor.BusinessLogic.Tests/Mediator/DummyVoucherDomainService.cs

@@ -9,7 +9,7 @@
 public class DummyVoucherDomainService : IVoucherDomainService
 {
     public async Task<IssueVoucherResponse> IssueVoucher(Guid voucherId,
-                                                         String operatorId,
+                                                         Guid operatorId,
                                                          Guid estateId,
                                                          Guid transactionId,
                                                          DateTime issuedDateTime,