Merge branch 'main' into copilot/refactor-transaction-summary-method

Author: StuartFerguson

EstateReportingAPI.BusinessLogic/ReportingManager.cs

@@ -516,41 +516,31 @@ public async Task<Result<List<Merchant>>> GetRecentMerchants(MerchantQueries.Get
         var merchantsQuery = context.Merchants.Select(m => new {
             MerchantReportingId = m.MerchantReportingId,
             Name = m.Name,
-            LastSaleDateTime = m.LastSaleDateTime,
-            LastSale = m.LastSaleDate,
             CreatedDateTime = m.CreatedDateTime,
-            LastStatement = m.LastStatementGenerated,
             MerchantId = m.MerchantId,
             Reference = m.Reference,
-            AddressInfo = context.MerchantAddresses.Where(ma => ma.MerchantId == m.MerchantId).OrderByDescending(ma => ma.CreatedDateTime).Select(ma => new {
-                ma.AddressLine1,
-                ma.AddressLine2,
-                ma.Country,
-                ma.PostalCode,
-                ma.Region,
-                ma.Town
-                // Add more properties as needed
-            }).FirstOrDefault(), // Get the first matching MerchantAddress or null
-            ContactInfo = context.MerchantContacts.Where(mc => mc.MerchantId == m.MerchantId).OrderByDescending(mc => mc.CreatedDateTime).Select(mc => new { mc.Name, mc.EmailAddress, mc.PhoneNumber }).FirstOrDefault(), // Get the first matching MerchantContact or null
-            EstateReportingId = context.Estates.Single(e => e.EstateId == m.EstateId).EstateReportingId
+            AddressInfo = context.MerchantAddresses.Where(ma => ma.MerchantId == m.MerchantId)
+                .OrderByDescending(ma => ma.CreatedDateTime)
+                .Select(ma => new { ma.AddressLine1, ma.AddressLine2, ma.Country, ma.PostalCode, ma.Region, ma.Town })
+                .FirstOrDefault(),
+            ContactInfo = context.MerchantContacts.Where(mc => mc.MerchantId == m.MerchantId)
+                .OrderByDescending(mc => mc.CreatedDateTime)
+                .Select(mc => new { mc.Name, mc.EmailAddress, mc.PhoneNumber })
+                .FirstOrDefault()
         }).OrderByDescending(m => m.CreatedDateTime).Take(3);
 
         var recentMerchantsResult = await ExecuteQuerySafeToList(merchantsQuery, cancellationToken, "Error retrieving recent merchants");
         if (recentMerchantsResult.IsFailed)
             return ResultHelpers.CreateFailure(recentMerchantsResult);
 
-        var recentMerchants = recentMerchantsResult.Data;
-
-        List<Merchant> merchantList = new();
-        foreach (var merchant in recentMerchants) {
+        List<Merchant> merchantList = recentMerchantsResult.Data.Select(merchant => {
             Merchant model = new() {
                 MerchantId = merchant.MerchantId,
                 Name = merchant.Name,
                 Reference = merchant.Reference,
                 MerchantReportingId = merchant.MerchantReportingId,
                 CreatedDateTime = merchant.CreatedDateTime,
             };
-
             if (merchant.AddressInfo != null) {
                 model.AddressLine1 = merchant.AddressInfo.AddressLine1;
                 model.AddressLine2 = merchant.AddressInfo.AddressLine2;
@@ -559,15 +549,13 @@ public async Task<Result<List<Merchant>>> GetRecentMerchants(MerchantQueries.Get
                 model.Town = merchant.AddressInfo.Town;
                 model.Region = merchant.AddressInfo.Region;
             }
-
             if (merchant.ContactInfo != null) {
                 model.ContactName = merchant.ContactInfo.Name;
                 model.ContactEmail = merchant.ContactInfo.EmailAddress;
                 model.ContactPhone = merchant.ContactInfo.PhoneNumber;
             }
-
-            merchantList.Add(model);
-        }
+            return model;
+        }).ToList();
 
         return Result.Success(merchantList);
     }
@@ -665,12 +653,26 @@ public async Task<Result<Operator>> GetOperator(OperatorQueries.GetOperatorQuery
 
     public async Task<Result<TransactionDetailReportResponse>> GetTransactionDetailReport(TransactionQueries.TransactionDetailReportQuery request,
                                                                                           CancellationToken cancellationToken) {
-
-        TransactionDetailReportResponse response = null;
         using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
         await using EstateManagementContext context = resolvedContext.Context;
 
-        var query = from t in context.Transactions
+        var query = ApplyTransactionDetailFilters(BuildTransactionDetailBaseQuery(context, request.Request), request.Request);
+        var queryResult = await ExecuteQuerySafeToList(query, cancellationToken, "Error retrieving transaction details report");
+
+        if (queryResult.IsFailed)
+            return ResultHelpers.CreateFailure(queryResult);
+
+        var queryResults = queryResult.Data;
+
+        if (queryResults.Any() == false)
+            return new TransactionDetailReportResponse { Summary = new TransactionDetailSummary(), Transactions = new List<TransactionDetail>() };
+
+        return Result.Success(MapToTransactionDetailResponse(queryResults));
+    }
+
+    private static IQueryable<TransactionDetailQueryResult> BuildTransactionDetailBaseQuery(EstateManagementContext context,
+                                                                                             TransactionDetailReportRequest request) {
+        return from t in context.Transactions
             join cp in context.ContractProducts on new { t.ContractProductId, t.ContractId } equals new { cp.ContractProductId, cp.ContractId }
             join m in context.Merchants on t.MerchantId equals m.MerchantId
             join o in context.Operators on t.OperatorId equals o.OperatorId
@@ -679,10 +681,10 @@ from msf in msfJoin.DefaultIfEmpty()
             // left join Settlements (msf may be null)
             join s in context.Settlements on msf.SettlementId equals s.SettlementId into sJoin
             from s in sJoin.DefaultIfEmpty()
-            where t.TransactionType != "Logon" && t.TransactionDate >= request.Request.StartDate && t.TransactionDate <= request.Request.EndDate
-            select new {
-                t.TransactionId,
-                t.TransactionDateTime,
+            where t.TransactionType != "Logon" && t.TransactionDate >= request.StartDate && t.TransactionDate <= request.EndDate
+            select new TransactionDetailQueryResult {
+                TransactionId = t.TransactionId,
+                TransactionDateTime = t.TransactionDateTime,
                 MerchantId = m.MerchantId,
                 MerchantReportingId = m.MerchantReportingId,
                 MerchantName = m.Name,
@@ -698,33 +700,21 @@ from s in sJoin.DefaultIfEmpty()
                 FeeValue = msf != null ? msf.FeeValue : 0m,
                 SettlementId = s != null ? s.SettlementId : Guid.Empty,
             };
+    }
 
-        // Now apply the filters
-        if (request.Request.Merchants != null && request.Request.Merchants.Any()) {
-            query = query.Where(q => request.Request.Merchants.Contains(q.MerchantReportingId));
-        }
-
-        if (request.Request.Products != null && request.Request.Products.Any()) {
-            query = query.Where(q => request.Request.Products.Contains(q.ContractProductReportingId));
-        }
-
-        if (request.Request.Operators != null && request.Request.Operators.Any()) {
-            query = query.Where(q => request.Request.Operators.Contains(q.OperatorReportingId));
-        }
-
-        var queryResult = await ExecuteQuerySafeToList(query, cancellationToken, "Error retrieving transaction details report");
-
-        if (queryResult.IsFailed)
-            return ResultHelpers.CreateFailure(queryResult);
-
-        // Ok now enumerate the results
-        var queryResults = queryResult.Data;
-
-        if (queryResults.Any() == false)
-            return new TransactionDetailReportResponse { Summary = new TransactionDetailSummary(), Transactions = new List<TransactionDetail>() };
+    private static IQueryable<TransactionDetailQueryResult> ApplyTransactionDetailFilters(IQueryable<TransactionDetailQueryResult> query,
+                                                                                           TransactionDetailReportRequest request) {
+        if (request.Merchants != null && request.Merchants.Any())
+            query = query.Where(q => request.Merchants.Contains(q.MerchantReportingId));
+        if (request.Products != null && request.Products.Any())
+            query = query.Where(q => request.Products.Contains(q.ContractProductReportingId));
+        if (request.Operators != null && request.Operators.Any())
+            query = query.Where(q => request.Operators.Contains(q.OperatorReportingId));
+        return query;
+    }
 
-        // Now to translate the results
-        response = new TransactionDetailReportResponse {
+    private static TransactionDetailReportResponse MapToTransactionDetailResponse(List<TransactionDetailQueryResult> queryResults) {
+        return new TransactionDetailReportResponse {
             Transactions = queryResults.Select(q => new TransactionDetail {
                 Id = q.TransactionId,
                 DateTime = q.TransactionDateTime,
@@ -745,8 +735,6 @@ from s in sJoin.DefaultIfEmpty()
             }).ToList(),
             Summary = new TransactionDetailSummary { TransactionCount = queryResults.Count(), TotalValue = queryResults.Sum(q => q.Value), TotalFees = queryResults.Sum(q => q.FeeValue) }
         };
-
-        return Result.Success(response);
     }
 
     public async Task<Result<TransactionSummaryByMerchantResponse>> GetTransactionSummaryByMerchantReport(TransactionQueries.TransactionSummaryByMerchantQuery request,
@@ -1152,44 +1140,48 @@ public async Task<Result<ProductPerformanceResponse>> GetProductPerformanceRepor
 
         using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
         await using EstateManagementContext context = resolvedContext.Context;
-        var grandTotalAmountQuery = (from t in context.Transactions where t.TransactionType == "Sale" && t.TransactionDate >= new DateTime(2025, 12, 21) && t.TransactionDate <= new DateTime(2025, 12, 25) select t.TransactionAmount);
 
+        var grandTotalAmountQuery = (from t in context.Transactions where t.TransactionType == "Sale" && t.TransactionDate >= new DateTime(2025, 12, 21) && t.TransactionDate <= new DateTime(2025, 12, 25) select t.TransactionAmount);
         var grandTotalAmountResult = await ExecuteQuerySafeSum<decimal>(grandTotalAmountQuery, cancellationToken);
         if (grandTotalAmountResult.IsFailed)
             return ResultHelpers.CreateFailure(grandTotalAmountResult);
         var grandTotalAmount = grandTotalAmountResult.Data;
 
-        var query = from t in context.Transactions
+        var query = BuildProductPerformanceQuery(context, request.StartDate, request.EndDate, grandTotalAmount);
+        var queryResult = await ExecuteQuerySafeToList(query, cancellationToken);
+        if (queryResult.IsFailed)
+            return ResultHelpers.CreateFailure(queryResult);
+        var queryResults = queryResult.Data;
+        if (queryResults.Any() == false)
+            return Result.Success(new ProductPerformanceResponse() { Summary = new ProductPerformanceSummary(), ProductDetails = new List<ProductPerformanceDetail>() });
+
+        return Result.Success(BuildProductPerformanceResponse(queryResults));
+    }
+
+    private static IQueryable<ProductPerformanceItemData> BuildProductPerformanceQuery(EstateManagementContext context,
+                                                                                       DateTime startDate,
+                                                                                       DateTime endDate,
+                                                                                       decimal grandTotalAmount) {
+        return from t in context.Transactions
             join cp in context.ContractProducts on new { t.ContractProductId, t.ContractId } equals new { cp.ContractProductId, cp.ContractId }
             join c in context.Contracts on t.ContractId equals c.ContractId
-            where t.TransactionType == "Sale" && t.TransactionDate >= request.StartDate && t.TransactionDate <= request.EndDate
-            group t by new {
-                cp.ProductName,
-                cp.ContractProductId,
-                cp.ContractProductReportingId,
-                c.ContractId,
-                c.ContractReportingId
-            }
+            where t.TransactionType == "Sale" && t.TransactionDate >= startDate && t.TransactionDate <= endDate
+            group t by new { cp.ProductName, cp.ContractProductId, cp.ContractProductReportingId, c.ContractId, c.ContractReportingId }
             into g
-            select new {
-                g.Key.ProductName,
-                g.Key.ContractProductId,
-                g.Key.ContractProductReportingId,
-                g.Key.ContractId,
-                g.Key.ContractReportingId,
+            select new ProductPerformanceItemData {
+                ProductName = g.Key.ProductName,
+                ContractProductId = g.Key.ContractProductId,
+                ContractProductReportingId = g.Key.ContractProductReportingId,
+                ContractId = g.Key.ContractId,
+                ContractReportingId = g.Key.ContractReportingId,
                 TransactionCount = g.Count(),
                 TotalAmount = g.Sum(x => x.TransactionAmount),
                 PercentOfTotalAmount = grandTotalAmount == 0 ? 0 : 100.0m * g.Sum(x => x.TransactionAmount) / grandTotalAmount
             };
+    }
 
-        var queryResult = await ExecuteQuerySafeToList(query, cancellationToken);
-        if (queryResult.IsFailed)
-            return ResultHelpers.CreateFailure(queryResult);
-        var queryResults = queryResult.Data;
-        if (queryResults.Any() == false)
-            return Result.Success(new ProductPerformanceResponse() { Summary = new ProductPerformanceSummary(), ProductDetails = new List<ProductPerformanceDetail>() });
-
-        ProductPerformanceResponse response = new ProductPerformanceResponse() {
+    private ProductPerformanceResponse BuildProductPerformanceResponse(List<ProductPerformanceItemData> queryResults) {
+        return new ProductPerformanceResponse {
             ProductDetails = queryResults.Select(q => new ProductPerformanceDetail {
                 ProductName = q.ProductName,
                 ProductId = q.ContractProductId,
@@ -1202,8 +1194,6 @@ into g
             }).ToList(),
             Summary = new ProductPerformanceSummary { TotalCount = queryResults.Sum(q => q.TransactionCount), TotalValue = queryResults.Sum(q => q.TotalAmount), AveragePerProduct = this.SafeDivide(queryResults.Sum(q => q.TotalAmount), queryResults.Count), TotalProducts = queryResults.Count() }
         };
-
-        return Result.Success(response);
     }
 
     public async Task<Result<List<TodaysSalesByHour>>> GetTodaysSalesByHour(TransactionQueries.TodaysSalesByHour request,
@@ -1418,6 +1408,23 @@ private sealed class MerchantTransactionFinalProjection {
             public int AuthorisedCount { get; init; }
             public int DeclinedCount { get; init; }
             public decimal AuthorisedPercentage { get; init; }
+        private sealed class TransactionDetailQueryResult {
+            public Guid TransactionId { get; init; }
+            public DateTime TransactionDateTime { get; init; }
+            public Guid MerchantId { get; init; }
+            public int MerchantReportingId { get; init; }
+            public string? MerchantName { get; init; }
+            public Guid OperatorId { get; init; }
+            public int OperatorReportingId { get; init; }
+            public string? OperatorName { get; init; }
+            public string? ProductName { get; init; }
+            public Guid ContractProductId { get; init; }
+            public int ContractProductReportingId { get; init; }
+            public string? TransactionType { get; init; }
+            public string? Status { get; init; }
+            public decimal Value { get; init; }
+            public decimal FeeValue { get; init; }
+            public Guid SettlementId { get; init; }
         }
 
         private sealed class ContractBaseData {
@@ -1448,6 +1455,17 @@ private sealed class ContractFeeData {
             public bool IsEnabled { get; init; }
         }
 
+        private sealed class ProductPerformanceItemData {
+            public string? ProductName { get; init; }
+            public Guid ContractProductId { get; init; }
+            public int ContractProductReportingId { get; init; }
+            public Guid ContractId { get; init; }
+            public int ContractReportingId { get; init; }
+            public int TransactionCount { get; init; }
+            public decimal TotalAmount { get; init; }
+            public decimal PercentOfTotalAmount { get; init; }
+        }
+
         #endregion
     }