Merge pull request #202 from TransactionProcessing/bug/#201_preventduplicatefilelines

Prevent duplicate file lines

Author: StuartFerguson

FileProcessor.BusinessLogic.Tests/FileRequestHandlerTests.cs

@@ -486,13 +486,13 @@ public void FileRequestHandler_ProcessTransactionLineForFileRequest_LineInReques
             Logger.Initialise(NullLogger.Instance);
 
             ProcessTransactionForFileLineRequest processTransactionForFileLineRequest1 =
-                new ProcessTransactionForFileLineRequest(TestData.FileId, 1, TestData.FileLine);
+                new ProcessTransactionForFileLineRequest(TestData.FileId, 1, TestData.FileLine1);
             ProcessTransactionForFileLineRequest processTransactionForFileLineRequest2 =
-                new ProcessTransactionForFileLineRequest(TestData.FileId, 2, TestData.FileLine);
+                new ProcessTransactionForFileLineRequest(TestData.FileId, 1, TestData.FileLine2);
             ProcessTransactionForFileLineRequest processTransactionForFileLineRequest3 =
-                new ProcessTransactionForFileLineRequest(TestData.FileId, 3, TestData.FileLine);
+                new ProcessTransactionForFileLineRequest(TestData.FileId, 3, TestData.FileLine3);
             ProcessTransactionForFileLineRequest processTransactionForFileLineRequest4 =
-                new ProcessTransactionForFileLineRequest(TestData.FileId, 4, TestData.FileLine);
+                new ProcessTransactionForFileLineRequest(TestData.FileId, 4, TestData.FileLine4);
 
             Should.NotThrow(async () =>
             {

FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs

@@ -297,7 +297,7 @@ private async Task<Unit> ProcessFile(Guid fileId,
 
                     foreach (String fileLine in fileLines)
                     {
-                        fileAggregate.AddFileLine(fileLine);
+                        fileAggregate.AddFileLine(fileLine.Trim());
                     }
 
                     await this.FileAggregateRepository.SaveChanges(fileAggregate, cancellationToken);

FileProcessor.FileAggregate.Tests/FileAggregateTests.cs

@@ -94,6 +94,22 @@ public void FileAggregate_AddFileLine_FileLineAdded()
             fileDetails.ProcessingSummary.IgnoredLines.ShouldBe(0);
         }
 
+        [Fact]
+        public void FileAggregate_AddFileLine_AddDuplicateLine_FileLineIsNotAddedAdded()
+        {
+            FileAggregate fileAggregate = FileAggregate.Create(TestData.FileId);
+            fileAggregate.CreateFile(TestData.FileImportLogId, TestData.EstateId, TestData.MerchantId, TestData.UserId,
+                                     TestData.FileProfileId, TestData.FileLocation, TestData.FileUploadedDateTime);
+            fileAggregate.AddFileLine(TestData.FileLine);
+            fileAggregate.AddFileLine(TestData.FileLine);
+
+            FileDetails fileDetails = fileAggregate.GetFile();
+            fileDetails.FileLines.ShouldNotBeNull();
+            fileDetails.FileLines.ShouldNotBeEmpty();
+            fileDetails.FileLines.ShouldHaveSingleItem();
+            fileDetails.FileLines.Count.ShouldBe(1);
+        }
+
         [Fact]
         public void FileAggregate_AddFileLine_FileNotCreated_FileLineAdded()
         {

FileProcessor.FileAggregate/FileAggregate.cs

@@ -267,6 +267,12 @@ public void AddFileLine(String fileLine)
                 throw new InvalidOperationException($"File Id {this.AggregateId} has not been uploaded yet");
             }
 
+            Boolean lineAlreadyExists = this.FileLines.Any(f => f.LineData == fileLine);
+
+            // We already have this line so just return
+            if (lineAlreadyExists)
+                return;
+
             Int32 lineNumber = this.FileLines.Count + 1;
 
             FileLineAddedEvent fileLineAddedEvent = new FileLineAddedEvent(this.AggregateId, this.EstateId, lineNumber, fileLine);

FileProcessor.Testing/TestData.cs

@@ -39,8 +39,12 @@ public class TestData
         public static Int32 LineNumber = 1;
 
         public static Int32 NotFoundLineNumber = 100;
-        
+
         public static String FileLine = "D,124567,100";
+        public static String FileLine1 = "D,124567,100";
+        public static String FileLine2 = "D,124568,100";
+        public static String FileLine3 = "D,124569,100";
+        public static String FileLine4 = "D,124560,100";
 
         public static String FileLocation = "home/txnproc/bulkfiles/safaricom/ExampleFile.csv";
 
@@ -269,9 +273,9 @@ public static FileAggregate GetFileAggregateWithLinesAlreadyProcessed()
 
             fileAggregate.CreateFile(TestData.FileImportLogId,TestData.EstateId, TestData.MerchantId, TestData.UserId, TestData.FileProfileId, TestData.OriginalFileName, TestData.FileUploadedDateTime);
             fileAggregate.AddFileLine("D,1,2");
-            fileAggregate.AddFileLine("D,1,2");
-            fileAggregate.AddFileLine("D,1,2");
-            fileAggregate.AddFileLine("D,1,2");
+            fileAggregate.AddFileLine("D,1,3");
+            fileAggregate.AddFileLine("D,1,4");
+            fileAggregate.AddFileLine("D,1,5");
             fileAggregate.RecordFileLineAsSuccessful(1, TestData.TransactionId);
             fileAggregate.RecordFileLineAsRejected(2, TestData.RejectionReason);
             fileAggregate.RecordFileLineAsFailed(3, TestData.TransactionId, "-1","Failed");