Merge remote-tracking branch 'origin/productBarcodeImages'

services/barcode.py

@@ -6,6 +6,7 @@ from sqlalchemy.orm import selectinload, joinedload
 
 from barcodes.attributes import AttributeWriterFactory
 from barcodes.generator.default_generator import DefaultBarcodeGenerator
+from barcodes.images_uploader import BarcodeImagesUploader
 from models import BarcodeTemplate, BarcodeTemplateAttribute, barcode_template_attribute_link, Product, \
     BarcodeTemplateAdditionalField, BarcodeTemplateSize, Deal, DealProduct
 from schemas.barcode import *
@@ -89,17 +90,27 @@ class BarcodeService(BaseService):
         product: Product = query.scalar()
         if not product:
             raise ValueError('Товар не найден')
-        barcode_template = await self._get_barcode_template(request, product)
-        default_generator = DefaultBarcodeGenerator()
         filename = f'{product.id}_barcode.pdf'
-        pdf_buffer = default_generator.generate(
-            [{
-                "barcode": request.barcode,
-                "product": product,
-                "template": barcode_template,
-                "quantity": request.quantity
-            }]
-        )
+        default_generator = DefaultBarcodeGenerator()
+
+        if product.barcode_image:
+            uploader = BarcodeImagesUploader()
+            pdf_buffer = default_generator.generate(
+                [{
+                    "barcode_image_url": uploader.get_abs_path(product.barcode_image.filename),
+                    "num_duplicates": request.quantity
+                }]
+            )
+        else:
+            barcode_template = await self._get_barcode_template(request, product)
+            pdf_buffer = default_generator.generate(
+                [{
+                    "barcode": request.barcode,
+                    "product": product,
+                    "template": barcode_template,
+                    "num_duplicates": request.quantity
+                }]
+            )
         return filename, pdf_buffer
 
     async def get_deal_barcodes_pdf(self, request: GetDealProductsBarcodesPdfRequest) -> Tuple[str, BytesIO]:
@@ -107,7 +118,7 @@ class BarcodeService(BaseService):
             select(Deal)
             .options(
                 selectinload(Deal.products).joinedload(DealProduct.product).selectinload(Product.client),
-                selectinload(Deal.products).joinedload(DealProduct.product).joinedload(Product.barcodes)
+                selectinload(Deal.products).joinedload(DealProduct.product).joinedload(Product.barcodes),
             )
             .filter(Deal.id == request.deal_id)
         )
@@ -116,20 +127,27 @@ class BarcodeService(BaseService):
         if not deal:
             raise ValueError('Сделка не найдена')
 
+        uploader = BarcodeImagesUploader()
         barcodes_data: List[Dict[str, str | Product | BarcodeTemplate | int]] = []
         for deal_product in deal.products:
-            product_request = GetProductBarcodeRequest(
-                product_id=deal_product.product_id,
-                barcode="",
-                barcode_template_id=deal_product.product.barcode_template_id,
-            )
-            barcode_template = await self._get_barcode_template(product_request, deal_product.product)
-            barcodes_data.append({
-                "barcode": deal_product.product.barcodes[0].barcode,
-                "product": deal_product.product,
-                "template": barcode_template,
-                "quantity": deal_product.quantity
-            })
+            if deal_product.product.barcode_image:
+                barcodes_data.append({
+                    "barcode_image_url": uploader.get_abs_path(deal_product.product.barcode_image.filename),
+                    "num_duplicates": deal_product.quantity
+                })
+            else:
+                product_request = GetProductBarcodeRequest(
+                    product_id=deal_product.product_id,
+                    barcode="",
+                    barcode_template_id=deal_product.product.barcode_template_id,
+                )
+                barcode_template = await self._get_barcode_template(product_request, deal_product.product)
+                barcodes_data.append({
+                    "barcode": deal_product.product.barcodes[0].barcode,
+                    "product": deal_product.product,
+                    "template": barcode_template,
+                    "num_duplicates": deal_product.quantity
+                })
 
         default_generator = DefaultBarcodeGenerator()
         filename = f'{deal.id}_deal_barcodes.pdf'

