TransactionProcessing · StuartFerguson · Apr 12, 2021 · Apr 10, 2021 · Apr 11, 2021 · Apr 12, 2021
diff --git a/TransactionProcessorACL.BusinessLogic.Tests/RequestTests.cs b/TransactionProcessorACL.BusinessLogic.Tests/RequestTests.cs
@@ -22,15 +22,13 @@ public void ProcessLogonTransactionRequest_CanBeCreated_IsCreated()
                                                                                            TestData.MerchantId,
                                                                                            TestData.TransactionDateTime,
                                                                                            TestData.TransactionNumber,
-                                                                                           TestData.DeviceIdentifier,
-                                                                                           TestData.RequireConfigurationInResponseTrue);
+                                                                                           TestData.DeviceIdentifier);
 
             request.EstateId.ShouldBe(TestData.EstateId);
             request.MerchantId.ShouldBe(TestData.MerchantId);
             request.TransactionDateTime.ShouldBe(TestData.TransactionDateTime);
             request.TransactionNumber.ShouldBe(TestData.TransactionNumber);
             request.DeviceIdentifier.ShouldBe(TestData.DeviceIdentifier);
-            request.RequireConfigurationInResponse.ShouldBe(TestData.RequireConfigurationInResponseTrue);
         }
 
         [Fact]

diff --git a/...actionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj b/...actionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 	  <TargetFramework>net5.0</TargetFramework>
-    <DebugType>None</DebugType>
+    <DebugType>Full</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...sactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs b/...sactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACLApplicationServiceTests.cs
@@ -40,7 +40,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessLogonTransact
         {
             Mock<ITransactionProcessorClient> transactionProcessorClient = new Mock<ITransactionProcessorClient>();
             transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny<String>(), It.IsAny<SerialisedMessage>(), It.IsAny<CancellationToken>()))
-                                      .ReturnsAsync(TestData.SerialisedMessageResponse);
+                                      .ReturnsAsync(TestData.SerialisedMessageResponseLogon);
             Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
             securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
 
@@ -136,7 +136,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessSaleTransacti
         {
             Mock<ITransactionProcessorClient> transactionProcessorClient = new Mock<ITransactionProcessorClient>();
             transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny<String>(), It.IsAny<SerialisedMessage>(), It.IsAny<CancellationToken>()))
-                                      .ReturnsAsync(TestData.SerialisedMessageResponse);
+                                      .ReturnsAsync(TestData.SerialisedMessageResponseSale);
             Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
             securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
 
@@ -252,7 +252,7 @@ public async Task TransactionProcessorACLApplicationService_ProcessReconciliatio
         {
             Mock<ITransactionProcessorClient> transactionProcessorClient = new Mock<ITransactionProcessorClient>();
             transactionProcessorClient.Setup(t => t.PerformTransaction(It.IsAny<String>(), It.IsAny<SerialisedMessage>(), It.IsAny<CancellationToken>()))
-                                      .ReturnsAsync(TestData.SerialisedMessageResponse);
+                                      .ReturnsAsync(TestData.SerialisedMessageResponseReconciliation);
             Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
             securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
 

diff --git a/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs b/TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs
@@ -32,13 +32,11 @@ private ProcessLogonTransactionRequest(Guid estateId,
                                                Guid merchantId,
                                                DateTime transactionDateTime,
                                                String transactionNumber,
-                                               String deviceIdentifier,
-                                               Boolean requireConfigurationInResponse)
+                                               String deviceIdentifier)
         {
             this.EstateId = estateId;
             this.MerchantId = merchantId;
             this.DeviceIdentifier = deviceIdentifier;
-            this.RequireConfigurationInResponse = requireConfigurationInResponse;
             this.TransactionDateTime = transactionDateTime;
             this.TransactionNumber = transactionNumber;
         }
