feat: вфыв

models/__init__.py

@@ -8,5 +8,6 @@ from .product import *
 from .secondary import *
 from .barcode import *
 from .shipping_warehouse import *
+from .marketplace import *
 
 configure_mappers()

models/auth.py

@@ -1,6 +1,7 @@
 from sqlalchemy import BigInteger, Table, ForeignKey, Column
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from enums.user import UserRole
 from models.base import BaseModel
 
 role_permissions = Table(
@@ -55,7 +56,7 @@ class User(BaseModel):
     is_blocked: Mapped[bool] = mapped_column(nullable=False, server_default='0')
     is_deleted: Mapped[bool] = mapped_column(nullable=False, server_default='0')
 
-    role_key: Mapped[int] = mapped_column(ForeignKey('roles.key'))
+    role_key: Mapped[int] = mapped_column(ForeignKey('roles.key'), server_default=UserRole.user)
     role: Mapped["Role"] = relationship(
         'Role',
         lazy='joined'

models/deal.py

@@ -4,6 +4,7 @@ from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Boolean
 from sqlalchemy.orm import relationship, backref, Mapped, mapped_column
 
 from models.base import BaseModel
+from .marketplace import BaseMarketplace
 from .shipping_warehouse import ShippingWarehouse
 
 
@@ -36,9 +37,22 @@ class Deal(BaseModel):
     shipping_warehouse_id: Mapped[int] = mapped_column(ForeignKey('shipping_warehouses.id'), nullable=True)
     shipping_warehouse: Mapped["ShippingWarehouse"] = relationship()
 
-    services = relationship('DealService', back_populates='deal', cascade="all, delete-orphan")
+    base_marketplace_key: Mapped[str] = mapped_column(ForeignKey("base_marketplaces.key"), nullable=True)
+    base_marketplace: Mapped["BaseMarketplace"] = relationship(lazy="joined")
 
-    products = relationship('DealProduct', back_populates='deal', cascade="all, delete-orphan")
+    services = relationship(
+        'DealService',
+        back_populates='deal',
+        cascade="all, delete-orphan",
+        order_by="desc(DealService.service_id)"
+    )
+
+    products = relationship(
+        'DealProduct',
+        back_populates='deal',
+        cascade="all, delete-orphan",
+        order_by="desc(DealProduct.product_id)"
+    )
 
     # TODO remake with sequence
     lexorank = Column(String, nullable=False, comment='Lexorank', index=True)

models/marketplace.py

@@ -0,0 +1,11 @@
+from sqlalchemy.orm import Mapped, mapped_column
+
+from models import BaseModel
+
+
+class BaseMarketplace(BaseModel):
+    __tablename__ = 'base_marketplaces'
+    key: Mapped[str] = mapped_column(primary_key=True)
+    name: Mapped[str] = mapped_column()
+
+    icon_url: Mapped[str] = mapped_column()

models/secondary.py

@@ -1,7 +1,31 @@
-from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, and_, ForeignKeyConstraint
-from sqlalchemy.orm import relationship, foreign, remote
+from sqlalchemy import Table, Column, Integer, ForeignKey, ForeignKeyConstraint, UniqueConstraint
+from sqlalchemy.orm import relationship
 
-from models.base import metadata, BaseModel
+from models.base import BaseModel
+
+deal_product_service_employees = Table(
+    'deal_product_service_employees',
+    BaseModel.metadata,
+    Column('deal_id', primary_key=True),
+    Column('service_id', primary_key=True),
+    Column('product_id', primary_key=True),
+    Column('user_id', ForeignKey('users.id'), primary_key=True),
+    ForeignKeyConstraint(
+        ['deal_id', 'product_id', 'service_id'],
+        ['deal_product_services.deal_id', 'deal_product_services.product_id', 'deal_product_services.service_id']
+    )
+)
+deal_service_employees = Table(
+    'deal_service_employees',
+    BaseModel.metadata,
+    Column('deal_id', primary_key=True),
+    Column('service_id', primary_key=True),
+    Column('user_id', ForeignKey('users.id'), primary_key=True),
+    ForeignKeyConstraint(
+        ['deal_id', 'service_id'],
+        ['deal_services.deal_id', 'deal_services.service_id']
+    )
+)
 
 
 class DealService(BaseModel):
@@ -16,14 +40,23 @@ class DealService(BaseModel):
     service = relationship('Service')
 
     quantity = Column(Integer, nullable=False, comment='Кол-во услуги')
-    price = Column(Integer, nullable=False,server_default='0', comment='Цена услуги')
+    price = Column(Integer, nullable=False, server_default='0', comment='Цена услуги')
+
+    employees = relationship('User', secondary=deal_service_employees)
+
+    __table_args__ = (
+        UniqueConstraint('deal_id', 'service_id', name='uix_deal_service'),
+    )
 
 
 class DealProductService(BaseModel):
     __tablename__ = 'deal_product_services'
     deal_id = Column(Integer, primary_key=True, nullable=False, comment='ID Сделки')
+
     product_id = Column(Integer, primary_key=True, nullable=False, comment='ID Продукта')
+
     service_id = Column(Integer, ForeignKey('services.id'), primary_key=True, nullable=False, comment='ID Услуги')
+
     price = Column(Integer, nullable=False, comment='Цена услуги')
 
     deal_product = relationship('DealProduct',
@@ -31,9 +64,15 @@ class DealProductService(BaseModel):
                                 primaryjoin="and_(DealProductService.deal_id == DealProduct.deal_id, "
                                             "DealProductService.product_id == DealProduct.product_id)",
                                 foreign_keys=[deal_id, product_id])
+
     service = relationship('Service',
                            foreign_keys=[service_id],
-                           lazy='joined')
+                           lazy='joined'
+
+                           )
+    employees = relationship('User',
+                             secondary=deal_product_service_employees,
+                             )
 
     __table_args__ = (
         ForeignKeyConstraint(
@@ -52,9 +91,11 @@ class DealProduct(BaseModel):
     deal = relationship('Deal',
                         back_populates='products',
                         foreign_keys=[deal_id])
-    product = relationship('Product',
-                           lazy='joined',
-                           foreign_keys=[product_id])
+    product = relationship(
+        'Product',
+        lazy='joined',
+        foreign_keys=[product_id],
+    )
 
     services = relationship('DealProductService',
                             back_populates='deal_product',
@@ -62,7 +103,8 @@ class DealProduct(BaseModel):
                             primaryjoin="and_(DealProductService.deal_id == DealProduct.deal_id, "
                                         "DealProductService.product_id == DealProduct.product_id)",
                             foreign_keys=[DealProductService.deal_id, DealProductService.product_id],
-                            lazy='joined'
+                            lazy='joined',
+                            order_by="desc(DealProductService.service_id)"
                             )