services/product.py

@@ -1,11 +1,14 @@
-from fastapi import HTTPException
+from typing import Optional
+
+from fastapi import HTTPException, UploadFile
 from sqlalchemy import select, func, Integer, update, or_
 from sqlalchemy.orm import selectinload, Query
 
 import utils.barcodes
 from backend import config
+from barcodes.images_uploader import BarcodeImagesUploader
 from external.s3_uploader.uploader import S3Uploader
-from models.product import Product, ProductImage
+from models.product import Product, ProductImage, ProductBarcodeImage
 from schemas.base import PaginationSchema
 from schemas.product import *
 from services.base import BaseService
@@ -107,7 +110,8 @@ class ProductService(BaseService):
             )
             .options(
                 selectinload(Product.barcodes)
-                .noload(ProductBarcode.product)
+                .noload(ProductBarcode.product),
+                selectinload(Product.barcode_image),
             )
             .where(
                 Product.client_id == client_id
@@ -257,4 +261,68 @@ class ProductService(BaseService):
             return ProductGenerateBarcodeResponse(ok=True, message='Штрих-код успешно сгенерирован', barcode=barcode)
         except Exception as e:
             return ProductGenerateBarcodeResponse(ok=False, message=str(e))
+
+    async def get_model_by_id(self, product_id: int) -> Product:
+        product: Optional[Product] = await self.session.get(Product, product_id)
+        if not product:
+            raise Exception('Не удалось найти товар с указанным ID')
+        return product
+
+    async def delete_model_barcode_image(self, uploader: BarcodeImagesUploader, product_id: int) -> None:
+        barcode_image: Optional[ProductBarcodeImage] = await self.session.get(ProductBarcodeImage, product_id)
+        if barcode_image:
+            uploader.delete(barcode_image.filename)
+            await self.session.delete(barcode_image)
+            await self.session.commit()
+
+    async def upload_barcode_image(self, product_id: int, upload_file: UploadFile) -> ProductUploadBarcodeImageResponse:
+        try:
+            await self.get_model_by_id(product_id)
+
+            uploader = BarcodeImagesUploader()
+            await self.delete_model_barcode_image(uploader, product_id)
+            filename = await uploader.upload(upload_file)
+            barcode_image_url = uploader.get_url(filename)
+
+            product_barcode_image = ProductBarcodeImage(
+                product_id=product_id,
+                filename=filename,
+            )
+            self.session.add(product_barcode_image)
+            await self.session.commit()
+            return ProductUploadBarcodeImageResponse(
+                ok=True,
+                message='Штрих-код для товара успешно загружен',
+                barcode_image_url=barcode_image_url,
+            )
+        except Exception as e:
+            print(e)
+            return ProductUploadBarcodeImageResponse(ok=False, message=str(e))
+
+    async def delete_barcode_image(self, product_id: int) -> ProductDeleteBarcodeImageResponse:
+        try:
+            await self.get_model_by_id(product_id)
+
+            uploader = BarcodeImagesUploader()
+            await self.delete_model_barcode_image(uploader, product_id)
+
+            return ProductDeleteBarcodeImageResponse(
+                ok=True,
+                message='Штрих-код для товара успешно удален',
+            )
+        except Exception as e:
+            return ProductDeleteBarcodeImageResponse(ok=False, message=str(e))
+
+    async def get_barcode_image(self, product_id: int) -> ProductGetBarcodeImageResponse:
+        product: Optional[Product] = await self.session.get(Product, product_id)
+        if not product:
+            raise HTTPException(404, 'Не удалось найти товар с указанным ID')
+        barcode_image: Optional[ProductBarcodeImage] = await self.session.get(ProductBarcodeImage, product_id)
+        if not barcode_image:
+            return ProductGetBarcodeImageResponse(barcode_image_url="")
+
+        uploader = BarcodeImagesUploader()
+        url = uploader.get_url(barcode_image.filename)
+        return ProductGetBarcodeImageResponse(barcode_image_url=url)
+
     # endregion