Fix UI for inventory page 3

services/inventory/app/api/stock.py

@@ -7,6 +7,7 @@ from typing import List, Optional
 from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException, Query, Path, status
 from sqlalchemy.ext.asyncio import AsyncSession
+import structlog
 
 from app.core.database import get_db
 from app.services.inventory_service import InventoryService
@@ -20,6 +21,7 @@ from app.schemas.inventory import (
 )
 from shared.auth.decorators import get_current_user_dep
 
+logger = structlog.get_logger()
 router = APIRouter(tags=["stock"])
 
 # Helper function to extract user ID from user object
@@ -180,6 +182,37 @@ async def get_stock(
         )
 
 
+@router.get("/tenants/{tenant_id}/stock/movements", response_model=List[StockMovementResponse])
+async def get_stock_movements(
+    tenant_id: UUID = Path(..., description="Tenant ID"),
+    skip: int = Query(0, ge=0, description="Number of records to skip"),
+    limit: int = Query(100, ge=1, le=1000, description="Number of records to return"),
+    ingredient_id: Optional[UUID] = Query(None, description="Filter by ingredient"),
+    movement_type: Optional[str] = Query(None, description="Filter by movement type"),
+    db: AsyncSession = Depends(get_db)
+):
+    """Get stock movements with filtering"""
+    logger.info("🌐 API endpoint reached!",
+               tenant_id=tenant_id,
+               ingredient_id=ingredient_id,
+               skip=skip,
+               limit=limit)
+
+    try:
+        service = InventoryService()
+        movements = await service.get_stock_movements(
+            tenant_id, skip, limit, ingredient_id, movement_type
+        )
+        logger.info("📈 Returning movements", count=len(movements))
+        return movements
+    except Exception as e:
+        logger.error("❌ Failed to get stock movements", error=str(e), tenant_id=tenant_id)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Failed to get stock movements"
+        )
+
+
 @router.get("/tenants/{tenant_id}/stock/{stock_id}", response_model=StockResponse)
 async def get_stock_entry(
     stock_id: UUID = Path(..., description="Stock entry ID"),
@@ -294,24 +327,3 @@ async def create_stock_movement(
         )
 
 
-@router.get("/tenants/{tenant_id}/stock/movements", response_model=List[StockMovementResponse])
-async def get_stock_movements(
-    tenant_id: UUID = Path(..., description="Tenant ID"),
-    skip: int = Query(0, ge=0, description="Number of records to skip"),
-    limit: int = Query(100, ge=1, le=1000, description="Number of records to return"),
-    ingredient_id: Optional[UUID] = Query(None, description="Filter by ingredient"),
-    movement_type: Optional[str] = Query(None, description="Filter by movement type"),
-    db: AsyncSession = Depends(get_db)
-):
-    """Get stock movements with filtering"""
-    try:
-        service = InventoryService()
-        movements = await service.get_stock_movements(
-            tenant_id, skip, limit, ingredient_id, movement_type
-        )
-        return movements
-    except Exception as e:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="Failed to get stock movements"
-        )

services/inventory/app/repositories/stock_movement_repository.py

@@ -141,6 +141,52 @@ class StockMovementRepository(BaseRepository[StockMovement, StockMovementCreate,
             logger.error("Failed to get recent movements", error=str(e), tenant_id=tenant_id)
             raise
 
+    async def get_movements(
+        self,
+        tenant_id: UUID,
+        skip: int = 0,
+        limit: int = 100,
+        ingredient_id: Optional[UUID] = None,
+        movement_type: Optional[str] = None
+    ) -> List[StockMovement]:
+        """Get stock movements with filtering"""
+        logger.info("🔍 Repository getting movements",
+                   tenant_id=tenant_id,
+                   ingredient_id=ingredient_id,
+                   skip=skip,
+                   limit=limit)
+        try:
+            query = select(self.model).where(self.model.tenant_id == tenant_id)
+
+            # Add filters
+            if ingredient_id:
+                query = query.where(self.model.ingredient_id == ingredient_id)
+                logger.info("🎯 Filtering by ingredient_id", ingredient_id=ingredient_id)
+
+            if movement_type:
+                # Convert string to enum
+                try:
+                    movement_type_enum = StockMovementType(movement_type)
+                    query = query.where(self.model.movement_type == movement_type_enum)
+                    logger.info("🏷️ Filtering by movement_type", movement_type=movement_type)
+                except ValueError:
+                    logger.warning("⚠️ Invalid movement type", movement_type=movement_type)
+                    # Invalid movement type, skip filter
+                    pass
+
+            # Order by date (newest first) and apply pagination
+            query = query.order_by(desc(self.model.movement_date)).offset(skip).limit(limit)
+
+            result = await self.session.execute(query)
+            movements = result.scalars().all()
+
+            logger.info("🔢 Repository found movements", count=len(movements))
+            return movements
+
+        except Exception as e:
+            logger.error("❌ Repository failed to get movements", error=str(e), tenant_id=tenant_id)
+            raise
+
     async def get_movements_by_reference(
         self, 
         tenant_id: UUID, 

services/inventory/app/services/inventory_service.py

@@ -370,6 +370,55 @@ class InventoryService:
             logger.error("Failed to get stock by ingredient", error=str(e), ingredient_id=ingredient_id)
             raise
 
+    async def get_stock_movements(
+        self,
+        tenant_id: UUID,
+        skip: int = 0,
+        limit: int = 100,
+        ingredient_id: Optional[UUID] = None,
+        movement_type: Optional[str] = None
+    ) -> List[StockMovementResponse]:
+        """Get stock movements with filtering"""
+        logger.info("📈 Getting stock movements",
+                   tenant_id=tenant_id,
+                   ingredient_id=ingredient_id,
+                   skip=skip,
+                   limit=limit)
+        try:
+            async with get_db_transaction() as db:
+                movement_repo = StockMovementRepository(db)
+                ingredient_repo = IngredientRepository(db)
+
+                # Get filtered movements
+                movements = await movement_repo.get_movements(
+                    tenant_id=tenant_id,
+                    skip=skip,
+                    limit=limit,
+                    ingredient_id=ingredient_id,
+                    movement_type=movement_type
+                )
+
+                logger.info("📊 Found movements", count=len(movements))
+
+                responses = []
+                for movement in movements:
+                    response = StockMovementResponse(**movement.to_dict())
+
+                    # Include ingredient information if needed
+                    if movement.ingredient_id:
+                        ingredient = await ingredient_repo.get_by_id(movement.ingredient_id)
+                        if ingredient:
+                            response.ingredient = IngredientResponse(**ingredient.to_dict())
+
+                    responses.append(response)
+
+                logger.info("✅ Returning movements", response_count=len(responses))
+                return responses
+
+        except Exception as e:
+            logger.error("❌ Failed to get stock movements", error=str(e), tenant_id=tenant_id)
+            raise
+
     # ===== ALERTS AND NOTIFICATIONS =====
 
     async def check_low_stock_alerts(self, tenant_id: UUID) -> List[Dict[str, Any]]: