Skip to content

Commit fcf9d6e

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #269 from TransactionProcessing/task/#267_pass_operatorid_with_sale
pass operator id as part of sale
2 parents 15f53fb + a0f8d41 commit fcf9d6e

File tree

19 files changed

+47
-42
lines changed

19 files changed

+47
-42
lines changed

‎TransactionProcessorACL.BusinessLogic.Tests/MediatorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public async Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid es
113113
DateTime transactionDateTime,
114114
String transactionNumber,
115115
String deviceIdentifier,
116-
String operatorIdentifier,
116+
Guid operatorId,
117117
String customerEmailAddress,
118118
Guid contractId,
119119
Guid productId,

‎TransactionProcessorACL.BusinessLogic.Tests/RequestHandlerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public async Task ProcessSaleTransactionRequestHandler_Handle_RequestIsHandled()
7373
It.IsAny<DateTime>(),
7474
It.IsAny<String>(),
7575
It.IsAny<String>(),
76-
It.IsAny<String>(),
76+
It.IsAny<Guid>(),
7777
It.IsAny<String>(),
7878
It.IsAny<Guid>(),
7979
It.IsAny<Guid>(),

‎TransactionProcessorACL.BusinessLogic.Tests/RequestTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void ProcessSaleTransactionRequest_CanBeCreated_IsCreated()
3939
TestData.TransactionDateTime,
4040
TestData.TransactionNumber,
4141
TestData.DeviceIdentifier,
42-
TestData.OperatorIdentifier,
42+
TestData.OperatorId,
4343
TestData.CustomerEmailAddress,
4444
TestData.ContractId,
4545
TestData.ProductId,
@@ -50,7 +50,7 @@ public void ProcessSaleTransactionRequest_CanBeCreated_IsCreated()
5050
request.TransactionDateTime.ShouldBe(TestData.TransactionDateTime);
5151
request.TransactionNumber.ShouldBe(TestData.TransactionNumber);
5252
request.DeviceIdentifier.ShouldBe(TestData.DeviceIdentifier);
53-
request.OperatorIdentifier.ShouldBe(TestData.OperatorIdentifier);
53+
request.OperatorId.ShouldBe(TestData.OperatorId);
5454
request.CustomerEmailAddress.ShouldBe(TestData.CustomerEmailAddress);
5555
request.ContractId.ShouldBe(TestData.ContractId);
5656
request.ProductId.ShouldBe(TestData.ProductId);

‎TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti
138138
TestData.TransactionDateTime,
139139
TestData.TransactionNumber,
140140
TestData.DeviceIdentifier,
141-
TestData.OperatorIdentifier,
141+
TestData.OperatorId,
142142
TestData.CustomerEmailAddress,
143143
TestData.ContractId,
144144
TestData.ProductId,
@@ -162,7 +162,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti
162162
TestData.TransactionDateTime,
163163
TestData.TransactionNumber,
164164
TestData.DeviceIdentifier,
165-
TestData.OperatorIdentifier,
165+
TestData.OperatorId,
166166
TestData.CustomerEmailAddress,
167167
TestData.ContractId,
168168
TestData.ProductId,
@@ -186,7 +186,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti
186186
TestData.TransactionDateTime,
187187
TestData.TransactionNumber,
188188
TestData.DeviceIdentifier,
189-
TestData.OperatorIdentifier,
189+
TestData.OperatorId,
190190
TestData.CustomerEmailAddress,
191191
TestData.ContractId,
192192
TestData.ProductId,
@@ -210,7 +210,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti
210210
TestData.TransactionDateTime,
211211
TestData.TransactionNumber,
212212
TestData.DeviceIdentifier,
213-
TestData.OperatorIdentifier,
213+
TestData.OperatorId,
214214
TestData.CustomerEmailAddress,
215215
TestData.ContractId,
216216
TestData.ProductId,

‎TransactionProcessorACL.BusinessLogic/RequestHandlers/ProcessSaleTransactionRequestHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task<ProcessSaleTransactionResponse> Handle(ProcessSaleTransactionR
4949
request.TransactionDateTime,
5050
request.TransactionNumber,
5151
request.DeviceIdentifier,
52-
request.OperatorIdentifier,
52+
request.OperatorId,
5353
request.CustomerEmailAddress,
5454
request.ContractId,
5555
request.ProductId,

‎TransactionProcessorACL.BusinessLogic/Requests/ProcessSaleTransactionRequest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private ProcessSaleTransactionRequest(Guid estateId,
3737
DateTime transactionDateTime,
3838
String transactionNumber,
3939
String deviceIdentifier,
40-
String operatorIdentifier,
40+
Guid operatorId,
4141
String customerEmailAddress,
4242
Guid contractId,
4343
Guid productId,
@@ -46,7 +46,7 @@ private ProcessSaleTransactionRequest(Guid estateId,
4646
this.EstateId = estateId;
4747
this.MerchantId = merchantId;
4848
this.DeviceIdentifier = deviceIdentifier;
49-
this.OperatorIdentifier = operatorIdentifier;
49+
this.OperatorId = operatorId;
5050
this.CustomerEmailAddress = customerEmailAddress;
5151
this.ContractId = contractId;
5252
this.ProductId = productId;
@@ -121,7 +121,7 @@ private ProcessSaleTransactionRequest(Guid estateId,
121121
/// <value>
122122
/// The operator identifier.
123123
/// </value>
124-
public String OperatorIdentifier { get; }
124+
public Guid OperatorId { get; }
125125

126126
/// <summary>
127127
/// Gets the transaction date time.
@@ -162,7 +162,7 @@ public static ProcessSaleTransactionRequest Create(Guid estateId,
162162
DateTime transactionDateTime,
163163
String transactionNumber,
164164
String deviceIdentifier,
165-
String operatorIdentifier,
165+
Guid operatorId,
166166
String customerEmailAddress,
167167
Guid contractId,
168168
Guid productId,
@@ -173,7 +173,7 @@ public static ProcessSaleTransactionRequest Create(Guid estateId,
173173
transactionDateTime,
174174
transactionNumber,
175175
deviceIdentifier,
176-
operatorIdentifier,
176+
operatorId,
177177
customerEmailAddress,
178178
contractId,
179179
productId,

‎TransactionProcessorACL.BusinessLogic/Services/ITransactionProcessorACLApplicationService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid estateId,
2626
DateTime transactionDateTime,
2727
String transactionNumber,
2828
String deviceIdentifier,
29-
String operatorIdentifier,
29+
Guid operatorId,
3030
String customerEmailAddress,
3131
Guid contractId,
3232
Guid productId,

‎TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public async Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid es
171171
DateTime transactionDateTime,
172172
String transactionNumber,
173173
String deviceIdentifier,
174-
String operatorIdentifier,
174+
Guid operatorId,
175175
String customerEmailAddress,
176176
Guid contractId,
177177
Guid productId,
@@ -189,7 +189,7 @@ public async Task<ProcessSaleTransactionResponse> ProcessSaleTransaction(Guid es
189189
saleTransactionRequest.DeviceIdentifier = deviceIdentifier;
190190
saleTransactionRequest.TransactionDateTime = transactionDateTime;
191191
saleTransactionRequest.TransactionType = "SALE";
192-
saleTransactionRequest.OperatorIdentifier = operatorIdentifier;
192+
saleTransactionRequest.OperatorId = operatorId;
193193
saleTransactionRequest.CustomerEmailAddress = customerEmailAddress;
194194
saleTransactionRequest.TransactionSource = 1; // Online sale
195195

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66

77
<ItemGroup>
88
<PackageReference Include="MediatR" Version="12.2.0" />
9-
<PackageReference Include="SecurityService.Client" Version="2024.3.2-build59" />
10-
<PackageReference Include="Shared" Version="2024.4.2" />
11-
<PackageReference Include="TransactionProcessor.Client" Version="2024.3.4-build97" />
9+
<PackageReference Include="SecurityService.Client" Version="2024.4.2-build62" />
10+
<PackageReference Include="Shared" Version="2024.4.3" />
11+
<PackageReference Include="TransactionProcessor.Client" Version="2024.4.2-build101" />
12+
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.4.2-build101" />
13+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.4.2-build101" />
1214
</ItemGroup>
1315

1416
<ItemGroup>

‎TransactionProcessorACL.DataTransferObjects/Requests/OperatorTotalRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class OperatorTotalRequest
2424
/// <value>
2525
/// The operator identifier.
2626
/// </value>
27-
[JsonProperty("operator_identifier")]
28-
public String OperatorIdentifier { get; set; }
27+
[JsonProperty("operator_id")]
28+
public Guid OperatorId { get; set; }
2929

3030
/// <summary>
3131
/// Gets or sets the transaction count.

0 commit comments

Comments
 (0)