feat: removed price categories

models/deal.py

@@ -15,18 +15,11 @@ from .shipping_warehouse import ShippingWarehouse
 if TYPE_CHECKING:
     from . import (
         DealBillRequest,
-        ServicePriceCategory,
         DealGroup,
         User,
     )
 
 
-class DealPriceCategory(BaseModel):
-    __tablename__ = 'deal_price_category'
-    deal_id: Mapped[int] = mapped_column(ForeignKey('deals.id'), primary_key=True, unique=True)
-    category_id: Mapped[int] = mapped_column(ForeignKey('service_price_category.id'), primary_key=True)
-
-
 class Deal(BaseModel):
     __tablename__ = 'deals'
     id = Column(Integer, autoincrement=True, primary_key=True, index=True)
@@ -85,9 +78,7 @@ class Deal(BaseModel):
 
     comment = Column(String, nullable=False, server_default='', comment='Коментарий к заданию')
     bill_request: Mapped[Optional['DealBillRequest']] = relationship(back_populates='deal', lazy='joined')
-    category: Mapped[Optional["ServicePriceCategory"]] = relationship('ServicePriceCategory',
-                                                                      secondary=DealPriceCategory.__table__,
-                                                                      lazy='joined')
+
     group: Mapped[Optional["DealGroup"]] = relationship(
         'DealGroup',
         secondary='deal_relations',

models/service.py

@@ -9,7 +9,6 @@ services_kit_services = Table(
     BaseModel.metadata,
     Column('services_kit_id', ForeignKey('services_kits.id')),
     Column('service_id', ForeignKey('services.id')),
-
 )
 
 
@@ -47,10 +46,6 @@ class Service(BaseModel):
                                 lazy='selectin',
                                 order_by="asc(ServicePriceRange.from_quantity)",
                                 cascade="all, delete-orphan")
-    category_prices = relationship('ServiceCategoryPrice',
-                                   back_populates='service',
-                                   lazy='selectin',
-                                   cascade="all, delete-orphan")
     rank: Mapped[str] = mapped_column(
         nullable=False,
         server_default='',
@@ -68,23 +63,6 @@ class ServicePriceRange(BaseModel):
     price = Column(Double, nullable=False, comment='Цена')
 
 
-class ServiceCategoryPrice(BaseModel):
-    __tablename__ = 'service_category_prices'
-    service_id: Mapped[int] = mapped_column(ForeignKey('services.id'), primary_key=True)
-    category_id: Mapped[int] = mapped_column(ForeignKey('service_price_category.id'), primary_key=True)
-
-    price: Mapped[float] = mapped_column(Double, nullable=False, comment='Цена')
-
-    service: Mapped["Service"] = relationship('Service', lazy='joined', back_populates='category_prices')
-    category: Mapped["ServicePriceCategory"] = relationship('ServicePriceCategory', lazy='joined')
-
-
-class ServicePriceCategory(BaseModel):
-    __tablename__ = 'service_price_category'
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(nullable=False)
-
-
 class ServiceCategory(BaseModel):
     __tablename__ = 'service_categories'
     id = Column(Integer, autoincrement=True, primary_key=True, index=True)