Merge pull request #15 from TransactionProcessing/task/#5_fileimportlog

Added Import log to processing

Author: StuartFerguson

FIleProcessor.Models/FileDetails.cs

@@ -51,12 +51,20 @@ public class FileDetails
         public Guid  FileProfileId { get; set; }
 
         /// <summary>
-        /// Gets or sets the name of the original file.
+        /// Gets or sets the file import log identifier.
         /// </summary>
         /// <value>
-        /// The name of the original file.
+        /// The file import log identifier.
         /// </value>
-        public String OriginalFileName { get; set; }
+        public Guid FileImportLogId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file location.
+        /// </summary>
+        /// <value>
+        /// The file location.
+        /// </value>
+        public String FileLocation { get; set; }
 
         /// <summary>
         /// Gets or sets the file lines.

FIleProcessor.Models/ImportLogFile.cs

@@ -0,0 +1,71 @@
+namespace FIleProcessor.Models
+{
+    using System;
+    using System.Collections.Generic;
+
+    public class FileImportLog
+    {
+        public Guid EstateId { get; set; }
+        public DateTime FileImportLogDateTime { get; set; }
+        public Guid FileImportLogId { get; set; }
+        public List<ImportLogFile> Files { get; set; }
+    }
+    public class ImportLogFile
+    {
+        /// <summary>
+        /// Gets or sets the file identifier.
+        /// </summary>
+        /// <value>
+        /// The file identifier.
+        /// </value>
+        public Guid FileId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the estate identifier.
+        /// </summary>
+        /// <value>
+        /// The estate identifier.
+        /// </value>
+        public Guid EstateId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>
+        /// The user identifier.
+        /// </value>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the merchant identifier.
+        /// </summary>
+        /// <value>
+        /// The merchant identifier.
+        /// </value>
+        public Guid MerchantId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file profile identifier.
+        /// </summary>
+        /// <value>
+        /// The file profile identifier.
+        /// </value>
+        public Guid FileProfileId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the original file.
+        /// </summary>
+        /// <value>
+        /// The name of the original file.
+        /// </value>
+        public String OriginalFileName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file path.
+        /// </summary>
+        /// <value>
+        /// The file path.
+        /// </value>
+        public String FilePath { get; set; }
+    }
+}

FileProcessor.BusinessLogic.Tests/DomainEventHandlerTests.cs

@@ -9,6 +9,7 @@ namespace FileProcessor.BusinessLogic.Tests
     using System.Threading;
     using EventHandling;
     using File.DomainEvents;
+    using FileImportLog.DomainEvents;
     using MediatR;
     using Moq;
     using Shouldly;
@@ -29,5 +30,17 @@ public void FileDomainEventHandler_FileLineAddedEvent_EventIsHandled()
                                 await eventHandler.Handle(fileLineAddedEvent, CancellationToken.None);
                             });
         }
+
+        [Fact]
+        public void FileDomainEventHandler_FileAddedToImportLogEvent_EventIsHandled()
+        {
+            Mock<IMediator> mediator = new Mock<IMediator>();
+            FileDomainEventHandler eventHandler = new FileDomainEventHandler(mediator.Object);
+            FileAddedToImportLogEvent fileAddedToImportLogEvent = TestData.FileAddedToImportLogEvent;
+            Should.NotThrow(async () =>
+                            {
+                                await eventHandler.Handle(fileAddedToImportLogEvent, CancellationToken.None);
+                            });
+        }
     }
 }

FileProcessor.BusinessLogic.Tests/FileRequestHandlerTests.cs

@@ -23,6 +23,20 @@ public void UploadFileRequest_CanBeCreated_IsCreated()
             uploadFileRequest.FileProfileId.ShouldBe(TestData.FileProfileId);
         }
 
