fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: cards, attributes and modules

Browse Source
This commit is contained in:
AlexSserb
2025-02-19 14:46:31 +04:00
parent a509a3a586
commit 1af78ce08a
61 changed files with 3212 additions and 2795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
services/statistics/profit_statistics.py
View File

@@ -4,7 +4,7 @@ from fastapi import HTTPException
from sqlalchemy import select, and_, union_all, func, Subquery, literal
from enums.profit_table_group_by import ProfitTableGroupBy
from models import DealService, Deal, DealStatusHistory, DealProductService, DealProduct, Service, Client, \
from models import CardService, Card, CardStatusHistory, CardProductService, CardProduct, Service, Client, \
ShippingWarehouse, BaseMarketplace, User, Project, Board
from schemas.statistics import GetProfitChartDataResponse, GetProfitChartDataRequest, ProfitChartDataItem, \
GetProfitTableDataResponse, GetProfitTableDataRequest, ProfitTableDataItem, CommonProfitFilters
@@ -19,12 +19,12 @@ class ProfitStatisticsService(BaseService):
def _get_sub_deals_created_at(date_from: datetime.date, date_to: datetime.date):
deals_created_at = (
select(
Deal.id.label('deal_id'),
Card.id.label('deal_id'),
func.date_trunc(
'day',
Deal.created_at,
Card.created_at,
).label('date'),
Deal.current_status_id,
Card.current_status_id,
)
.subquery()
)
@@ -38,22 +38,22 @@ class ProfitStatisticsService(BaseService):
def _get_sub_status_history():
last_statuses = (
select(
DealStatusHistory.deal_id,
func.max(DealStatusHistory.changed_at).label('changed_at')
CardStatusHistory.card_id,
func.max(CardStatusHistory.changed_at).label('changed_at')
)
.group_by(DealStatusHistory.deal_id)
.group_by(CardStatusHistory.card_id)
.subquery()
)
return (
select(
Deal.id.label('deal_id'),
Card.id.label('deal_id'),
func.date_trunc(
'day',
last_statuses.c.changed_at,
).label('date'),
Deal.current_status_id,
Card.current_status_id,
)
.join(last_statuses, last_statuses.c.deal_id == Deal.id)
.join(last_statuses, last_statuses.c.deal_id == Card.id)
.subquery()
)
@@ -80,7 +80,7 @@ class ProfitStatisticsService(BaseService):
if is_chart:
data_item = ProfitChartDataItem(
date=row.date.date(),
deals_count=row.deals_count,
deals_count=row.cards_count,
profit=row.profit,
revenue=row.revenue,
expenses=row.expenses,
@@ -88,7 +88,7 @@ class ProfitStatisticsService(BaseService):
else:
data_item = ProfitTableDataItem(
grouped_value=row.date.date(),
deals_count=row.deals_count,
deals_count=row.cards_count,
profit=row.profit,
revenue=row.revenue,
expenses=row.expenses,
@@ -100,25 +100,25 @@ class ProfitStatisticsService(BaseService):
def _get_stmt_deal_services(self, sub_filtered_status_history: Subquery):
return (
select(
Deal.id.label("deal_id"),
Card.id.label("deal_id"),
func.date_trunc(
"day",
sub_filtered_status_history.c.date,
).label("date"),
func.sum(DealService.price * DealService.quantity).label("revenue"),
func.sum(DealService.price * DealService.quantity).label("profit"),
func.sum(CardService.price * CardService.quantity).label("revenue"),
func.sum(CardService.price * CardService.quantity).label("profit"),
)
.join(DealService, Deal.id == DealService.deal_id)
.join(Service, DealService.service_id == Service.id)
.join(sub_filtered_status_history, Deal.id == sub_filtered_status_history.c.deal_id)
.join(CardService, Card.id == CardService.card_id)
.join(Service, CardService.service_id == Service.id)
.join(sub_filtered_status_history, Card.id == sub_filtered_status_history.c.deal_id)
.where(
and_(
Deal.is_deleted == False,
Deal.is_accounted == True,
Deal.is_completed == True if self.is_completed_only else True
Card.is_deleted == False,
Card.is_accounted == True,
Card.is_completed == True if self.is_completed_only else True
)
)
.group_by(Deal.id, "date")
.group_by(Card.id, "date")
)
@staticmethod
@@ -127,18 +127,18 @@ class ProfitStatisticsService(BaseService):
select(Board.id)
.where(Board.project_id == project_id)
)
return stmt.where(Deal.board_id.in_(board_ids_stmt))
return stmt.where(Card.board_id.in_(board_ids_stmt))
@staticmethod
def _apply_filters(request: CommonProfitFilters, 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)
stmt_deal_services = stmt_deal_services.where(Card.client_id == request.client_id)
stmt_deal_product_services = stmt_deal_product_services.where(Card.client_id == request.client_id)
if request.base_marketplace_key != "all":
stmt_deal_services = stmt_deal_services.where(Deal.base_marketplace_key == request.base_marketplace_key)
stmt_deal_services = stmt_deal_services.where(Card.base_marketplace_key == request.base_marketplace_key)
stmt_deal_product_services = stmt_deal_product_services.where(
Deal.base_marketplace_key == request.base_marketplace_key)
Card.base_marketplace_key == request.base_marketplace_key)
if request.project_id != -1:
stmt_deal_services = ProfitStatisticsService._board_ids_for_project(request.project_id, stmt_deal_services)
@@ -148,44 +148,44 @@ class ProfitStatisticsService(BaseService):
)
if request.board_id != -1:
stmt_deal_services = stmt_deal_services.where(Deal.board_id == request.board_id)
stmt_deal_product_services = stmt_deal_product_services.where(Deal.board_id == request.board_id)
stmt_deal_services = stmt_deal_services.where(Card.board_id == request.board_id)
stmt_deal_product_services = stmt_deal_product_services.where(Card.board_id == request.board_id)
if request.deal_status_id != -1:
stmt_deal_services = stmt_deal_services.where(Deal.current_status_id == request.deal_status_id)
if request.card_status_id != -1:
stmt_deal_services = stmt_deal_services.where(Card.current_status_id == request.card_status_id)
stmt_deal_product_services = stmt_deal_product_services.where(
Deal.current_status_id == request.deal_status_id)
Card.current_status_id == request.card_status_id)
if request.manager_id != -1:
stmt_deal_services = stmt_deal_services.where(Deal.manager_id == request.manager_id)
stmt_deal_product_services = stmt_deal_product_services.where(Deal.manager_id == request.manager_id)
stmt_deal_services = stmt_deal_services.where(Card.manager_id == request.manager_id)
stmt_deal_product_services = stmt_deal_product_services.where(Card.manager_id == request.manager_id)
return stmt_deal_services, stmt_deal_product_services
def _get_stmt_product_services(self):
return (
select(
Deal.id.label("deal_id"),
func.sum(DealProductService.price * DealProduct.quantity).label("revenue"),
func.sum(DealProductService.price * DealProduct.quantity).label("profit"),
Card.id.label("deal_id"),
func.sum(CardProductService.price * CardProduct.quantity).label("revenue"),
func.sum(CardProductService.price * CardProduct.quantity).label("profit"),
)
.join(DealProduct, Deal.id == DealProduct.deal_id)
.join(CardProduct, Card.id == CardProduct.card_id)
.join(
DealProductService,
CardProductService,
and_(
DealProductService.deal_id == Deal.id,
DealProductService.product_id == DealProduct.product_id,
CardProductService.card_id == Card.id,
CardProductService.product_id == CardProduct.product_id,
)
)
.join(Service, DealProductService.service_id == Service.id)
.join(Service, CardProductService.service_id == Service.id)
.where(
and_(
Deal.is_deleted == False,
Deal.is_accounted == True,
Deal.is_completed == True if self.is_completed_only else True,
Card.is_deleted == False,
Card.is_accounted == True,
Card.is_completed == True if self.is_completed_only else True,
)
)
.group_by(Deal.id)
.group_by(Card.id)
)
@staticmethod
@@ -208,7 +208,7 @@ class ProfitStatisticsService(BaseService):
deals = (
select(
stmt.c.date,
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_id).label("deals_count"),
func.sum(stmt.c.revenue).label("revenue"),
func.sum(stmt.c.profit).label("profit"),
)
@@ -246,12 +246,12 @@ class ProfitStatisticsService(BaseService):
select(
Client.id,
Client.name.label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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)
.join(Card, Card.id == stmt.c.card_id)
.join(Client, Client.id == Card.client_id)
.group_by(Client.id, Client.name)
)
@@ -261,12 +261,12 @@ class ProfitStatisticsService(BaseService):
select(
Project.id,
Project.name.label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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(Board, Board.id == Deal.board_id)
.join(Card, Card.id == stmt.c.card_id)
.join(Board, Board.id == Card.board_id)
.join(Project, Project.id == Board.project_id)
.group_by(Project.id, Project.name)
)
@@ -277,12 +277,12 @@ class ProfitStatisticsService(BaseService):
select(
Board.id,
Board.name.label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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(Board, Board.id == Deal.board_id)
.join(Card, Card.id == stmt.c.card_id)
.join(Board, Board.id == Card.board_id)
.group_by(Board.id, Board.name)
)
@@ -290,13 +290,13 @@ class ProfitStatisticsService(BaseService):
def _join_and_group_by_statuses(stmt):
return (
select(
Deal.current_status_id.label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
Card.current_status_id.label("grouped_value"),
func.count(stmt.c.card_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_id)
.join(Card, Card.id == stmt.c.card_id)
.group_by(Card.current_status_id)
)
@staticmethod
@@ -306,12 +306,12 @@ class ProfitStatisticsService(BaseService):
ShippingWarehouse.id,
ShippingWarehouse.name.label("grouped_value"),
ShippingWarehouse.is_deleted,
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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)
.join(Card, Card.id == stmt.c.card_id)
.join(ShippingWarehouse, Card.shipping_warehouse_id == ShippingWarehouse.id)
.where(ShippingWarehouse.is_deleted == False)
.group_by(ShippingWarehouse.is_deleted, ShippingWarehouse.id, ShippingWarehouse.name)
)
@@ -321,12 +321,12 @@ class ProfitStatisticsService(BaseService):
return (
select(
BaseMarketplace.name.label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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)
.join(Card, Card.id == stmt.c.card_id)
.join(BaseMarketplace, Card.base_marketplace_key == BaseMarketplace.key)
.group_by(BaseMarketplace.name)
)
@@ -341,12 +341,12 @@ class ProfitStatisticsService(BaseService):
select(
managers.c.id,
(managers.c.first_name + " " + managers.c.second_name).label("grouped_value"),
func.count(stmt.c.deal_id).label("deals_count"),
func.count(stmt.c.card_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(managers, managers.c.id == Deal.manager_id)
.join(Card, Card.id == stmt.c.card_id)
.join(managers, managers.c.id == Card.manager_id)
.group_by(managers.c.id, "grouped_value")
)
@@ -384,7 +384,7 @@ class ProfitStatisticsService(BaseService):
self.is_completed_only = request.is_completed_only
self.filters = request
sub_deals_dates = self._get_deals_dates(request.deal_status_id)
sub_deals_dates = self._get_deals_dates(request.card_status_id)
stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
stmt_deal_product_services = self._get_stmt_product_services()
@@ -425,7 +425,7 @@ class ProfitStatisticsService(BaseService):
self.date_from, self.date_to = request.date_range
self.filters = request
sub_deals_dates = self._get_deals_dates(request.deal_status_id)
sub_deals_dates = self._get_deals_dates(request.card_status_id)
stmt_deal_services = self._get_stmt_deal_services(sub_deals_dates)
@@ -436,12 +436,12 @@ class ProfitStatisticsService(BaseService):
stmt_deal_product_services.c.deal_id,
func.date_trunc(
"day",
Deal.created_at
Card.created_at
).label("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)
.join(Card, Card.id == stmt_deal_product_services.c.deal_id)
)
stmt_deal_services, stmt_deal_product_services = self._apply_filters(