more refactoring

EstateReportingAPI.BusinessLogic/DatabaseProjections.cs

@@ -0,0 +1,62 @@
+using EstateReportingAPI.Models;
+using Microsoft.EntityFrameworkCore;
+using Shared.EntityFramework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TransactionProcessor.Database.Contexts;
+using TransactionProcessor.Database.Entities;
+using TransactionProcessor.Database.Entities.Summary;
+using Merchant = TransactionProcessor.Database.Entities.Merchant;
+using Operator = TransactionProcessor.Database.Entities.Operator;
+
+namespace EstateReportingAPI.BusinessLogic
+{
+
+    public class DatabaseProjections {
+        public class SettlementGroupProjection
+        {
+            public decimal SettledValue { get; set; }
+            public int SettledCount { get; set; }
+
+            public decimal UnSettledValue { get; set; }
+            public int UnSettledCount { get; set; }
+        }
+
+
+
+
+        public class FeeTransactionProjection
+        {
+            public MerchantSettlementFee Fee { get; set; }
+            public Transaction Txn { get; set; }
+        }
+
+        public class TodaySettlementTransactionProjection
+        {
+            public MerchantSettlementFee Fee { get; set; }
+            public TodayTransaction Txn { get; set; }
+        }
+
+        public class ComparisonSettlementTransactionProjection
+        {
+            public MerchantSettlementFee Fee { get; set; }
+            public TransactionHistory Txn { get; set; }
+        }
+
+        public class TransactionSearchProjection {
+            public Transaction Transaction { get; set; }
+            public Operator Operator { get; set; }
+            public Merchant Merchant { get; set; }
+            public ContractProduct Product { get; set; }
+        }
+
+        public class TopBottomData
+        {
+            public String DimensionName { get; set; }
+            public Decimal SalesValue { get; set; }
+        }
+    }
+}

EstateReportingAPI.BusinessLogic/IReportingManager.cs

@@ -20,7 +20,7 @@ public interface IReportingManager{
     Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate, CancellationToken cancellationToken);
     Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate, CancellationToken cancellationToken);
     Task<TodaysSettlement> GetTodaysSettlement(Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate, CancellationToken cancellationToken);
-    Task<List<TopBottomData>> GetTopBottomData(Guid estateId, TopBottom direction, Int32 resultCount, Dimension dimension, CancellationToken cancellationToken);
+    Task<List<Models.TopBottomData>> GetTopBottomData(Guid estateId, TopBottom direction, Int32 resultCount, Dimension dimension, CancellationToken cancellationToken);
 
     Task<TodaysSales> GetMerchantPerformance(Guid estateId, DateTime comparisonDate, List<Int32> merchantReportingIds, CancellationToken cancellationToken);
     Task<TodaysSales> GetProductPerformance(Guid estateId, DateTime comparisonDate, List<Int32> productReportingIds, CancellationToken cancellationToken);