Merge pull request #277 from TransactionProcessing/bug/#263_immediatesettlementextracompleted

Stop immediate settlement generating extra completed events

Author: StuartFerguson

TransactionProcessor.SettlementAggregates.Tests/SettlementAggregateTests.cs

@@ -174,5 +174,21 @@ public void SettlementAggregate_MarkFeeAsSettled_FeeAlreadySettled_NoErrorThrown
             aggregate.MarkFeeAsSettled(TestData.MerchantId, TestData.TransactionId, TestData.CalculatedFeeMerchantFee().FeeId);
         }
 
+        [Fact]
+        public void SettlementAggregate_ImmediatelyMarkFeeAsSettled_FeeIsSettledAndSettlementNotCompleted()
+        {
+            SettlementAggregate aggregate = SettlementAggregate.Create(TestData.SettlementAggregateId);
+            aggregate.Create(TestData.EstateId, TestData.SettlementDate);
+            aggregate.AddFee(TestData.MerchantId, TestData.TransactionId, TestData.CalculatedFeeMerchantFee());
+
+            aggregate.GetNumberOfFeesPendingSettlement().ShouldBe(1);
+
+            aggregate.ImmediatelyMarkFeeAsSettled(TestData.MerchantId, TestData.TransactionId, TestData.CalculatedFeeMerchantFee().FeeId);
+
+            aggregate.GetNumberOfFeesPendingSettlement().ShouldBe(0);
+            aggregate.GetNumberOfFeesSettled().ShouldBe(1);
+            aggregate.SettlementComplete.ShouldBeFalse();
+        }
+
     }
 }

TransactionProcessor.SettlementAggregates/SettlementAggregate.cs

@@ -104,6 +104,39 @@ public void MarkFeeAsSettled(Guid merchantId, Guid transactionId, Guid feeId)
             }
         }
 
+        public void ImmediatelyMarkFeeAsSettled(Guid merchantId, Guid transactionId, Guid feeId)
+        {
+            var pendingFee = this.CalculatedFeesPendingSettlement.Where(c => c.merchantId == merchantId && c.transactionId == transactionId && c.calculatedFee.FeeId == feeId)
+                          .SingleOrDefault();
+
+            var settledFee = this.SettledCalculatedFees.Where(c => c.merchantId == merchantId && c.transactionId == transactionId && c.calculatedFee.FeeId == feeId)
+                          .SingleOrDefault();
+
+            if (settledFee != default((Guid, Guid, CalculatedFee)))
+            {
+                // Fee already settled....
+                return;
+            }
+
+            if (pendingFee == default((Guid, Guid, CalculatedFee)))
+            {
+                // Fee not found....
+                return;
+            }
+
+            MerchantFeeSettledEvent merchantFeeSettledEvent = new MerchantFeeSettledEvent(this.AggregateId,
+                                                                                          this.EstateId,
+                                                                                          pendingFee.merchantId,
+                                                                                          pendingFee.transactionId,
+                                                                                          pendingFee.calculatedFee.CalculatedValue,
+                                                                                          (Int32)pendingFee.calculatedFee.FeeCalculationType,
+                                                                                          pendingFee.calculatedFee.FeeId,
+                                                                                          pendingFee.calculatedFee.FeeValue,
+                                                                                          pendingFee.calculatedFee.FeeCalculatedDateTime);
+
+            this.ApplyAndAppend(merchantFeeSettledEvent);
+        }
+
         public void AddFee(Guid merchantId,
                            Guid transactionId,
                            CalculatedFee calculatedFee)