+        [Fact]
+        public void ProcessUploadedFileRequest_CanBeCreated_IsCreated()
+        {
+            ProcessUploadedFileRequest processUploadedFileRequest =
+                new ProcessUploadedFileRequest(TestData.EstateId, TestData.MerchantId, TestData.FileId, TestData.UserId, TestData.FilePath, TestData.FileProfileId);
+
+            processUploadedFileRequest.EstateId.ShouldBe(TestData.EstateId);
+            processUploadedFileRequest.MerchantId.ShouldBe(TestData.MerchantId);
+            processUploadedFileRequest.FileId.ShouldBe(TestData.FileId);
+            processUploadedFileRequest.UserId.ShouldBe(TestData.UserId);
+            processUploadedFileRequest.FilePath.ShouldBe(TestData.FilePath);
+            processUploadedFileRequest.FileProfileId.ShouldBe(TestData.FileProfileId);
+        }
+
         [Fact]
         public void SafaricomTopupRequest_CanBeCreated_IsCreated()
         {

FileProcessor.BusinessLogic.Tests/RequestTests.cs

@@ -8,6 +8,7 @@ namespace FileProcessor.BusinessLogic.EventHandling
     using EstateManagement.Client;
     using File.DomainEvents;
     using FileAggregate;
+    using FileImportLog.DomainEvents;
     using Managers;
     using MediatR;
     using Microsoft.Extensions.Logging;
@@ -78,7 +79,25 @@ private async Task HandleSpecificDomainEvent(FileLineAddedEvent domainEvent,
 
             await this.Mediator.Send(request, cancellationToken);
         }
-        
+
+        /// <summary>
+        /// Handles the specific domain event.
+        /// </summary>
+        /// <param name="domainEvent">The domain event.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        private async Task HandleSpecificDomainEvent(FileAddedToImportLogEvent domainEvent,
+                                                     CancellationToken cancellationToken)
+        {
+            ProcessUploadedFileRequest request = new ProcessUploadedFileRequest(domainEvent.EstateId,
+                                                                                domainEvent.MerchantId,
+                                                                                domainEvent.FileId,
+                                                                                domainEvent.UserId,
+                                                                                domainEvent.FilePath,
+                                                                                domainEvent.FileProfileId);
+
+            await this.Mediator.Send(request, cancellationToken);
+        }
+
         #endregion
     }
 }

FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs

@@ -17,6 +17,7 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\FileProcessor.FileAggregate\FileProcessor.FileAggregate.csproj" />
+	  <ProjectReference Include="..\FileProcessor.FileImportLogAggregate\FileProcessor.FileImportLogAggregate.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj

@@ -15,6 +15,7 @@ namespace FileProcessor.BusinessLogic.RequestHandlers
     using EventHandling;
     using FileAggregate;
     using FileFormatHandlers;
+    using FileImportLogAggregate;
     using FIleProcessor.Models;
     using Managers;
     using Newtonsoft.Json;
@@ -32,10 +33,11 @@ namespace FileProcessor.BusinessLogic.RequestHandlers
     /// <summary>
     /// 
     /// </summary>
-    /// <seealso cref="MediatR.IRequestHandler{FileProcessor.BusinessLogic.Requests.UploadFileRequest}" />
-    /// <seealso cref="MediatR.IRequestHandler{FileProcessor.BusinessLogic.Requests.SafaricomTopupRequest}" />
-    /// <seealso cref="MediatR.IRequestHandler{FileProcessor.BusinessLogic.Requests.ProcessTransactionForFileLineRequest}" />
+    /// <seealso cref="UploadFileRequest" />
+    /// <seealso cref="SafaricomTopupRequest" />
+    /// <seealso cref="ProcessTransactionForFileLineRequest" />
     public class FileRequestHandler : IRequestHandler<UploadFileRequest>,
+                                      IRequestHandler<ProcessUploadedFileRequest>,
                                       IRequestHandler<SafaricomTopupRequest>,
                                       IRequestHandler<ProcessTransactionForFileLineRequest>
     {
@@ -44,6 +46,8 @@ public class FileRequestHandler : IRequestHandler<UploadFileRequest>,
         /// </summary>
         private readonly IFileProcessorManager FileProcessorManager;
 
+        private readonly IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent> FileImportLogAggregateRepository;
+
         /// <summary>
         /// The file aggregate repository
         /// </summary>
@@ -85,6 +89,7 @@ public class FileRequestHandler : IRequestHandler<UploadFileRequest>,
         /// <param name="fileFormatHandlerResolver">The file format handler resolver.</param>
         /// <param name="fileSystem">The file system.</param>
         public FileRequestHandler(IFileProcessorManager fileProcessorManager,
+                                  IAggregateRepository<FileImportLogAggregate, DomainEventRecord.DomainEvent> fileImportLogAggregateRepository,
                                   IAggregateRepository<FileAggregate, DomainEventRecord.DomainEvent> fileAggregateRepository,
                                   ITransactionProcessorClient transactionProcessorClient,
                                   IEstateClient estateClient,
@@ -93,6 +98,7 @@ public FileRequestHandler(IFileProcessorManager fileProcessorManager,
                                   IFileSystem fileSystem)
         {
             this.FileProcessorManager = fileProcessorManager;
+            this.FileImportLogAggregateRepository = fileImportLogAggregateRepository;
             this.FileAggregateRepository = fileAggregateRepository;
             this.TransactionProcessorClient = transactionProcessorClient;
             this.EstateClient = estateClient;
@@ -115,8 +121,21 @@ public FileRequestHandler(IFileProcessorManager fileProcessorManager,
         public async Task<Unit> Handle(UploadFileRequest request,
                                        CancellationToken cancellationToken)
         {
-            // TODO: Should the file id be generated from the file uploaded to protect against duplicate files???
-            // Find the file profile
+            DateTime importLogDateTime = DateTime.Now;
+
+            // This will now create the import log and add an event for the file being uploaded
+            Guid importLogId = this.CreateGuidFromDateTime(importLogDateTime.Date);
+
+            // Get the import log
+            FileImportLogAggregate fileImportLogAggregate = await this.FileImportLogAggregateRepository.GetLatestVersion(importLogId, cancellationToken);
+
+            if (fileImportLogAggregate.IsCreated == false)
+            {
+                // First file of the day so create
+                fileImportLogAggregate.CreateImportLog(request.EstateId, importLogDateTime);
+            }
+
+            // Move the file
             FileProfile fileProfile = await this.FileProcessorManager.GetFileProfile(request.FileProfileId, cancellationToken);
 
             if (fileProfile == null)
@@ -137,14 +156,35 @@ public async Task<Unit> Handle(UploadFileRequest request,
                 throw new DirectoryNotFoundException($"Directory {fileProfile.ListeningDirectory} not found");
             }
 
-            file.MoveTo($"{fileProfile.ListeningDirectory}\\{request.EstateId:N}-{request.FileId:N}", overwrite:true);
+            String fileDestination = $"{fileProfile.ListeningDirectory}\\{request.EstateId:N}-{request.FileId:N}";
+            file.MoveTo(fileDestination, overwrite:true);;
+
+            // Update Import log aggregate
+            fileImportLogAggregate.AddImportedFile(request.FileId, request.MerchantId, request.UserId, request.FileProfileId, originalName, fileDestination);
+
+            // Save changes
+            await this.FileImportLogAggregateRepository.SaveChanges(fileImportLogAggregate, cancellationToken);
 
-            // Write file to import log
-            // TODO:
+            return new Unit();
+        }
 
+        private Guid CreateGuidFromDateTime(DateTime dateTime)
+        {
+            var bytes = BitConverter.GetBytes(dateTime.Ticks);
+
+            Array.Resize(ref bytes, 16);
+
+            var guid = new Guid(bytes);
+
+            return guid;
+        }
+
+        public async Task<Unit> Handle(ProcessUploadedFileRequest request, CancellationToken cancellationToken)
+        {
+            // TODO: Should the file id be generated from the file uploaded to protect against duplicate files???
             FileAggregate fileAggregate = await this.FileAggregateRepository.GetLatestVersion(request.FileId, cancellationToken);
 
-            fileAggregate.UploadFile(request.EstateId, request.MerchantId, request.UserId, request.FileProfileId, originalName);
+            fileAggregate.CreateFile(request.FileImportLogId, request.EstateId, request.MerchantId, request.UserId, request.FileProfileId, request.FilePath);
 
             await this.FileAggregateRepository.SaveChanges(fileAggregate, cancellationToken);
 
@@ -169,6 +209,11 @@ public async Task<Unit> Handle(UploadFileRequest request,
         public async Task<Unit> Handle(SafaricomTopupRequest request,
                                        CancellationToken cancellationToken)
         {
+            FileAggregate fileAggregate = await this.FileAggregateRepository.GetLatestVersion(request.FileId, cancellationToken);
+
+            if (fileAggregate.IsCreated == false)
+                return new Unit();
+
             IFileInfo file = this.FileSystem.FileInfo.FromFileName(request.FileName);
 
             if (file.Exists == false)
@@ -217,8 +262,6 @@ public async Task<Unit> Handle(SafaricomTopupRequest request,
 
             if (String.IsNullOrEmpty(fileContent) == false)
             {
-                FileAggregate fileAggregate = await this.FileAggregateRepository.GetLatestVersion(request.FileId, cancellationToken);
-
                 String[] fileLines = fileContent.Split(Environment.NewLine);
 
                 foreach (String fileLine in fileLines)