@@ -71,14 +69,6 @@ private ProcessLogonTransactionRequest(Guid estateId,
         /// </value>
         public Guid MerchantId { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether [require configuration in response].
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [require configuration in response]; otherwise, <c>false</c>.
-        /// </value>
-        public Boolean RequireConfigurationInResponse { get; }
-
         /// <summary>
         /// Gets the transaction date time.
         /// </summary>
@@ -107,16 +97,14 @@ private ProcessLogonTransactionRequest(Guid estateId,
         /// <param name="transactionDateTime">The transaction date time.</param>
         /// <param name="transactionNumber">The transaction number.</param>
         /// <param name="deviceIdentifier">The device identifier.</param>
-        /// <param name="requireConfigurationInResponse">if set to <c>true</c> [require configuration in response].</param>
         /// <returns></returns>
         public static ProcessLogonTransactionRequest Create(Guid estateId,
                                                             Guid merchantId,
                                                             DateTime transactionDateTime,
                                                             String transactionNumber,
-                                                            String deviceIdentifier,
-                                                            Boolean requireConfigurationInResponse)
+                                                            String deviceIdentifier)
         {
-            return new ProcessLogonTransactionRequest(estateId, merchantId, transactionDateTime, transactionNumber, deviceIdentifier, requireConfigurationInResponse);
+            return new ProcessLogonTransactionRequest(estateId, merchantId, transactionDateTime, transactionNumber, deviceIdentifier);
         }
 
         #endregion

diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="SecurityService.Client" Version="1.0.5" />
     <PackageReference Include="Shared" Version="1.0.5" />
-    <PackageReference Include="TransactionProcessor.Client" Version="1.0.11" />
+    <PackageReference Include="TransactionProcessor.Client" Version="1.0.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TransactionProcessorACL.DataTransferObjects/Requests/LogonTransactionRequestMessage.cs b/TransactionProcessorACL.DataTransferObjects/Requests/LogonTransactionRequestMessage.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     /// <summary>
     /// 
@@ -10,16 +11,6 @@
     [ExcludeFromCodeCoverage]
     public class LogonTransactionRequestMessage : TransactionRequestMessage
     {
-        #region Properties
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [require configuration in response].
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [require configuration in response]; otherwise, <c>false</c>.
-        /// </value>
-        public Boolean RequireConfigurationInResponse { get; set; }
-
-        #endregion
     }
 }
diff --git a/TransactionProcessorACL.DataTransferObjects/Requests/OperatorTotalRequest.cs b/TransactionProcessorACL.DataTransferObjects/Requests/OperatorTotalRequest.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     [ExcludeFromCodeCoverage]
     public class OperatorTotalRequest
@@ -14,6 +15,7 @@ public class OperatorTotalRequest
         /// <value>
         /// The contract identifier.
         /// </value>
+        [JsonProperty("contract_id")]
         public Guid ContractId { get; set; }
 
         /// <summary>
@@ -22,6 +24,7 @@ public class OperatorTotalRequest
         /// <value>
         /// The operator identifier.
         /// </value>
+        [JsonProperty("operator_identifier")]
         public String OperatorIdentifier { get; set; }
 
         /// <summary>
@@ -30,6 +33,7 @@ public class OperatorTotalRequest
         /// <value>
         /// The transaction count.
         /// </value>
+        [JsonProperty("transaction_count")]
         public Int32 TransactionCount { get; set; }
 
         /// <summary>
@@ -38,6 +42,7 @@ public class OperatorTotalRequest
         /// <value>
         /// The transaction value.
         /// </value>
+        [JsonProperty("transaction_value")]
         public Decimal TransactionValue { get; set; }
 
         #endregion

diff --git a/TransactionProcessorACL.DataTransferObjects/Requests/ReconciliationRequestMessage.cs b/TransactionProcessorACL.DataTransferObjects/Requests/ReconciliationRequestMessage.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     [ExcludeFromCodeCoverage]
     public class ReconciliationRequestMessage : TransactionRequestMessage
@@ -13,6 +14,7 @@ public class ReconciliationRequestMessage : TransactionRequestMessage
         /// <value>
         /// The operator totals.
         /// </value>
+        [JsonProperty("operator_totals")]
         public List<OperatorTotalRequest> OperatorTotals { get; set; }
 
         /// <summary>
@@ -21,6 +23,7 @@ public class ReconciliationRequestMessage : TransactionRequestMessage
         /// <value>
         /// The transaction count.
         /// </value>
+        [JsonProperty("transaction_count")]
         public Int32 TransactionCount { get; set; }
 
         /// <summary>
@@ -29,6 +32,7 @@ public class ReconciliationRequestMessage : TransactionRequestMessage
         /// <value>
         /// The transaction value.
         /// </value>
+        [JsonProperty("transaction_value")]
         public Decimal TransactionValue { get; set; }
     }
 }
