Merge pull request #89 from TransactionProcessing/bug/#86_lastsettlement_failure

Bug/#86 lastsettlement failure

Author: StuartFerguson

EstateReportingAPI.IntegrationTests/FactSettlementsControllerTests.cs

@@ -233,6 +233,35 @@ public async Task FactSettlementsController_LastSettlement_SettlementReturned(Cl
             lastSettlement.SalesValue.ShouldBe(completeTotalsList.Sum(c => c.settledTransactions));
         }
 
+        [Theory]
+        [InlineData(ClientType.Api)]
+        [InlineData(ClientType.Direct)]
+        public async Task FactSettlementsController_LastSettlement_NoSettlementRecords_SettlementReturned(ClientType clientType)
+        {
+            EstateManagementGenericContext context = new EstateManagementSqlServerContext(GetLocalConnectionString($"EstateReportingReadModel{TestId.ToString()}"));
+
+            DatabaseHelper helper = new DatabaseHelper(context);
+            
+            await helper.RunSettlementSummaryProcessing(DateTime.Now.AddDays(-1));
+
+            Func<Task<LastSettlement>> asyncFunction = async () =>
+            {
+                LastSettlement result = clientType switch
+                {
+                    ClientType.Api => await ApiClient.GetLastSettlement(string.Empty, Guid.NewGuid(), CancellationToken.None),
+                    _ => await CreateAndSendHttpRequestMessage<LastSettlement>($"api/facts/settlements/lastsettlement", CancellationToken.None)
+                };
+                return result;
+            };
+
+            LastSettlement lastSettlement = await ExecuteAsyncFunction(asyncFunction);
+
+            lastSettlement.ShouldNotBeNull();
+            lastSettlement.FeesValue.ShouldBe(0);
+            lastSettlement.SalesCount.ShouldBe(0);
+            lastSettlement.SalesValue.ShouldBe(0);
+        }
+
 
         [Theory(Skip = "To be fixed")]
         [InlineData(ClientType.Api)]

EstateReportingAPI/Controllers/FactSettlementController.cs

@@ -59,17 +59,20 @@ public async Task<IActionResult> TodaysSettlement([FromHeader] Guid estateId, [F
 
         [HttpGet]
         [Route("lastsettlement")]
-        public async Task<IActionResult> LastSettlement([FromHeader] Guid estateId, CancellationToken cancellationToken)
-        {
+        public async Task<IActionResult> LastSettlement([FromHeader] Guid estateId,
+                                                        CancellationToken cancellationToken) {
             LastSettlement model = await this.ReportingManager.GetLastSettlement(estateId, cancellationToken);
 
-            LastSettlement response = new LastSettlement()
-                                        {
-                                            SalesCount = model.SalesCount,
-                                            FeesValue = model.FeesValue,
-                                            SalesValue = model.SalesValue,
-                                            SettlementDate = model.SettlementDate,
-                                        };
+            if (model == null) {
+                return this.Ok(new LastSettlement());
+            }
+
+            LastSettlement response = new LastSettlement() {
+                SalesCount = model.SalesCount,
+                FeesValue = model.FeesValue,
+                SalesValue = model.SalesValue,
+                SettlementDate = model.SettlementDate,
+            };
 
             return this.Ok(response);
         }