feat: profit table and division of charts in statistics

enums/profit_table_group_by.py

@@ -0,0 +1,9 @@
+from enum import IntEnum
+
+
+class ProfitTableGroupBy(IntEnum):
+    BY_DATES = 0
+    BY_CLIENTS = 1
+    BY_STATUSES = 2
+    BY_WAREHOUSES = 3
+    BY_MARKETPLACES = 4

routers/statistics.py

@@ -4,7 +4,8 @@ from fastapi import APIRouter, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.session import get_session
-from schemas.statistics import GetProfitDataRequest, GetProfitDataResponse
+from schemas.statistics import GetProfitChartDataRequest, GetProfitChartDataResponse, GetProfitTableDataResponse, \
+    GetProfitTableDataRequest
 from services.auth import authorized_user
 from services.statistics import StatisticsService
 
@@ -16,12 +17,24 @@ statistics_router = APIRouter(
 
 
 @statistics_router.post(
-    '/get-profit-data',
+    '/get-profit-chart-data',
-    response_model=GetProfitDataResponse,
+    response_model=GetProfitChartDataResponse,
-    operation_id='get_profit_data',
+    operation_id='get_profit_chart_data',
 )
-async def get_profit_data(
+async def get_profit_chart_data(
         session: Annotated[AsyncSession, Depends(get_session)],
-        request: GetProfitDataRequest
+        request: GetProfitChartDataRequest
 ):
-    return await StatisticsService(session).get_profit_data(request)
+    return await StatisticsService(session).get_profit_chart_data(request)
+
+
+@statistics_router.post(
+    '/get-profit-table-data',
+    response_model=GetProfitTableDataResponse,
+    operation_id='get_profit_table_data',
+)
+async def get_profit_table_data(
+        session: Annotated[AsyncSession, Depends(get_session)],
+        request: GetProfitTableDataRequest
+):
+    return await StatisticsService(session).get_profit_table_data(request)

schemas/statistics.py

@@ -1,31 +1,48 @@
 import datetime
 from typing import List, Tuple
 
+from enums.profit_table_group_by import ProfitTableGroupBy
 from schemas.base import BaseSchema
 
 # region Entities
 
-class ProfitDataItem(BaseSchema):
+class ProfitChartDataItem(BaseSchema):
     date: datetime.date
     revenue: float
     profit: float
     deals_count: int
 
+
+class ProfitTableDataItem(BaseSchema):
+    grouped_value: datetime.date | str | int
+    revenue: float
+    profit: float
+    deals_count: int
+
 # endregion
 
 # region Requests
 
-class GetProfitDataRequest(BaseSchema):
+class GetProfitChartDataRequest(BaseSchema):
     date_range: Tuple[datetime.date, datetime.date]
     client_id: int
     base_marketplace_key: str
     deal_status_id: int
 
+
+class GetProfitTableDataRequest(BaseSchema):
+    date_range: Tuple[datetime.date, datetime.date]
+    group_table_by: ProfitTableGroupBy
+
 # endregion
 
 # region Responses
 
-class GetProfitDataResponse(BaseSchema):
+class GetProfitChartDataResponse(BaseSchema):
-    data: List[ProfitDataItem]
+    data: List[ProfitChartDataItem]
+
+
+class GetProfitTableDataResponse(BaseSchema):
+    data: List[ProfitTableDataItem]
 
 # endregion

services/statistics.py

@@ -1,14 +1,30 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
 
+from fastapi import HTTPException
 from sqlalchemy import select, and_, union_all, func, Subquery
 
-from models import DealService, Deal, DealStatusHistory, DealProductService, DealProduct, Service
+from enums.profit_table_group_by import ProfitTableGroupBy
-from schemas.statistics import GetProfitDataResponse, GetProfitDataRequest, ProfitDataItem
+from models import DealService, Deal, DealStatusHistory, DealProductService, DealProduct, Service, Client, \
+    ShippingWarehouse, BaseMarketplace
+from schemas.statistics import GetProfitChartDataResponse, GetProfitChartDataRequest, ProfitChartDataItem, \
+    GetProfitTableDataResponse, GetProfitTableDataRequest, ProfitTableDataItem
 from services.base import BaseService
 
 
 class StatisticsService(BaseService):
+    @staticmethod
+    def _get_sub_deals_created_at(date_from: datetime.date, date_to: datetime.date):
+        return (
+            select(
+                Deal.id.label('deal_id'),
+                Deal.created_at.label('deal_date'),
+                Deal.current_status,
+            )
+            .where(Deal.created_at.between(date_from, date_to))
+            .subquery()
+        )
+
     @staticmethod
     def _get_sub_status_history():
         last_statuses = (
@@ -22,7 +38,7 @@ class StatisticsService(BaseService):
         return (
             select(
                 Deal.id.label('deal_id'),
-                last_statuses.c.changed_at,
+                last_statuses.c.changed_at.label('deal_date'),
                 Deal.current_status,
             )
             .join(last_statuses, last_statuses.c.deal_id == Deal.id)
@@ -34,15 +50,23 @@ class StatisticsService(BaseService):
         sub_status_history = StatisticsService._get_sub_status_history()
         return (
             select(sub_status_history)
-            .where(sub_status_history.c.changed_at.between(date_from, date_to))
+            .where(sub_status_history.c.deal_date.between(date_from, date_to))
             .subquery()
         )
 
     @staticmethod
-    def _fill_dates_gaps(rows, date_from: datetime.date, date_to: datetime.date) -> list[ProfitDataItem]:
+    def _get_deals_dates(deal_status_id: int, date_from: datetime.date, date_to: datetime.date):
+        if deal_status_id == -1:
+            return StatisticsService._get_sub_deals_created_at(date_from, date_to)
+        return StatisticsService._get_filtered_sub_status_history(date_from, date_to)
+
+    @staticmethod
+    def _fill_dates_gaps(rows, date_from: datetime.date, date_to: datetime.date, is_chart: bool = True) -> (
+            list[ProfitChartDataItem] | list[ProfitTableDataItem]
+    ):
         dates = defaultdict(lambda: {"deals_count": 0, "profit": 0, "revenue": 0})
         for row in rows:
-            dates[row.changed_at.date()] = {
+            dates[row.deal_date.date()] = {
                 "deals_count": row.deals_count,
                 "profit": row.profit,
                 "revenue": row.revenue
@@ -50,12 +74,20 @@ class StatisticsService(BaseService):
 
         data = []
         while date_from < date_to:
-            data_item = ProfitDataItem(
+            if is_chart:
+                data_item = ProfitChartDataItem(
                     date=date_from,
                     deals_count=dates[date_from]["deals_count"],
                     profit=dates[date_from]["profit"],
                     revenue=dates[date_from]["revenue"],
                 )
+            else:
+                data_item = ProfitTableDataItem(
+                    grouped_value=date_from,
+                    deals_count=dates[date_from]["deals_count"],
+                    profit=dates[date_from]["profit"],
+                    revenue=dates[date_from]["revenue"],
+                )
             data.append(data_item)
             date_from += timedelta(days=1)
         return data
@@ -67,8 +99,8 @@ class StatisticsService(BaseService):
                 Deal.id.label("deal_id"),
                 func.date_trunc(
                     "day",
-                    sub_filtered_status_history.c.changed_at,
+                    sub_filtered_status_history.c.deal_date,
-                ).label("changed_at"),
+                ).label("deal_date"),
                 func.sum(DealService.price * DealService.quantity).label("revenue"),
                 func.sum((DealService.price - Service.cost) * DealService.quantity).label("profit"),
             )
@@ -76,11 +108,11 @@ class StatisticsService(BaseService):
             .join(Service, DealService.service_id == Service.id)
             .join(sub_filtered_status_history, Deal.id == sub_filtered_status_history.c.deal_id)
             .where(Deal.is_deleted == False)
-            .group_by(Deal.id, "changed_at")
+            .group_by(Deal.id, "deal_date")
         )
 
     @staticmethod
-    def _apply_filters(request: GetProfitDataRequest, stmt_deal_services, stmt_deal_product_services):
+    def _apply_filters(request: GetProfitChartDataRequest, stmt_deal_services, stmt_deal_product_services):
         if request.client_id != -1:
             stmt_deal_services = stmt_deal_services.where(Deal.client_id == request.client_id)
             stmt_deal_product_services = stmt_deal_product_services.where(Deal.client_id == request.client_id)
@@ -117,67 +149,251 @@ class StatisticsService(BaseService):
             .group_by(Deal.id)
         )
 
+    @staticmethod
+    def _get_joined_deals_and_statuses(sub_deal_product_services: Subquery, sub_deals_dates: Subquery):
+        return (
+            select(
+                sub_deal_product_services.c.deal_id,
+                func.date_trunc(
+                    "day",
+                    sub_deals_dates.c.deal_date
+                ).label("deal_date"),
+                sub_deal_product_services.c.revenue.label("revenue"),
+                sub_deal_product_services.c.profit.label("profit"),
+            )
+            .join(sub_deals_dates, sub_deal_product_services.c.deal_id == sub_deals_dates.c.deal_id)
+        )
+
+    @staticmethod
+    def _group_by_deals(stmt_union: Subquery):
+        return (
+            select(
+                stmt_union.c.deal_id,
+                stmt_union.c.deal_date,
+                func.sum(stmt_union.c.profit).label("profit"),
+                func.sum(stmt_union.c.revenue).label("revenue"),
+            )
+            .group_by(stmt_union.c.deal_id, stmt_union.c.deal_date)
+        )
+
     @staticmethod
     def _group_by_date(stmt):
         return (
             select(
-                stmt.c.changed_at,
+                stmt.c.deal_date,
                 func.count(stmt.c.deal_id).label("deals_count"),
                 func.sum(stmt.c.revenue).label("revenue"),
                 func.sum(stmt.c.profit).label("profit"),
             )
-            .group_by(stmt.c.changed_at)
+            .group_by(stmt.c.deal_date)
-            .order_by(stmt.c.changed_at.asc())
+            .order_by(stmt.c.deal_date.asc())
         )
 
-    async def get_profit_data(self, request: GetProfitDataRequest) -> GetProfitDataResponse:
+    @staticmethod
+    def _join_and_group_by_clients(stmt):
+        return (
+            select(
+                Client.id,
+                Client.name.label("grouped_value"),
+                func.count(stmt.c.deal_id).label("deals_count"),
+                func.sum(stmt.c.revenue).label("revenue"),
+                func.sum(stmt.c.profit).label("profit"),
+            )
+            .join(Deal, Deal.id == stmt.c.deal_id)
+            .join(Client, Client.id == Deal.client_id)
+            .group_by(Client.id, Client.name)
+        )
+
+    @staticmethod
+    def _join_and_group_by_statuses(stmt):
+        return (
+            select(
+                Deal.current_status.label("grouped_value"),
+                func.count(stmt.c.deal_id).label("deals_count"),
+                func.sum(stmt.c.revenue).label("revenue"),
+                func.sum(stmt.c.profit).label("profit"),
+            )
+            .join(Deal, Deal.id == stmt.c.deal_id)
+            .group_by(Deal.current_status)
+        )
+
+    @staticmethod
+    def _join_and_group_by_warehouses(stmt):
+        return (
+            select(
+                ShippingWarehouse.id,
+                ShippingWarehouse.name.label("grouped_value"),
+                ShippingWarehouse.is_deleted,
+                func.count(stmt.c.deal_id).label("deals_count"),
+                func.sum(stmt.c.revenue).label("revenue"),
+                func.sum(stmt.c.profit).label("profit"),
+            )
+            .join(Deal, Deal.id == stmt.c.deal_id)
+            .join(ShippingWarehouse, Deal.shipping_warehouse_id == ShippingWarehouse.id)
+            .where(ShippingWarehouse.is_deleted == False)
+            .group_by(ShippingWarehouse.is_deleted, ShippingWarehouse.id, ShippingWarehouse.name)
+        )
+
+    @staticmethod
+    def _join_and_group_by_marketplaces(stmt):
+        return (
+            select(
+                BaseMarketplace.name.label("grouped_value"),
+                func.count(stmt.c.deal_id).label("deals_count"),
+                func.sum(stmt.c.revenue).label("revenue"),
+                func.sum(stmt.c.profit).label("profit"),
+            )
+            .join(Deal, Deal.id == stmt.c.deal_id)
+            .join(BaseMarketplace, Deal.base_marketplace_key == BaseMarketplace.key)
+            .group_by(BaseMarketplace.name)
+        )
+
+    async def _get_data_rows_grouped_by_date(
+            self,
+            stmt_deal_services,
+            stmt_deal_product_services,
+            sub_deals_dates: Subquery,
+    ):
+        sub_deal_product_services = stmt_deal_product_services.subquery()
+        stmt_join_deals_statuses = self._get_joined_deals_and_statuses(sub_deal_product_services, sub_deals_dates)
+
+        sub_union = union_all(stmt_deal_services, stmt_join_deals_statuses).subquery()
+
+        sub_grouped_by_deals = self._group_by_deals(sub_union)
+        stmt_grouped_by_date = self._group_by_date(sub_grouped_by_deals)
+
+        result = await self.session.execute(stmt_grouped_by_date)
+        rows = result.all()
+        return rows
+
+    async def get_profit_chart_data(self, request: GetProfitChartDataRequest) -> GetProfitChartDataResponse:
         date_from, date_to = request.date_range
         date_to += timedelta(days=1)
 
-        sub_filtered_status_history = self._get_filtered_sub_status_history(date_from, date_to)
+        sub_deals_dates = self._get_deals_dates(request.deal_status_id, date_from, date_to)
-
-        stmt_deal_services = self._get_stmt_deal_services(sub_filtered_status_history)
 
+        stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
         stmt_deal_product_services = self._get_stmt_product_services()
-
         stmt_deal_services, stmt_deal_product_services = self._apply_filters(
             request,
             stmt_deal_services,
             stmt_deal_product_services
         )
 
-        sub_deal_product_services = stmt_deal_product_services.subquery()
+        rows = await self._get_data_rows_grouped_by_date(
-
+            stmt_deal_services, stmt_deal_product_services, sub_deals_dates
-        stmt_join_deals_statuses = (
-            select(
-                sub_deal_product_services.c.deal_id,
-                func.date_trunc(
-                    "day",
-                    sub_filtered_status_history.c.changed_at
-                ).label("changed_at"),
-                sub_deal_product_services.c.revenue.label("revenue"),
-                sub_deal_product_services.c.profit.label("profit"),
         )
-            .join(sub_filtered_status_history, sub_deal_product_services.c.deal_id == sub_filtered_status_history.c.deal_id)
-        )
-
-        stmt_union = union_all(stmt_deal_services, stmt_join_deals_statuses).subquery()
-
-        sub_grouped_by_deals = (
-            select(
-                stmt_union.c.deal_id,
-                stmt_union.c.changed_at,
-                func.sum(stmt_union.c.profit).label("profit"),
-                func.sum(stmt_union.c.revenue).label("revenue"),
-            )
-            .group_by(stmt_union.c.deal_id, stmt_union.c.changed_at)
-        )
-
-        stmt_grouped_by_date = self._group_by_date(sub_grouped_by_deals)
-
-        result = await self.session.execute(stmt_grouped_by_date)
-        rows = result.all()
 
         data = self._fill_dates_gaps(rows, date_from, date_to)
 
-        return GetProfitDataResponse(data=data)
+        return GetProfitChartDataResponse(data=data)
+
+    async def _get_table_grouped_by_dates(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        date_from, date_to = request.date_range
+        date_to += timedelta(days=1)
+
+        sub_deals_dates = self._get_sub_deals_created_at(date_from, date_to)
+
+        stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
+
+        stmt_deal_product_services = self._get_stmt_product_services()
+        rows = await self._get_data_rows_grouped_by_date(
+            stmt_deal_services, stmt_deal_product_services, sub_deals_dates
+        )
+
+        data = self._fill_dates_gaps(rows, date_from, date_to, False)
+
+        return GetProfitTableDataResponse(data=data)
+
+    async def _table_data_from_stmt(self, stmt) -> GetProfitTableDataResponse:
+        result = await self.session.execute(stmt)
+        rows = result.all()
+
+        data = []
+        for row in rows:
+            data.append(ProfitTableDataItem(
+                grouped_value=row.grouped_value,
+                revenue=row.revenue,
+                profit=row.profit,
+                deals_count=row.deals_count,
+            ))
+        return GetProfitTableDataResponse(data=data)
+
+    def _get_common_table_grouped(self, request: GetProfitTableDataRequest):
+        date_from, date_to = request.date_range
+        date_to += timedelta(days=1)
+
+        sub_deals_dates = self._get_sub_deals_created_at(date_from, date_to)
+
+        stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
+
+        stmt_deal_product_services = self._get_stmt_product_services()
+
+        stmt_deal_product_services = (
+            select(
+                stmt_deal_product_services.c.deal_id,
+                func.date_trunc(
+                    "day",
+                    Deal.created_at
+                ).label("deal_date"),
+                stmt_deal_product_services.c.revenue.label("revenue"),
+                stmt_deal_product_services.c.profit.label("profit"),
+            )
+            .join(Deal, Deal.id == stmt_deal_product_services.c.deal_id)
+        )
+
+        sub_union = union_all(stmt_deal_services, stmt_deal_product_services).subquery()
+
+        sub_grouped_by_deals = self._group_by_deals(sub_union)
+        return sub_grouped_by_deals
+
+    async def _get_table_grouped_by_clients(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        sub_grouped_by_deals = self._get_common_table_grouped(request)
+        stmt_grouped_by_clients = self._join_and_group_by_clients(sub_grouped_by_deals)
+
+        return await self._table_data_from_stmt(stmt_grouped_by_clients)
+
+    async def _get_table_grouped_by_statuses(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        date_from, date_to = request.date_range
+        date_to += timedelta(days=1)
+
+        sub_deals_dates = self._get_filtered_sub_status_history(date_from, date_to)
+
+        stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
+        sub_deal_product_services = self._get_stmt_product_services().subquery()
+
+        stmt_join_deals_statuses = self._get_joined_deals_and_statuses(sub_deal_product_services, sub_deals_dates)
+
+        sub_union = union_all(stmt_deal_services, stmt_join_deals_statuses).subquery()
+
+        sub_grouped_by_deals = self._group_by_deals(sub_union)
+        stmt_grouped_by_date = self._join_and_group_by_statuses(sub_grouped_by_deals)
+
+        return await self._table_data_from_stmt(stmt_grouped_by_date)
+
+    async def _get_table_grouped_by_warehouses(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        sub_grouped_by_deals = self._get_common_table_grouped(request)
+        stmt_grouped_by_clients = self._join_and_group_by_warehouses(sub_grouped_by_deals)
+
+        return await self._table_data_from_stmt(stmt_grouped_by_clients)
+
+    async def _get_table_grouped_by_marketplace(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        sub_grouped_by_deals = self._get_common_table_grouped(request)
+        stmt_grouped_by_clients = self._join_and_group_by_marketplaces(sub_grouped_by_deals)
+
+        return await self._table_data_from_stmt(stmt_grouped_by_clients)
+
+    async def get_profit_table_data(self, request: GetProfitTableDataRequest) -> GetProfitTableDataResponse:
+        match request.group_table_by:
+            case ProfitTableGroupBy.BY_DATES:
+                return await self._get_table_grouped_by_dates(request)
+            case ProfitTableGroupBy.BY_CLIENTS:
+                return await self._get_table_grouped_by_clients(request)
+            case ProfitTableGroupBy.BY_STATUSES:
+                return await self._get_table_grouped_by_statuses(request)
+            case ProfitTableGroupBy.BY_WAREHOUSES:
+                return await self._get_table_grouped_by_warehouses(request)
+            case ProfitTableGroupBy.BY_MARKETPLACES:
+                return await self._get_table_grouped_by_marketplace(request)
+
+        raise HTTPException(status_code=400, detail='Указана некорректная группировка')

test.py

@@ -4,14 +4,14 @@ import datetime
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.session import session_maker
-from schemas.statistics import GetProfitDataRequest
+from schemas.statistics import GetProfitChartDataRequest
 from services.statistics import StatisticsService
 
 
 async def main():
     session: AsyncSession = session_maker()
 
-    request = GetProfitDataRequest(
+    request = GetProfitChartDataRequest(
         date_range=(
             datetime.date(2020, 1, 1),
             datetime.date(2020, 1, 31),
@@ -21,7 +21,7 @@ async def main():
     try:
         service = StatisticsService(session)
 
-        result = await service.get_profit_data(request)
+        result = await service.get_profit_chart_data(request)
 
         # for res in result:
         #     print(res)