diff --git a/TransactionProcessorACL.DataTransferObjects/Requests/SaleTransactionRequestMessage.cs b/TransactionProcessorACL.DataTransferObjects/Requests/SaleTransactionRequestMessage.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     /// <summary>
     /// 
@@ -11,37 +12,41 @@
     public class SaleTransactionRequestMessage : TransactionRequestMessage
     {
         #region Properties
-        
+
         /// <summary>
         /// Gets or sets the contract identifier.
         /// </summary>
         /// <value>
         /// The contract identifier.
         /// </value>
+        [JsonProperty("contract_id")]
         public Guid ContractId { get; set; }
-        
+
         /// <summary>
-        /// Gets or sets the customer email address.
+        /// Gets or sets the operator identifier.
         /// </summary>
         /// <value>
-        /// The customer email address.
+        /// The operator identifier.
         /// </value>
-        public String CustomerEmailAddress { get; set; }
+        [JsonProperty("operator_identifier")]
+        public String OperatorIdentifier { get; set; }
 
         /// <summary>
-        /// Gets or sets the operator identifier.
+        /// Gets or sets the customer email address.
         /// </summary>
         /// <value>
-        /// The operator identifier.
+        /// The customer email address.
         /// </value>
-        public String OperatorIdentifier { get; set; }
+        [JsonProperty("customer_email_address")]
+        public String CustomerEmailAddress { get; set; }
 
         /// <summary>
         /// Gets or sets the product identifier.
         /// </summary>
         /// <value>
         /// The product identifier.
         /// </value>
+        [JsonProperty("product_id")]
         public Guid ProductId { get; set; }
 
         #endregion

diff --git a/TransactionProcessorACL.DataTransferObjects/Requests/TransactionRequestMessage.cs b/TransactionProcessorACL.DataTransferObjects/Requests/TransactionRequestMessage.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     /// <summary>
     /// 
@@ -18,6 +19,7 @@ public class TransactionRequestMessage
         /// <value>
         /// The application version.
         /// </value>
+        [JsonProperty("application_version")]
         public String ApplicationVersion { get; set; }
 
         /// <summary>
@@ -26,6 +28,7 @@ public class TransactionRequestMessage
         /// <value>
         /// The device identifier.
         /// </value>
+        [JsonProperty("device_identifier")]
         public String DeviceIdentifier { get; set; }
 
         /// <summary>
@@ -34,6 +37,7 @@ public class TransactionRequestMessage
         /// <value>
         /// The transaction date time.
         /// </value>
+        [JsonProperty("transaction_date_time")]
         public DateTime TransactionDateTime { get; set; }
 
         /// <summary>
@@ -42,6 +46,7 @@ public class TransactionRequestMessage
         /// <value>
         /// The transaction number.
         /// </value>
+        [JsonProperty("transaction_number")]
         public String TransactionNumber { get; set; }
 
         /// <summary>
@@ -50,6 +55,7 @@ public class TransactionRequestMessage
         /// <value>
         /// The additional request meta data.
         /// </value>
+        [JsonProperty("additional_request_metadata")]
         public Dictionary<String,String> AdditionalRequestMetaData { get; set; }
 
         #endregion

diff --git a/TransactionProcessorACL.DataTransferObjects/Responses/TransactionResponseMessage.cs b/TransactionProcessorACL.DataTransferObjects/Responses/TransactionResponseMessage.cs
@@ -5,6 +5,7 @@
 namespace TransactionProcessorACL.DataTransferObjects.Responses
 {
     using System.Diagnostics.CodeAnalysis;
+    using Newtonsoft.Json;
 
     [ExcludeFromCodeCoverage]
     public class TransactionResponseMessage
@@ -15,6 +16,7 @@ public class TransactionResponseMessage
         /// <value>
         /// The response code.
         /// </value>
+        [JsonProperty("response_code")]
         public String ResponseCode { get; set; }
 
         /// <summary>
@@ -23,6 +25,7 @@ public class TransactionResponseMessage
         /// <value>
         /// The response message.
         /// </value>
+        [JsonProperty("response_message")]
         public String ResponseMessage { get; set; }
 
         /// <summary>
@@ -31,6 +34,7 @@ public class TransactionResponseMessage
         /// <value>
         /// The additional response meta data.
         /// </value>
+        [JsonProperty("additional_response_metadata")]
         public Dictionary<String, String> AdditionalResponseMetaData { get; set; }
 
         /// <summary>
@@ -39,6 +43,7 @@ public class TransactionResponseMessage
         /// <value>
         /// The estate identifier.
         /// </value>
+        [JsonProperty("estate_id")]
         public Guid EstateId { get; set; }
 
         /// <summary>
@@ -47,6 +52,7 @@ public class TransactionResponseMessage
         /// <value>
         /// The merchant identifier.
         /// </value>
+        [JsonProperty("merchant_id")]
         public Guid MerchantId { get; set; }
 
         /// <summary>
@@ -55,6 +61,7 @@ public class TransactionResponseMessage
         /// <value>
         ///   <c>true</c> if [requires application update]; otherwise, <c>false</c>.
         /// </value>
+        [JsonProperty("requires_application_update")]
         public Boolean RequiresApplicationUpdate { get; set; }
     }
 }
