refactored api for using with new blazor ui

EstateReportingAPI.BusinessLogic/DatabaseProjections.cs

@@ -9,6 +9,7 @@
 using TransactionProcessor.Database.Contexts;
 using TransactionProcessor.Database.Entities;
 using TransactionProcessor.Database.Entities.Summary;
+using ContractProduct = TransactionProcessor.Database.Entities.ContractProduct;
 using Merchant = TransactionProcessor.Database.Entities.Merchant;
 using Operator = TransactionProcessor.Database.Entities.Operator;
 

EstateReportingAPI.BusinessLogic/EstateReportingAPI.BusinessLogic.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="MediatR" Version="14.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.1" />
     <PackageReference Include="Shared" Version="2025.12.2" />
-    <PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
+    <PackageReference Include="TransactionProcessor.Database" Version="2025.12.2-build270" />
   </ItemGroup>
 
   <ItemGroup>

EstateReportingAPI.BusinessLogic/Queries/Archive/ArchiveCode.cs

@@ -0,0 +1,66 @@
+using EstateReportingAPI.Models;
+using MediatR;
+using SimpleResults;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+
+namespace EstateReportingAPI.BusinessLogic.Queries.Archive
+{
+    public record MerchantQueries
+    {
+        public record GetMerchantsQuery(Guid EstateId) : IRequest<Result<List<Merchant>>>;
+
+        public record GetByLastSaleQuery(Guid EstateId, DateTime StartDateTime, DateTime EndDateTime) : IRequest<Result<List<Merchant>>>;
+        public record GetTopMerchantsBySalesValueQuery(Guid EstateId, Int32 numberOfMerchants) : IRequest<Result<List<TopBottomData>>>;
+        public record GetBottomMerchantsBySalesValueQuery(Guid EstateId, Int32 numberOfMerchants) : IRequest<Result<List<TopBottomData>>>;
+        public record GetMerchantPerformanceQuery(Guid EstateId, DateTime comparisonDate, List<Int32> merchantReportingIds) : IRequest<Result<TodaysSales>>;
+    }
+
+
+    [ExcludeFromCodeCoverage]
+    public record OperatorQueries
+    {
+        public record GetOperatorsQuery(Guid EstateId) : IRequest<Result<List<Operator>>>;
+        public record GetOperatorPerformanceQuery(Guid EstateId, DateTime comparisonDate, List<Int32> operatorReportingIds) : IRequest<Result<TodaysSales>>;
+        public record GetTopOperatorsBySalesValueQuery(Guid EstateId, Int32 numberOfOperators) : IRequest<Result<List<TopBottomData>>>;
+        public record GetBottomOperatorsBySalesValueQuery(Guid EstateId, Int32 numberOfOperators) : IRequest<Result<List<TopBottomData>>>;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public record ProductQueries
+    {
+        public record GetProductPerformanceQuery(Guid EstateId, DateTime comparisonDate, List<Int32> productReportingIds) : IRequest<Result<TodaysSales>>;
+        public record GetTopProductsBySalesValueQuery(Guid EstateId, Int32 numberOfProducts) : IRequest<Result<List<TopBottomData>>>;
+        public record GetBottomProductsBySalesValueQuery(Guid EstateId, Int32 numberOfProducts) : IRequest<Result<List<TopBottomData>>>;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public record ResponseCodeQueries
+    {
+        public record GetResponseCodesQuery(Guid EstateId) : IRequest<Result<List<ResponseCode>>>;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public record SettlementQueries
+    {
+        public record GetTodaysSettlementQuery(Guid EstateId, Int32 MerchantReportingId, Int32 OperatorReportingId, DateTime ComparisonDate) : IRequest<Result<TodaysSettlement>>;
+
+        public record GetLastSettlementQuery(Guid EstateId) : IRequest<Result<LastSettlement>>;
+
+        public record GetUnsettledFeesQuery(Guid EstateId, DateTime StartDate, DateTime EndDate, List<Int32> MerchantIdFilter, List<Int32> OperatorIdFilter, List<Int32> ProductIdFilter, GroupByOption GroupByOption) : IRequest<Result<List<UnsettledFee>>>;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public record TransactionQueries
+    {
+        public record TodaysSalesQuery(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<TodaysSales>>;
+        public record TodaysFailedSales(Guid estateId, DateTime comparisonDate, String responseCode) : IRequest<Result<TodaysSales>>;
+
+        public record TodaysSalesCountByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<List<Models.TodaysSalesCountByHour>>>;
+        public record TodaysSalesValueByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<List<Models.TodaysSalesValueByHour>>>;
+
+        public record TransactionSearchQuery(Guid estateId, TransactionSearchRequest request, PagingRequest pagingRequest, Models.SortingRequest sortingRequest) : IRequest<Result<List<Models.TransactionResult>>>;
+    }
+}

EstateReportingAPI.BusinessLogic/Queries/ContractQueries.cs

@@ -0,0 +1,13 @@
+using EstateReportingAPI.Models;
+using MediatR;
+using SimpleResults;
+using System.Diagnostics.CodeAnalysis;
+
+namespace EstateReportingAPI.BusinessLogic.Queries;
+
+[ExcludeFromCodeCoverage]
+public record ContractQueries {
+    public record GetRecentContractsQuery(Guid EstateId) : IRequest<Result<List<Contract>>>;
+    public record GetContractsQuery(Guid EstateId) : IRequest<Result<List<Contract>>>;
+    public record GetContractQuery(Guid EstateId, Guid ContractId) : IRequest<Result<Contract>>;
+}

EstateReportingAPI.BusinessLogic/Queries/EstateQueries.cs

@@ -0,0 +1,12 @@
+using System.Diagnostics.CodeAnalysis;
+using EstateReportingAPI.Models;
+using MediatR;
+using SimpleResults;
+
+namespace EstateReportingAPI.BusinessLogic.Queries;
+
+[ExcludeFromCodeCoverage]
+public record EstateQueries {
+    public record GetEstateQuery(Guid EstateId) : IRequest<Result<Estate>>;
+    public record GetEstateOperatorsQuery(Guid EstateId) : IRequest<Result<List<EstateOperator>>>;
+}

EstateReportingAPI.BusinessLogic/Queries/MerchantQueries.cs

@@ -7,10 +7,13 @@ namespace EstateReportingAPI.BusinessLogic.Queries;
 
 [ExcludeFromCodeCoverage]
 public record MerchantQueries {
-    public record GetMerchantsQuery(Guid EstateId) : IRequest<Result<List<Merchant>>>;
+    public record GetRecentMerchantsQuery(Guid EstateId) : IRequest<Result<List<Merchant>>>;
     public record GetTransactionKpisQuery(Guid EstateId) : IRequest<Result<MerchantKpi>>;
-    public record GetByLastSaleQuery(Guid EstateId, DateTime StartDateTime, DateTime EndDateTime) : IRequest<Result<List<Merchant>>>;
-    public record GetTopMerchantsBySalesValueQuery(Guid EstateId, Int32 numberOfMerchants) : IRequest<Result<List<TopBottomData>>>;
-    public record GetBottomMerchantsBySalesValueQuery(Guid EstateId, Int32 numberOfMerchants) : IRequest<Result<List<TopBottomData>>>;
-    public record GetMerchantPerformanceQuery(Guid EstateId, DateTime comparisonDate, List<Int32> merchantReportingIds) : IRequest<Result<TodaysSales>>;
+    public record GetMerchantsQuery(Guid EstateId, MerchantQueryOptions QueryOptions) : IRequest<Result<List<Merchant>>>;
+    public record GetMerchantQuery(Guid EstateId, Guid MerchantId) : IRequest<Result<Merchant>>;
+    public record GetMerchantOperatorsQuery(Guid EstateId, Guid MerchantId) : IRequest<Result<List<MerchantOperator>>>;
+    public record GetMerchantContractsQuery(Guid EstateId, Guid MerchantId) : IRequest<Result<List<MerchantContract>>>;
+    public record GetMerchantDevicesQuery(Guid EstateId, Guid MerchantId) : IRequest<Result<List<MerchantDevice>>>;
+
+    public record MerchantQueryOptions(String Name,String Reference,Int32? SettlementSchedule,String Region, String PostCode);
 }

EstateReportingAPI.BusinessLogic/Queries/OperatorQueries.cs

@@ -8,7 +8,5 @@ namespace EstateReportingAPI.BusinessLogic.Queries;
 [ExcludeFromCodeCoverage]
 public record OperatorQueries {
     public record GetOperatorsQuery(Guid EstateId) : IRequest<Result<List<Operator>>>;
-    public record GetOperatorPerformanceQuery(Guid EstateId, DateTime comparisonDate, List<Int32> operatorReportingIds) : IRequest<Result<TodaysSales>>;
-    public record GetTopOperatorsBySalesValueQuery(Guid EstateId, Int32 numberOfOperators) : IRequest<Result<List<TopBottomData>>>;
-    public record GetBottomOperatorsBySalesValueQuery(Guid EstateId, Int32 numberOfOperators) : IRequest<Result<List<TopBottomData>>>;
+    public record GetOperatorQuery(Guid EstateId, Guid OperatorId) : IRequest<Result<Operator>>;
 }

EstateReportingAPI.BusinessLogic/Queries/TransactionQueries.cs

@@ -7,11 +7,6 @@ namespace EstateReportingAPI.BusinessLogic.Queries;
 
 [ExcludeFromCodeCoverage]
 public record TransactionQueries {
-    public record TodaysSalesQuery(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<TodaysSales>>;
-    public record TodaysFailedSales(Guid estateId, DateTime comparisonDate, String responseCode) : IRequest<Result<TodaysSales>>;
-
-    public record TodaysSalesCountByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<List<Models.TodaysSalesCountByHour>>>;
-    public record TodaysSalesValueByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate) : IRequest<Result<List<Models.TodaysSalesValueByHour>>>;
-
-    public record TransactionSearchQuery(Guid estateId, TransactionSearchRequest request, PagingRequest pagingRequest, Models.SortingRequest sortingRequest) : IRequest<Result<List<Models.TransactionResult>>>;
+    public record TodaysSalesQuery(Guid EstateId, Int32 MerchantReportingId, Int32 OperatorReportingId, DateTime ComparisonDate) : IRequest<Result<TodaysSales>>;
+    public record TodaysFailedSales(Guid EstateId, DateTime ComparisonDate, String ResponseCode) : IRequest<Result<TodaysSales>>;
 }