feat: prefer fbo stocks over fbs, small refactor of existing models

queries/general.py

@@ -1,13 +1,12 @@
-from dataclasses import dataclass
 from typing import Union, TypedDict
 
 from sqlalchemy import select, func, and_, cast, String, case, or_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import joinedload
 
-from database import DailyStock
 from database.sipro import *
 from database.sipro.enums.product import ProductRelationType
+from database.sipro.models.warehouses import MarketplaceProductFboWarehouseStock
 
 
 class StockData(TypedDict):
@@ -45,11 +44,13 @@ async def get_stocks_data(
     suppliers, company_warehouses = get_marketplace_suppliers_and_company_warehouses(marketplace)
     supplier_ids = [supplier.id for supplier in suppliers]
     company_warehouse_ids = [warehouse.id for warehouse in company_warehouses]
+    fbo_warehouse_ids = [fbo_warehouse.id for fbo_warehouse in marketplace.fbo_warehouses]
 
     sell_mixes: bool = marketplace.sell_mixes
     sell_blocks: bool = marketplace.sell_blocks
     sell_warehouse_products: bool = marketplace.sell_warehouse_products
     sell_from_price: int = marketplace.sell_from_price
+    prefer_fbo_over_fbs: bool = marketplace.prefer_fbo_over_fbs
     is_paused = marketplace.is_paused
     supplier_stock_subquery = (
         select(
@@ -225,6 +226,28 @@ async def get_stocks_data(
         )
         .subquery()
     )
+    fbo_stock_subquery = (
+        select(
+            MarketplaceProductFboWarehouseStock.marketplace_product_id.label('marketplace_product_id'),
+            func.sum(MarketplaceProductFboWarehouseStock.quantity).label('quantity')
+        )
+        .select_from(
+            MarketplaceProductFboWarehouseStock
+        )
+        .join(
+            MarketplaceProduct
+        )
+        .where(
+            MarketplaceProduct.marketplace_id == marketplace.id,
+            MarketplaceProductFboWarehouseStock.warehouse_id.in_(fbo_warehouse_ids),
+            MarketplaceProductFboWarehouseStock.quantity > 0
+        )
+        .group_by(
+            MarketplaceProductFboWarehouseStock.marketplace_product_id
+        )
+        .subquery()
+    )
+    print(fbo_stock_subquery)
 
     stmt = (
         select(
@@ -244,7 +267,8 @@ async def get_stocks_data(
             is_master_subquery.c.is_master.label('is_master'),
             func.coalesce(slaves_stock_subquery.c.slaves_stock, 0).label('slaves_stock'),
             MarketplaceProduct.price_recommended.label('price_recommended'),
-            MarketplaceProduct.is_archived.label('is_archived')
+            MarketplaceProduct.is_archived.label('is_archived'),
+            func.coalesce(fbo_stock_subquery.c.quantity,0).label('fbo_stock')
         )
         .select_from(
             MarketplaceProduct
@@ -286,6 +310,10 @@ async def get_stocks_data(
             slaves_stock_subquery,
             slaves_stock_subquery.c.product_id == MarketplaceProduct.product_id
         )
+        .outerjoin(
+            fbo_stock_subquery,
+            fbo_stock_subquery.c.marketplace_product_id == MarketplaceProduct.id
+        )
     )
 
     result = await session.execute(stmt)
@@ -302,7 +330,9 @@ async def get_stocks_data(
          is_master,
          slaves_stock,
          price_recommended,
-         is_archived) in marketplace_products:
+         is_archived,
+         fbo_stock
+         ) in marketplace_products:
         if is_archived or (sell_from_price > price_recommended) or is_paused or reset:
             response.append({
                 'article': denco_article,
@@ -310,6 +340,13 @@ async def get_stocks_data(
                 'marketplace_product': marketplace_product,
             })
             continue
+        if fbo_stock> 0 and prefer_fbo_over_fbs:
+            response.append({
+                'article': denco_article,
+                'full_stock': 0,
+                'marketplace_product': marketplace_product,
+            })
+            continue
         is_mix = mix_stock is not None
 
         if not mix_stock: