From 3a4f91d751e601e38e0f6c1a5977727463b90df9 Mon Sep 17 00:00:00 2001 From: fakz9 Date: Tue, 21 May 2024 13:49:56 +0300 Subject: [PATCH] feat: article now is not required --- models/product.py | 2 +- schemas/product.py | 2 +- services/product.py | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/models/product.py b/models/product.py index 6c50c28..2c51877 100644 --- a/models/product.py +++ b/models/product.py @@ -8,7 +8,7 @@ class Product(BaseModel): __tablename__ = 'products' id = Column(Integer, autoincrement=True, primary_key=True, index=True) name = Column(String, nullable=False, index=True) - article = Column(String, nullable=False, index=True) + article = Column(String, nullable=False, default='', server_default='', index=True) client_id = Column(Integer, ForeignKey('clients.id'), nullable=False, comment='ID сделки') client = relationship('Client', back_populates='products') diff --git a/schemas/product.py b/schemas/product.py index 41fdfb6..0aea527 100644 --- a/schemas/product.py +++ b/schemas/product.py @@ -8,7 +8,7 @@ from models import ProductBarcode # region Entities class BaseProductSchema(CustomModelCamel): name: str - article: str + article: str | None = '' client_id: int barcodes: list[str] barcode_template: BarcodeTemplateSchema | None = None diff --git a/services/product.py b/services/product.py index edf1b09..65c234c 100644 --- a/services/product.py +++ b/services/product.py @@ -14,14 +14,14 @@ class ProductService(BaseService): async def create(self, request: ProductCreateRequest) -> ProductCreateResponse: # Unique article validation - existing_product_query = await self.session.execute( - select(Product) - .where(Product.client_id == request.client_id, - Product.article == request.article) - ) - existing_product = existing_product_query.first() - if existing_product: - return ProductCreateResponse(ok=False, message='Товар с таким артикулом уже существует у клиента') + # existing_product_query = await self.session.execute( + # select(Product) + # .where(Product.client_id == request.client_id, + # Product.article == request.article) + # ) + # existing_product = existing_product_query.first() + # if existing_product: + # return ProductCreateResponse(ok=False, message='Товар с таким артикулом уже существует у клиента') # Creating product product_dict = request.dict()