diff --git a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature
@@ -73,7 +73,7 @@ Scenario: Logon Transaction
 	| DateTime | TransactionNumber | TransactionType | MerchantName    | DeviceIdentifier | EstateName    |
 	| Today    | 3                 | Logon           | Test Merchant 3 | 123456789        | Test Estate 2 |
 
-	Then transaction response should contain the following information
+	Then the logon transaction response should contain the following information
 	| EstateName    | MerchantName    | TransactionNumber | TransactionType | ResponseCode | ResponseMessage |
 	| Test Estate 1 | Test Merchant 1 | 1                 | Logon           | 0000         | SUCCESS         |
 	| Test Estate 1 | Test Merchant 2 | 2                 | Logon           | 0000         | SUCCESS         |

diff --git a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
diff --git a/TransactionProcessorACL.IntegrationTests/Reconciliation/Reconciliation.feature b/TransactionProcessorACL.IntegrationTests/Reconciliation/Reconciliation.feature
@@ -100,7 +100,7 @@ Scenario: Reconciliation Transaction
 	| DateTime | MerchantName    | DeviceIdentifier | EstateName    | TransactionCount | TransactionValue |
 	| Today    | Test Merchant 3 | 123456782        | Test Estate 2 | 3                | 300.00           |
 
-	Then reconciliation response should contain the following information
+	Then the reconciliation response should contain the following information
 	| EstateName    | MerchantName    | ResponseCode | ResponseMessage |
 	| Test Estate 1 | Test Merchant 1 | 0000         | SUCCESS         |
 	| Test Estate 1 | Test Merchant 2 | 0000         | SUCCESS         |