Improve the inventory page 3

services/inventory/app/schemas/inventory.py

@@ -54,16 +54,8 @@ class IngredientCreate(InventoryBaseSchema):
     reorder_quantity: float = Field(50.0, gt=0, description="Default reorder quantity")
     max_stock_level: Optional[float] = Field(None, gt=0, description="Maximum stock level")
     
-    # Storage requirements
-    requires_refrigeration: bool = Field(False, description="Requires refrigeration")
-    requires_freezing: bool = Field(False, description="Requires freezing")
-    storage_temperature_min: Optional[float] = Field(None, description="Min storage temperature (°C)")
-    storage_temperature_max: Optional[float] = Field(None, description="Max storage temperature (°C)")
-    storage_humidity_max: Optional[float] = Field(None, ge=0, le=100, description="Max humidity (%)")
-    
-    # Shelf life
-    shelf_life_days: Optional[int] = Field(None, gt=0, description="Shelf life in days")
-    storage_instructions: Optional[str] = Field(None, description="Storage instructions")
+    # Shelf life (default value only - actual per batch)
+    shelf_life_days: Optional[int] = Field(None, gt=0, description="Default shelf life in days")
     
     # Properties
     is_perishable: bool = Field(False, description="Is perishable")
@@ -106,16 +98,8 @@ class IngredientUpdate(InventoryBaseSchema):
     reorder_quantity: Optional[float] = Field(None, gt=0, description="Default reorder quantity")
     max_stock_level: Optional[float] = Field(None, gt=0, description="Maximum stock level")
     
-    # Storage requirements
-    requires_refrigeration: Optional[bool] = Field(None, description="Requires refrigeration")
-    requires_freezing: Optional[bool] = Field(None, description="Requires freezing")
-    storage_temperature_min: Optional[float] = Field(None, description="Min storage temperature (°C)")
-    storage_temperature_max: Optional[float] = Field(None, description="Max storage temperature (°C)")
-    storage_humidity_max: Optional[float] = Field(None, ge=0, le=100, description="Max humidity (%)")
-    
-    # Shelf life
-    shelf_life_days: Optional[int] = Field(None, gt=0, description="Shelf life in days")
-    storage_instructions: Optional[str] = Field(None, description="Storage instructions")
+    # Shelf life (default value only - actual per batch)
+    shelf_life_days: Optional[int] = Field(None, gt=0, description="Default shelf life in days")
     
     # Properties
     is_active: Optional[bool] = Field(None, description="Is active")
@@ -144,13 +128,7 @@ class IngredientResponse(InventoryBaseSchema):
     reorder_point: float
     reorder_quantity: float
     max_stock_level: Optional[float]
-    requires_refrigeration: bool
-    requires_freezing: bool
-    storage_temperature_min: Optional[float]
-    storage_temperature_max: Optional[float]
-    storage_humidity_max: Optional[float]
-    shelf_life_days: Optional[int]
-    storage_instructions: Optional[str]
+    shelf_life_days: Optional[int]  # Default value only
     is_active: bool
     is_perishable: bool
     allergen_info: Optional[Dict[str, Any]]
@@ -174,7 +152,7 @@ class StockCreate(InventoryBaseSchema):
     supplier_batch_ref: Optional[str] = Field(None, max_length=100, description="Supplier batch reference")
 
     # Production stage tracking
-    production_stage: ProductionStage = Field(ProductionStage.RAW_INGREDIENT, description="Production stage of the stock")
+    production_stage: ProductionStage = Field(default=ProductionStage.RAW_INGREDIENT, description="Production stage of the stock")
     transformation_reference: Optional[str] = Field(None, max_length=100, description="Transformation reference ID")
 
     current_quantity: float = Field(..., ge=0, description="Current quantity")
@@ -194,6 +172,15 @@ class StockCreate(InventoryBaseSchema):
 
     quality_status: str = Field("good", description="Quality status")
 
+    # Batch-specific storage requirements
+    requires_refrigeration: bool = Field(False, description="Requires refrigeration")
+    requires_freezing: bool = Field(False, description="Requires freezing")
+    storage_temperature_min: Optional[float] = Field(None, description="Min storage temperature (°C)")
+    storage_temperature_max: Optional[float] = Field(None, description="Max storage temperature (°C)")
+    storage_humidity_max: Optional[float] = Field(None, ge=0, le=100, description="Max humidity (%)")
+    shelf_life_days: Optional[int] = Field(None, gt=0, description="Batch-specific shelf life in days")
+    storage_instructions: Optional[str] = Field(None, description="Batch-specific storage instructions")
+
 
 class StockUpdate(InventoryBaseSchema):
     """Schema for updating stock entries"""
@@ -224,6 +211,15 @@ class StockUpdate(InventoryBaseSchema):
     is_available: Optional[bool] = Field(None, description="Is available")
     quality_status: Optional[str] = Field(None, description="Quality status")
 
+    # Batch-specific storage requirements
+    requires_refrigeration: Optional[bool] = Field(None, description="Requires refrigeration")
+    requires_freezing: Optional[bool] = Field(None, description="Requires freezing")
+    storage_temperature_min: Optional[float] = Field(None, description="Min storage temperature (°C)")
+    storage_temperature_max: Optional[float] = Field(None, description="Max storage temperature (°C)")
+    storage_humidity_max: Optional[float] = Field(None, ge=0, le=100, description="Max humidity (%)")
+    shelf_life_days: Optional[int] = Field(None, gt=0, description="Batch-specific shelf life in days")
+    storage_instructions: Optional[str] = Field(None, description="Batch-specific storage instructions")
+
 
 class StockResponse(InventoryBaseSchema):
     """Schema for stock API responses"""
@@ -258,6 +254,15 @@ class StockResponse(InventoryBaseSchema):
     is_available: bool
     is_expired: bool
     quality_status: str
+
+    # Batch-specific storage requirements
+    requires_refrigeration: bool
+    requires_freezing: bool
+    storage_temperature_min: Optional[float]
+    storage_temperature_max: Optional[float]
+    storage_humidity_max: Optional[float]
+    shelf_life_days: Optional[int]
+    storage_instructions: Optional[str]
     created_at: datetime
     updated_at: datetime