Application fully migrated to modular approach

app/services/product_service.py

@@ -1,4 +1,5 @@
 from sqlalchemy.orm import Session
+from sqlalchemy.exc import IntegrityError
 from models.database_models import Product, Stock
 from models.api_models import ProductCreate, ProductUpdate, StockLocationResponse, StockSummaryResponse
 from utils.data_processing import GTINProcessor, PriceProcessor
@@ -16,31 +17,41 @@ class ProductService:
 
     def create_product(self, db: Session, product_data: ProductCreate) -> Product:
         """Create a new product with validation"""
-        # Process and validate GTIN if provided
-        if product_data.gtin:
-            normalized_gtin = self.gtin_processor.normalize(product_data.gtin)
-            if not normalized_gtin:
-                raise ValueError("Invalid GTIN format")
-            product_data.gtin = normalized_gtin
+        try:
+            # Process and validate GTIN if provided
+            if product_data.gtin:
+                normalized_gtin = self.gtin_processor.normalize(product_data.gtin)
+                if not normalized_gtin:
+                    raise ValueError("Invalid GTIN format")
+                product_data.gtin = normalized_gtin
 
-        # Process price if provided
-        if product_data.price:
-            parsed_price, currency = self.price_processor.parse_price_currency(product_data.price)
-            if parsed_price:
-                product_data.price = parsed_price
-                product_data.currency = currency
+            # Process price if provided
+            if product_data.price:
+                parsed_price, currency = self.price_processor.parse_price_currency(product_data.price)
+                if parsed_price:
+                    product_data.price = parsed_price
+                    product_data.currency = currency
 
-        # Set default marketplace if not provided
-        if not product_data.marketplace:
-            product_data.marketplace = "Letzshop"
+            # Set default marketplace if not provided
+            if not product_data.marketplace:
+                product_data.marketplace = "Letzshop"
 
-        db_product = Product(**product_data.dict())
-        db.add(db_product)
-        db.commit()
-        db.refresh(db_product)
+            db_product = Product(**product_data.model_dump())
+            db.add(db_product)
+            db.commit()
+            db.refresh(db_product)
 
-        logger.info(f"Created product {db_product.product_id}")
-        return db_product
+            logger.info(f"Created product {db_product.product_id}")
+            return db_product
+
+        except IntegrityError as e:
+            db.rollback()
+            logger.error(f"Database integrity error: {str(e)}")
+            raise ValueError("Product with this ID already exists")
+        except Exception as e:
+            db.rollback()
+            logger.error(f"Error creating product: {str(e)}")
+            raise
 
     def get_product_by_id(self, db: Session, product_id: str) -> Optional[Product]:
         """Get a product by its ID"""
@@ -94,7 +105,7 @@ class ProductService:
             raise ValueError("Product not found")
 
         # Update fields
-        update_data = product_update.dict(exclude_unset=True)
+        update_data = product_update.model_dump(exclude_unset=True)
 
         # Validate GTIN if being updated
         if "gtin" in update_data and update_data["gtin"]: