feat: crappy reordering

models/__init__.py

@@ -12,5 +12,6 @@ from .marketplace import *
 from .payroll import *
 from .billing import *
 from .marketplace_products import *
+# from .deal_group import *
 
 configure_mappers()

models/deal.py

@@ -10,7 +10,9 @@ from .marketplace import BaseMarketplace
 from .shipping_warehouse import ShippingWarehouse
 
 if TYPE_CHECKING:
-    from . import DealBillRequest, ServicePriceCategory
+    from . import (DealBillRequest, ServicePriceCategory,
+                   # DealGroup
+                   )
 
 
 # @unique
@@ -89,6 +91,13 @@ class Deal(BaseModel):
     category: Mapped[Optional["ServicePriceCategory"]] = relationship('ServicePriceCategory',
                                                                       secondary=DealPriceCategory.__table__,
                                                                       lazy='joined')
+    # group: Mapped[Optional["DealGroup"]] = relationship(
+    #     'DealGroup',
+    #     secondary='deal_relations',
+    #     lazy='joined',
+    #     uselist=False,
+    #     back_populates='deals'
+    # )
 
 
 class DealStatusHistory(BaseModel):

models/service.py

@@ -46,6 +46,11 @@ class Service(BaseModel):
                                    back_populates='service',
                                    lazy='selectin',
                                    cascade="all, delete-orphan")
+    rank: Mapped[str] = mapped_column(
+        nullable=False,
+        server_default='',
+        comment='Ранг услуги'
+    )
 
 
 class ServicePriceRange(BaseModel):
@@ -80,6 +85,17 @@ class ServiceCategory(BaseModel):
     id = Column(Integer, autoincrement=True, primary_key=True, index=True)
     name = Column(String, nullable=False)
 
+    deal_service_rank: Mapped[str] = mapped_column(
+        nullable=False,
+        server_default='',
+        comment='Ранг услуги для сделки'
+    )
+    product_service_rank: Mapped[str] = mapped_column(
+        nullable=False,
+        server_default='',
+        comment='Ранг услуги для товара'
+    )
+
 
 class ServicesKit(BaseModel):
     __tablename__ = 'services_kits'