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

This commit is contained in:
2025-04-02 00:27:14 +03:00
parent 03a5fbf87f
commit c7bccbcf5e
4 changed files with 83 additions and 5 deletions

View File

@@ -23,3 +23,10 @@ warehouse_company_warehouses = Table(
Column('company_warehouse_id', ForeignKey('company_warehouses.id')),
)
marketplace_fbo_warehouses = Table(
"marketplace_fbo_warehouses",
BaseSiproModel.metadata,
Column("marketplace_id", ForeignKey("marketplaces.id")),
Column("fbo_warehouse_id", ForeignKey("fbo_marketplace_warehouses.id")),
)

View File

@@ -3,8 +3,10 @@ from typing import List
from sqlalchemy import ForeignKey
from sqlalchemy.orm import mapped_column, Mapped, relationship
from database.sipro.models.warehouses import FboMarketplaceWarehouse
from .base import BaseSiproModel
from .associations import marketplace_warehouses, warehouse_company_warehouses, warehouse_suppliers
from .associations import marketplace_warehouses, warehouse_company_warehouses, warehouse_suppliers, \
marketplace_fbo_warehouses
class Company(BaseSiproModel):
@@ -55,6 +57,7 @@ class Marketplace(BaseSiproModel):
is_deleted: Mapped[bool] = mapped_column()
is_paused: Mapped[bool] = mapped_column()
send_stocks: Mapped[bool] = mapped_column()
prefer_fbo_over_fbs: Mapped[bool] = mapped_column()
warehouses: Mapped[List["Warehouse"]] = relationship(secondary=marketplace_warehouses)
warehouse_id: Mapped[str] = mapped_column()
@@ -63,3 +66,7 @@ class Marketplace(BaseSiproModel):
company: Mapped["Company"] = relationship()
campaign_id: Mapped[str] = mapped_column()
fbo_warehouses: Mapped[List["FboMarketplaceWarehouse"]] = relationship(
secondary=marketplace_fbo_warehouses,
lazy="joined"
)

View File

@@ -0,0 +1,27 @@
from typing import TYPE_CHECKING
from sqlalchemy import UniqueConstraint, ForeignKey
from sqlalchemy.orm import mapped_column, Mapped, relationship
from .base import BaseSiproModel
if TYPE_CHECKING:
from .products import MarketplaceProduct
class FboMarketplaceWarehouse(BaseSiproModel):
__tablename__ = 'fbo_marketplace_warehouses'
id: Mapped[int] = mapped_column(primary_key=True)
name: Mapped[str] = mapped_column(nullable=False, index=True)
base_marketplace: Mapped[int] = mapped_column(nullable=False)
inner_id: Mapped[int] = mapped_column(nullable=False, index=True)
__table_args__ = (
UniqueConstraint('inner_id', 'base_marketplace', name='uq_inner_id_base_marketplace'),
)
class MarketplaceProductFboWarehouseStock(BaseSiproModel):
__tablename__ = 'marketplace_product_fbo_warehouse_stocks'
warehouse_id: Mapped[int] = mapped_column(primary_key=True)
quantity: Mapped[int] = mapped_column()
marketplace_product_id: Mapped[int] = mapped_column(ForeignKey("marketplace_products.id"))
marketplace_product: Mapped["MarketplaceProduct"] = relationship()