(catalogues): implement global meta schema for catalogues module with audit information

app/catalogues/controllers/router.py

@@ -320,6 +320,7 @@ async def update_item(
             catalogue_id, 
             update_data, 
             current_user.user_id,
+            current_user.username,
             merchant_id=current_user.merchant_id
         )    
      

app/catalogues/schemas/schema.py

@@ -732,7 +732,16 @@ class Catalogue(BaseModel):
     inventory: Optional[Inventory] = Field(None, description="Inventory management configuration")
     tax: Optional[Tax] = Field(None, description="Tax information (HSN, GST)")
     media: Optional[Media] = Field(None, description="Product images and media")
-    meta: Optional[Meta] = Field(None, description="Metadata (timestamps, status, created by)")
+    created_by: Optional[constr(min_length=3, max_length=100, strip_whitespace=True)] = Field(
+        None,
+        description="User ID of the creator of this catalogue item"
+    )
+    updated_by: Optional[constr(min_length=3, max_length=100, strip_whitespace=True)] = Field(None, description="User ID of the last updater of this catalogue item")
+    updated_at: Optional[datetime] = Field(None, description="Last update timestamp")
+    created_at: Optional[datetime] = Field(None, description="Timestamp of creation")
+    created_by_username: Optional[constr(min_length=3, max_length=100, strip_whitespace=True)] = Field(None, description="Username of the creator of this catalogue item")
+    updated_by_username: Optional[constr(min_length=3, max_length=100, strip_whitespace=True)] = Field(None, description="Username of the creator of this catalogue item")
+    status: CatalogueStatus = Field(CatalogueStatus.ACTIVE, description="Status of the catalogue item")
 
     @field_validator("catalogue_code")
     def validate_catalogue_code(cls, v):

app/catalogues/services/service.py

@@ -7,6 +7,7 @@ from fastapi import HTTPException, status
 from motor.core import AgnosticDatabase as AsyncIOMotorDatabase
 from app.catalogues.schemas.schema import Catalogue
 from app.catalogues.constants import SCM_CATALOGUE_COLLECTION
+from app.core.utils import format_meta_field
 from app.dependencies.auth import TokenUser
 from app.utils.util import flatten_update_data
 from app.catalogues.utils import (
@@ -227,7 +228,22 @@ class CatalogueService:
 
             items = []
             async for doc in cursor:
-                items.append(doc if projection_list else Catalogue(**doc))
+                if projection_list:
+                    # Projection returns raw dict → format directly
+                    formatted_doc = format_meta_field(doc)
+                    items.append(formatted_doc)
+
+                else:
+                    # Create Pydantic model first
+                    catalogue_obj = Catalogue(**doc)
+
+                    # Convert to dict
+                    catalogue_dict = catalogue_obj.model_dump()
+
+                    # Apply formatting AFTER model creation
+                    formatted_doc = format_meta_field(catalogue_dict)
+
+                    items.append(formatted_doc)
 
             return items, total_count
 
@@ -351,13 +367,13 @@ class CatalogueService:
                 inventory=data.inventory,
                 tax=data.tax,
                 media=data.media,
-
-                meta={
-                    "created_by": current_user.user_id,
-                    "created_by_user_name": current_user.username,
-                    "created_at": datetime.utcnow(),
-                    "status": "Active",
-                }
+                created_by=current_user.user_id,
+                created_by_username=current_user.username,
+                created_at=datetime.utcnow(),
+                updated_at=None,
+                updated_by_username=None,
+                updated_by=None,
+                status="Active",
             )
 
             # Insert into MongoDB
@@ -384,7 +400,7 @@ class CatalogueService:
                 detail="Failed to create catalogue item"
             )
             
-    async def update_catalogue_item(self, catalogue_id: str, update_data: dict, updated_by: str, merchant_id: str = None):
+    async def update_catalogue_item(self, catalogue_id: str, update_data: dict, updated_by: str, updated_by_username: str, merchant_id: str = None):
         """Update an existing catalogue item with merchant filtering."""
         try:
             # Check if the catalogue exists with merchant filtering
@@ -439,8 +455,9 @@ class CatalogueService:
             update_data_flat = flatten_update_data(update_data)
 
             # Add metadata
-            update_data_flat["meta.updated_by"] = updated_by
-            update_data_flat["meta.updated_at"] = datetime.utcnow()
+            update_data_flat["updated_by"] = updated_by
+            update_data_flat["updated_by_username"] = updated_by_username
+            update_data_flat["updated_at"] = datetime.utcnow()
 
             # Update MongoDB with merchant filtering
             update_query = {"catalogue_id": catalogue_id}
@@ -693,7 +710,9 @@ class CatalogueService:
             if projection_list:
                 return doc
             else:
-                return Catalogue(**doc)
+                data = Catalogue(**doc)
+                formatted_data = format_meta_field(data.model_dump())
+                return formatted_data
 
         except HTTPException:
             raise
@@ -877,6 +896,7 @@ class CatalogueService:
                     cr.barcode_number,
                     cr.hsn_code,
                     cr.gst_rate,
+                    cr.updated_at,
                     cr.mrp,
                     COALESCE(cp.cost_price, cr.base_price) AS cost_price,
                     COALESCE(cp.trade_margin, 0) AS trade_margin,
@@ -1000,17 +1020,18 @@ class CatalogueService:
                     "lead_time_days": int(row.lead_time_days) if row.lead_time_days is not None else 7,
                     "max_stock_level": int(row.max_stock_level) if row.max_stock_level is not None else 1000,
                     "unit": row.unit if row.unit else "PCS",
+                    "updated_at": row.updated_at
                 }
-
+                formatted_item = format_meta_field(row_dict)
                 # Apply projection if specified
                 if projection_list:
                     projected_item = {}
                     for field in projection_list:
-                        if field in row_dict:
-                            projected_item[field] = row_dict[field]
+                        if field in formatted_item:
+                            projected_item[field] = formatted_item[field]
                     items.append(projected_item)
                 else:
-                    items.append(row_dict)
+                    items.append(formatted_item)
 
             logger.info(f"Retrieved {len(items)} merchant catalogue items for merchant {merchant_id}")
             return items, total_count