Merge pull request #62 from TransactionProcessing/task/#57_allowuploaddateinuploadrequest

Allow upload date to be passed with file

Author: StuartFerguson

FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs

@@ -124,7 +124,7 @@ public FileRequestHandler(IFileProcessorManager fileProcessorManager,
         public async Task<Guid> Handle(UploadFileRequest request,
                                        CancellationToken cancellationToken)
         {
-            DateTime importLogDateTime = DateTime.Now;
+            DateTime importLogDateTime = request.FileUploadedDateTime;
 
             // This will now create the import log and add an event for the file being uploaded
             Guid importLogId = this.CreateGuidFromDateTime(importLogDateTime.Date);

FileProcessor.DataTransferObjects/Requests/UploadFileRequest.cs

@@ -4,18 +4,54 @@ namespace FileProcessor.DataTransferObjects
 {
     using Newtonsoft.Json;
 
+    /// <summary>
+    /// 
+    /// </summary>
     public class UploadFileRequest
     {
+        /// <summary>
+        /// Gets or sets the estate identifier.
+        /// </summary>
+        /// <value>
+        /// The estate identifier.
+        /// </value>
         [JsonProperty("estate_id")]
         public Guid EstateId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the merchant identifier.
+        /// </summary>
+        /// <value>
+        /// The merchant identifier.
+        /// </value>
         [JsonProperty("merchant_id")]
         public Guid MerchantId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>
+        /// The user identifier.
+        /// </value>
         [JsonProperty("user_id")]
         public Guid UserId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the file profile identifier.
+        /// </summary>
+        /// <value>
+        /// The file profile identifier.
+        /// </value>
         [JsonProperty("file_profile_id")]
         public Guid FileProfileId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the upload date time.
+        /// </summary>
+        /// <value>
+        /// The upload date time.
+        /// </value>
+        [JsonProperty("upload_date_time")]
+        public DateTime UploadDateTime { get; set; }
     }
 }

FileProcessor/Controllers/FileController.cs

@@ -88,9 +88,14 @@ public async Task<IActionResult> UploadFile([FromForm] UploadFileRequest request
                 await file.CopyToAsync(stream, cancellationToken);
             }
 
+            if (request.UploadDateTime == DateTime.MinValue)
+            {
+                request.UploadDateTime = DateTime.Now;
+            }
+
             // Create a command with the file in it
             BusinessLogic.Requests.UploadFileRequest uploadFileRequest =
-                new BusinessLogic.Requests.UploadFileRequest(request.EstateId, request.MerchantId, request.UserId, fullPath, request.FileProfileId, DateTime.Now);
+                new BusinessLogic.Requests.UploadFileRequest(request.EstateId, request.MerchantId, request.UserId, fullPath, request.FileProfileId, request.UploadDateTime);
 
             Guid fileId = await this.Mediator.Send(uploadFileRequest, cancellationToken);