Merge pull request #787 from TransactionProcessing/bug/#783_statement_date_issues

Bug/#783 statement date issues

Author: StuartFerguson

TransactionProcessor.DataTransferObjects/DataTransferObject.cs

@@ -31,6 +31,15 @@ public class DataTransferObject
         [JsonProperty("merchant_id")]
         public Guid MerchantId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the transaction date time.
+        /// </summary>
+        /// <value>
+        /// The transaction date time.
+        /// </value>
+        [JsonProperty("transaction_date_time")]
+        public DateTime TransactionDateTime { get; set; }
+
         #endregion
     }
 }

TransactionProcessor.DataTransferObjects/LogonTransactionRequest.cs

@@ -20,16 +20,7 @@ public class LogonTransactionRequest : DataTransferObject
         /// </value>
         [JsonProperty("device_identifier")]
         public String DeviceIdentifier { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transaction date time.
-        /// </summary>
-        /// <value>
-        /// The transaction date time.
-        /// </value>
-        [JsonProperty("transaction_date_time")]
-        public DateTime TransactionDateTime { get; set; }
-
+        
         /// <summary>
         /// Gets or sets the transaction number.
         /// </summary>

TransactionProcessor.DataTransferObjects/ReconciliationRequest.cs

@@ -41,15 +41,6 @@ public class ReconciliationRequest : DataTransferObject
         [JsonProperty("transaction_count")]
         public Int32 TransactionCount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the transaction date time.
-        /// </summary>
-        /// <value>
-        /// The transaction date time.
-        /// </value>
-        [JsonProperty("transaction_date_time")]
-        public DateTime TransactionDateTime { get; set; }
-
         /// <summary>
         /// Gets or sets the transaction value.
         /// </summary>

TransactionProcessor.DataTransferObjects/SaleTransactionRequest.cs

@@ -27,10 +27,7 @@ public class SaleTransactionRequest : DataTransferObject
 
         [JsonProperty("product_id")]
         public Guid ProductId { get; set; }
-
-        [JsonProperty("transaction_date_time")]
-        public DateTime TransactionDateTime { get; set; }
-
+        
         [JsonProperty("transaction_number")]
         public String TransactionNumber { get; set; }
 

TransactionProcessor/Controllers/TransactionController.cs

@@ -4,15 +4,11 @@
 
 namespace TransactionProcessor.Controllers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Threading;
-    using System.Threading.Tasks;
     using BusinessLogic.Requests;
     using Common.Examples;
     using DataTransferObjects;
     using Factories;
+    using Humanizer;
     using MediatR;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -21,6 +17,11 @@ namespace TransactionProcessor.Controllers
     using Shared.General;
     using Swashbuckle.AspNetCore.Annotations;
     using Swashbuckle.AspNetCore.Filters;
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// 
@@ -81,8 +82,13 @@ public async Task<IActionResult> PerformTransaction([FromBody] SerialisedMessage
                                                                                        {
                                                                                            TypeNameHandling = TypeNameHandling.Auto
                                                                                        });
+
             dto.MerchantId = merchantId;
             dto.EstateId = estateId;
+            if (dto.TransactionDateTime.Kind == DateTimeKind.Utc)
+            {
+                dto.TransactionDateTime = new DateTime(dto.TransactionDateTime.Ticks, DateTimeKind.Unspecified);
+            }
 
             Result<SerialisedMessage> transactionResult = dto switch {
                 LogonTransactionRequest ltr => await this.ProcessSpecificMessage(ltr, cancellationToken),
@@ -124,7 +130,7 @@ private async Task<Result<SerialisedMessage>> ProcessSpecificMessage(LogonTransa
                                                                              CancellationToken cancellationToken)
         {
             Guid transactionId = Guid.NewGuid();
-
+            
             TransactionCommands.ProcessLogonTransactionCommand command = new(transactionId,
                                                                                                        logonTransactionRequest.EstateId,
                                                                                                        logonTransactionRequest.MerchantId,