Fix to request validation

Author: StuartFerguson

FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs

@@ -94,6 +94,42 @@ public async Task FileRequestHandler_UploadFileRequest_RequestIsHandled()
                         });
     }
 
+    [Fact]
+    public async Task FileRequestHandler_UploadFileRequest_MerchantIdNotProvided_ErrorThrown()
+    {
+        UploadFileRequest uploadFileRequest =
+            new UploadFileRequest(TestData.EstateId, Guid.Empty, TestData.UserId, TestData.FilePathWithName, TestData.FileProfileId, TestData.FileUploadedDateTime);
+
+        Should.Throw<InvalidDataException>(async () =>
+                                           {
+                                               await this.FileProcessorDomainService.UploadFile(uploadFileRequest, CancellationToken.None);
+                                           });
+    }
+
+    [Fact]
+    public async Task FileRequestHandler_UploadFileRequest_FileProfileIdNotProvided_ErrorThrown()
+    {
+        UploadFileRequest uploadFileRequest =
+            new UploadFileRequest(TestData.EstateId, TestData.MerchantId, TestData.UserId, TestData.FilePathWithName, Guid.Empty, TestData.FileUploadedDateTime);
+
+        Should.Throw<InvalidDataException>(async () =>
+                                           {
+                                               await this.FileProcessorDomainService.UploadFile(uploadFileRequest, CancellationToken.None);
+                                           });
+    }
+
+    [Fact]
+    public async Task FileRequestHandler_UploadFileRequest_UserIdNotProvided_ErrorThrown()
+    {
+        UploadFileRequest uploadFileRequest =
+            new UploadFileRequest(TestData.EstateId, TestData.MerchantId, Guid.Empty, TestData.FilePathWithName, TestData.FileProfileId, TestData.FileUploadedDateTime);
+
+        Should.Throw<InvalidDataException>(async () =>
+                                           {
+                                               await this.FileProcessorDomainService.UploadFile(uploadFileRequest, CancellationToken.None);
+                                           });
+    }
+
     [Fact]
     public async Task FileRequestHandler_UploadFileRequest_ImportLogAlreadyCreated_RequestIsHandled()
     {

FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs

@@ -69,6 +69,8 @@ public async Task<Guid> UploadFile(UploadFileRequest request,
                                        CancellationToken cancellationToken) {
         DateTime importLogDateTime = request.FileUploadedDateTime;
 
+        this.ValidateRequest(request);
+
         // This will now create the import log and add an event for the file being uploaded
         Guid importLogId = Helpers.CalculateFileImportLogAggregateId(importLogDateTime.Date, request.EstateId);
 
@@ -129,6 +131,22 @@ public async Task<Guid> UploadFile(UploadFileRequest request,
         return fileId;
     }
 
+    private void ValidateRequest(UploadFileRequest request){
+        if (request.UserId == Guid.Empty){
+            throw new InvalidDataException("No User Id provided with file upload");
+        }
+
+        if (request.MerchantId == Guid.Empty)
+        {
+            throw new InvalidDataException("No Merchant Id provided with file upload");
+        }
+
+        if (request.FileProfileId == Guid.Empty)
+        {
+            throw new InvalidDataException("No File Profile Id provided with file upload");
+        }
+    }
+
     public async Task ProcessUploadedFile(ProcessUploadedFileRequest request,
                                           CancellationToken cancellationToken) {
         // TODO: Should the file id be generated from the file uploaded to protect against duplicate files???