Improve the inventory page 3

services/inventory/app/models/inventory.py

@@ -75,14 +75,14 @@ class ProductionStage(enum.Enum):
 
 class StockMovementType(enum.Enum):
     """Types of inventory movements"""
-    PURCHASE = "purchase"
-    PRODUCTION_USE = "production_use"
-    ADJUSTMENT = "adjustment"
-    WASTE = "waste"
-    TRANSFER = "transfer"
-    RETURN = "return"
-    INITIAL_STOCK = "initial_stock"
-    TRANSFORMATION = "transformation"  # Converting between production stages
+    PURCHASE = "PURCHASE"
+    PRODUCTION_USE = "PRODUCTION_USE"
+    ADJUSTMENT = "ADJUSTMENT"
+    WASTE = "WASTE"
+    TRANSFER = "TRANSFER"
+    RETURN = "RETURN"
+    INITIAL_STOCK = "INITIAL_STOCK"
+    TRANSFORMATION = "TRANSFORMATION"  # Converting between production stages
 
 
 class Ingredient(Base):
@@ -121,15 +121,8 @@ class Ingredient(Base):
     reorder_quantity = Column(Float, nullable=False, default=50.0)
     max_stock_level = Column(Float, nullable=True)
     
-    # Storage requirements (applies to both ingredients and finished products)
-    requires_refrigeration = Column(Boolean, default=False)
-    requires_freezing = Column(Boolean, default=False)
-    storage_temperature_min = Column(Float, nullable=True)  # Celsius
-    storage_temperature_max = Column(Float, nullable=True)  # Celsius
-    storage_humidity_max = Column(Float, nullable=True)  # Percentage
-    
-    # Shelf life (critical for finished products)
-    shelf_life_days = Column(Integer, nullable=True)
+    # Shelf life (critical for finished products) - default values only
+    shelf_life_days = Column(Integer, nullable=True)  # Default shelf life - actual per batch
     display_life_hours = Column(Integer, nullable=True)  # How long can be displayed (for fresh products)
     best_before_hours = Column(Integer, nullable=True)  # Hours until best before (for same-day products)
     storage_instructions = Column(Text, nullable=True)
@@ -211,11 +204,6 @@ class Ingredient(Base):
             'reorder_point': self.reorder_point,
             'reorder_quantity': self.reorder_quantity,
             'max_stock_level': self.max_stock_level,
-            'requires_refrigeration': self.requires_refrigeration,
-            'requires_freezing': self.requires_freezing,
-            'storage_temperature_min': self.storage_temperature_min,
-            'storage_temperature_max': self.storage_temperature_max,
-            'storage_humidity_max': self.storage_humidity_max,
             'shelf_life_days': self.shelf_life_days,
             'display_life_hours': self.display_life_hours,
             'best_before_hours': self.best_before_hours,
@@ -248,7 +236,7 @@ class Stock(Base):
     supplier_batch_ref = Column(String(100), nullable=True)
 
     # Production stage tracking
-    production_stage = Column(String(20), nullable=False, default='raw_ingredient', index=True)
+    production_stage = Column(SQLEnum('raw_ingredient', 'par_baked', 'fully_baked', 'prepared_dough', 'frozen_product', name='productionstage', create_type=False), nullable=False, default='raw_ingredient', index=True)
     transformation_reference = Column(String(100), nullable=True, index=True)  # Links related transformations
 
     # Quantities
@@ -275,6 +263,15 @@ class Stock(Base):
     warehouse_zone = Column(String(50), nullable=True)
     shelf_position = Column(String(50), nullable=True)
     
+    # Batch-specific storage requirements
+    requires_refrigeration = Column(Boolean, default=False)
+    requires_freezing = Column(Boolean, default=False)
+    storage_temperature_min = Column(Float, nullable=True)  # Celsius
+    storage_temperature_max = Column(Float, nullable=True)  # Celsius
+    storage_humidity_max = Column(Float, nullable=True)  # Percentage
+    shelf_life_days = Column(Integer, nullable=True)  # Batch-specific shelf life
+    storage_instructions = Column(Text, nullable=True)  # Batch-specific instructions
+
     # Status
     is_available = Column(Boolean, default=True)
     is_expired = Column(Boolean, default=False, index=True)
@@ -325,6 +322,13 @@ class Stock(Base):
             'storage_location': self.storage_location,
             'warehouse_zone': self.warehouse_zone,
             'shelf_position': self.shelf_position,
+            'requires_refrigeration': self.requires_refrigeration,
+            'requires_freezing': self.requires_freezing,
+            'storage_temperature_min': self.storage_temperature_min,
+            'storage_temperature_max': self.storage_temperature_max,
+            'storage_humidity_max': self.storage_humidity_max,
+            'shelf_life_days': self.shelf_life_days,
+            'storage_instructions': self.storage_instructions,
             'is_available': self.is_available,
             'is_expired': self.is_expired,
             'quality_status': self.quality_status,
@@ -343,7 +347,7 @@ class StockMovement(Base):
     stock_id = Column(UUID(as_uuid=True), ForeignKey('stock.id'), nullable=True, index=True)
     
     # Movement details
-    movement_type = Column(SQLEnum(StockMovementType), nullable=False, index=True)
+    movement_type = Column(SQLEnum('PURCHASE', 'PRODUCTION_USE', 'ADJUSTMENT', 'WASTE', 'TRANSFER', 'RETURN', 'INITIAL_STOCK', name='stockmovementtype', create_type=False), nullable=False, index=True)
     quantity = Column(Float, nullable=False)
     unit_cost = Column(Numeric(10, 2), nullable=True)
     total_cost = Column(Numeric(10, 2), nullable=True)
@@ -386,7 +390,7 @@ class StockMovement(Base):
             'tenant_id': str(self.tenant_id),
             'ingredient_id': str(self.ingredient_id),
             'stock_id': str(self.stock_id) if self.stock_id else None,
-            'movement_type': self.movement_type.value if self.movement_type else None,
+            'movement_type': self.movement_type if self.movement_type else None,
             'quantity': self.quantity,
             'unit_cost': float(self.unit_cost) if self.unit_cost else None,
             'total_cost': float(self.total_cost) if self.total_cost else None,
@@ -415,8 +419,8 @@ class ProductTransformation(Base):
     target_ingredient_id = Column(UUID(as_uuid=True), ForeignKey('ingredients.id'), nullable=False)
 
     # Stage transformation
-    source_stage = Column(String(20), nullable=False)
-    target_stage = Column(String(20), nullable=False)
+    source_stage = Column(SQLEnum('raw_ingredient', 'par_baked', 'fully_baked', 'prepared_dough', 'frozen_product', name='productionstage', create_type=False), nullable=False)
+    target_stage = Column(SQLEnum('raw_ingredient', 'par_baked', 'fully_baked', 'prepared_dough', 'frozen_product', name='productionstage', create_type=False), nullable=False)
 
     # Quantities and conversion
     source_quantity = Column(Float, nullable=False)  # Input quantity