Minor bug fixes to settlement processing

TransactionProcessor.BusinessLogic/EventHandling/TransactionDomainEventHandler.cs

@@ -229,6 +229,10 @@ private async Task HandleSpecificDomainEvent(TransactionHasBeenCompletedEvent do
                     await this.TransactionAggregateManager.AddFee(transactionAggregate.EstateId, transactionAggregate.AggregateId, calculatedFee, cancellationToken);
                 }
             }
+            else if (merchant.SettlementSchedule == SettlementSchedule.NotSet)
+            {
+                throw new NotSupportedException($"Merchant {merchant.MerchantId} does not have a settlement schedule configured");
+            }
             else
             {
                 foreach (CalculatedFee calculatedFee in merchantFees)

TransactionProcessor.SettlementAggregates.Tests/PendingSettlementAggregateTests.cs

@@ -61,6 +61,18 @@ public void PendingSettlementAggregate_AddFee_TwoFeesAdded_FeesAreAdded()
             aggregate.GetNumberOfFeesPendingSettlement().ShouldBe(2);
         }
 
+        [Fact]
+        public void PendingSettlementAggregate_AddFee_TwoFeesAdded_SameFeeIdDifferentTransaction_FeesAreAdded()
+        {
+            PendingSettlementAggregate aggregate = PendingSettlementAggregate.Create(TestData.PendingSettlementAggregateId);
+            aggregate.Create(TestData.EstateId, TestData.SettlementDate);
+            aggregate.AddFee(TestData.MerchantId, TestData.TransactionId, TestData.CalculatedFeeMerchantFee);
+            aggregate.AddFee(TestData.MerchantId, TestData.TransactionId2, TestData.CalculatedFeeMerchantFee);
+
+            aggregate.AggregateId.ShouldBe(TestData.PendingSettlementAggregateId);
+            aggregate.GetNumberOfFeesPendingSettlement().ShouldBe(2);
+        }
+
         [Fact]
         public void PendingSettlementAggregate_AddFee_AggregateNotCreated_ErrorThrown()
         {

TransactionProcessor.SettlementAggregates/PendingSettlementAggregate.cs

@@ -72,7 +72,7 @@ public void AddFee(Guid merchantId,
             }
 
             this.CheckHasBeenCreated();
-            this.CheckFeeHasNotAlreadyBeenAdded(calculatedFee);
+            this.CheckFeeHasNotAlreadyBeenAdded(transactionId, calculatedFee);
 
             DomainEventRecord.DomainEvent @event = null;
             if (calculatedFee.FeeType == FeeType.Merchant)
@@ -137,11 +137,11 @@ protected override Object GetMetadata()
             return null;
         }
 
-        private void CheckFeeHasNotAlreadyBeenAdded(CalculatedFee calculatedFee)
+        private void CheckFeeHasNotAlreadyBeenAdded(Guid transactionId, CalculatedFee calculatedFee)
         {
-            if (this.CalculatedFeesPendingSettlement.Any(c => c.calculatedFee.FeeId == calculatedFee.FeeId))
+            if (this.CalculatedFeesPendingSettlement.Any(c => c.calculatedFee.FeeId == calculatedFee.FeeId && c.transactionId == transactionId))
             {
-                throw new InvalidOperationException($"Fee with Id [{calculatedFee.FeeId}] has already been added to this days pending settlement");
+                throw new InvalidOperationException($"Fee with Id [{calculatedFee.FeeId}] for Transaction Id [{transactionId}] has already been added to this days pending settlement");
             }
         }
 

TransactionProcessor.Testing/TestData.cs

@@ -72,6 +72,8 @@ public class TestData
 
         public static Guid TransactionId = Guid.Parse("AE89B2F6-307B-46F4-A8E7-CEF27097D766");
 
+        public static Guid TransactionId2 = Guid.Parse("760E702C-682E-41B1-A582-3D4ECA0F38C3");
+
         public static Guid PendingSettlementAggregateId = Guid.Parse("BAEBA232-CD7F-46F5-AE2E-3204FE69A441");
 
         public static String TransactionNumber = "0001";