Merge https://huggingface.co/spaces/cuatrolabs/cuatrolabs-scm-ms

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

app/employees/services/service.py

@@ -21,7 +21,7 @@ from app.employees.constants import (
     MANAGER_REQUIRED_DESIGNATIONS,
     TWO_FA_REQUIRED_DESIGNATIONS,
 )
-from pydantic import ValidationError as PydanticValidationError
+from pydantic import TypeAdapter, ValidationError as PydanticValidationError
 from app.employees.models.model import EmployeeModel
 from app.employees.schemas.schema import EmployeeCreate, EmployeeUpdate, EmployeeResponse
 from app.system_users.services.service import SystemUserService
@@ -488,7 +488,41 @@ class EmployeeService:
 
             # Fetch updated employee
             updated_employee = await EmployeeService.get_employee_by_id(user_id)
-            
+            if "app_access" in update_data:
+
+                app_access = update_data["app_access"]
+                is_system_user = app_access.get("is_system_user")
+
+                system_user_service = SystemUserService(get_database())
+
+                if is_system_user is True:
+
+                    existing_system_user = await system_user_service.get_user_by_id(user_id)
+
+                    if not existing_system_user:
+
+                        logger.info(f"Creating system user for employee {user_id} from update flow")
+
+                        # Convert DB dict back to schema for reuse
+                        employee_schema = EmployeeCreate.model_validate(updated_employee)
+
+                        await EmployeeService._create_employee_system_user(
+                            employee_user_id=user_id,
+                            employee_payload=employee_schema,
+                            merchant_type=updated_employee.get("merchant_type"),
+                        )
+
+                    else:
+                        logger.info(f"System user already exists for employee {user_id}")
+
+                elif is_system_user is False:
+
+                    existing_system_user = await system_user_service.get_user_by_id(user_id)
+
+                    if existing_system_user:
+                        logger.info(f"Deactivating system user for employee {user_id}")
+                        await system_user_service.deactivate_user(user_id)
+
             logger.info(
                 f"Updated employee {user_id}",
                 extra={
@@ -499,10 +533,16 @@ class EmployeeService:
             )
             
             formatted_employee = EmployeeService._format_employee_with_meta(updated_employee)
-            return EmployeeResponse(**formatted_employee)
+            formatted_employee.pop("_id", None)
+            # Convert to JSON-safe dict
+            formatted_employee = TypeAdapter(dict).dump_python(
+                    formatted_employee,
+                    mode="json"
+                )
+            return EmployeeResponse.model_validate(formatted_employee)
             
         except Exception as e:
-            logger.error(f"Error updating employee {user_id}", exc_info=e)
+            logger.exception(f"Error updating employee {user_id}")
             raise HTTPException(
                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
                 detail=f"Error updating employee: {str(e)}"
@@ -840,7 +880,7 @@ class EmployeeService:
     @staticmethod
     async def _create_employee_system_user(
         employee_user_id: str,
-        employee_payload: EmployeeCreate,
+        employee_payload: dict,
         merchant_type: Optional[str] = None
     ):
         """
@@ -907,14 +947,14 @@ class EmployeeService:
             system_user_request = CreateUserRequest(
                 username=username,
                 email=employee_payload.email,
-                merchant_id=employee_payload.created_by,
+                merchant_id=str(employee_payload.created_by),
                 merchant_type=merchant_type,
                 password=default_password,
                 full_name=employee_name,
                 role_id=role_id,
                 status=UserStatus.ACTIVE,
                 metadata={
-                    "employee_user_id": employee_user_id,
+                    "employee_user_id": str(employee_user_id),
                     "employee_code": employee_payload.employee_code,
                     "designation": employee_payload.designation,
                     "created_from": "employee_creation",

app/inventory/adjustments/controllers/router.py

@@ -23,7 +23,7 @@ router = APIRouter(
 )
 
 
-@router.post("/", response_model=List[StockAdjustmentResponse], status_code=status.HTTP_201_CREATED)
+@router.post("/", status_code=status.HTTP_201_CREATED)
 async def create_stock_adjustment(
     payload: CreateStockAdjustmentRequest,
     current_user: TokenUser = Depends(get_current_user)
@@ -77,7 +77,8 @@ async def create_stock_adjustment(
         return await StockAdjustmentService.create_adjustment(
             payload=payload,
             merchant_id=current_user.merchant_id,
-            created_by=current_user.user_id
+            created_by=current_user.user_id,
+            current_user=current_user
         )
     except Exception as e:
         logger.error(f"Error in create_stock_adjustment endpoint", exc_info=e)
@@ -158,7 +159,7 @@ async def update_adjustment_status(
             # Convert to legacy approve request for service compatibility
             from app.inventory.adjustments.schemas.schema import ApproveStockAdjustmentRequest
             approve_payload = ApproveStockAdjustmentRequest(approved_by=payload.updated_by)
-            return await StockAdjustmentService.approve_adjustment(adjustment_id, approve_payload)
+            return await StockAdjustmentService.approve_adjustment(adjustment_id, approve_payload, current_user)
         else:  # reject
             # Convert to legacy reject request for service compatibility
             from app.inventory.adjustments.schemas.schema import RejectStockAdjustmentRequest

app/inventory/adjustments/schemas/schema.py

@@ -92,12 +92,10 @@ class StockAdjustmentResponse(BaseModel):
     qty: int
     reason: str
     status: AdjustmentStatus
-    created_by: str
     approved_by: Optional[str]
-    created_at: datetime
     approved_at: Optional[datetime]
     applied_at: Optional[datetime]
-
+    meta: Optional[Dict[str, Any]] = None  # For any additional metadata
 
 class StockAdjustmentDetailResponse(BaseModel):
     """Response schema for individual adjustment line item"""

app/inventory/adjustments/services/service.py

@@ -5,11 +5,13 @@ import uuid
 from datetime import datetime
 from typing import Optional, List, Dict, Any
 from fastapi import HTTPException, status
+from pymongo import results
 from requests import session
 from app.core.logging import get_logger
 from sqlalchemy import select, and_, func, text, or_
 from decimal import Decimal
 
+from app.core.utils import format_meta_field
 from app.sql import async_session
 from app.inventory.stock.models.model import (
     ScmStockAdjustmentMaster, ScmStockAdjustmentDetails, 
@@ -278,8 +280,9 @@ class StockAdjustmentService:
     async def create_adjustment(
         payload: CreateStockAdjustmentRequest,
         merchant_id: Optional[str] = None,
-        created_by: Optional[str] = None
-    ) -> List[StockAdjustmentResponse]:
+        created_by: Optional[str] = None,
+        current_user: Optional[Any] = None
+    ) :
         """
         OPTIMIZED: Create new stock adjustments using master-detail structure with batch operations.
         
@@ -317,7 +320,12 @@ class StockAdjustmentService:
                     status="pending",
                     total_items=len(payload.entries),
                     total_adjustment_value=Decimal('0'),
-                    created_by=created_by or "system"
+                    created_by=created_by or "system",
+                    updated_by=None,
+                    updated_by_username=None,
+                    created_by_username=current_user.username if current_user else "system",
+                    created_at=datetime.utcnow(),
+                    updated_at=None
                 )
                 
                 session.add(master)
@@ -384,23 +392,28 @@ class StockAdjustmentService:
                     
                     # Build response objects
                     for detail in detail_records:
-                        results.append(StockAdjustmentResponse(
-                            adjustment_id=str(detail.adjustment_detail_id),
-                            merchant_id=master.merchant_id,
-                            warehouse_id=master.warehouse_id,
-                            sku=detail.sku,
-                            batch_no=detail.batch_no,
-                            adj_type=AdjustmentType(detail.adj_type),
-                            qty=int(detail.qty),
-                            reason=detail.reason,
-                            status=AdjustmentStatus.PENDING,
-                            created_by=master.created_by,
-                            approved_by=master.approved_by,
-                            created_at=detail.created_at,
-                            approved_at=master.approved_at,
-                            applied_at=master.approved_at
-                        ))
-                
+                        row_dict = {
+                            "adjustment_id": str(detail.adjustment_detail_id),
+                            "merchant_id": master.merchant_id,
+                            "warehouse_id": master.warehouse_id,
+                            "sku": detail.sku,
+                            "batch_no": detail.batch_no,
+                            "adj_type": AdjustmentType(detail.adj_type),
+                            "qty": int(detail.qty),
+                            "reason": detail.reason,
+                            "status": AdjustmentStatus.PENDING,
+
+                            # Audit fields
+                            "created_by": master.created_by,
+                            "created_by_username": master.created_by_username,
+                            "created_at": detail.created_at,
+
+                            "updated_by": master.updated_by,
+                            "updated_by_username": master.updated_by_username,
+                            "updated_at": master.updated_at,
+                        }
+                        formatted = format_meta_field(row_dict)
+                        results.append(formatted)
                 # Update master with total value
                 master.total_adjustment_value = total_value
                 
@@ -702,22 +715,34 @@ class StockAdjustmentService:
                 )
                 master = master_result.scalar_one()
                 
-                return StockAdjustmentResponse(
-                    adjustment_id=str(detail.adjustment_detail_id),
-                    merchant_id=master.merchant_id,
-                    warehouse_id=master.warehouse_id,
-                    sku=detail.sku,
-                    batch_no=detail.batch_no,
-                    adj_type=AdjustmentType(detail.adj_type),
-                    qty=int(detail.qty),
-                    reason=detail.reason,
-                    status=AdjustmentStatus(master.status),
-                    created_by=master.created_by,
-                    approved_by=master.approved_by,
-                    created_at=detail.created_at,
-                    approved_at=master.approved_at,
-                    applied_at=master.approved_at
-                )
+                row_dict = {
+                    "adjustment_id": str(detail.adjustment_detail_id),
+                    "merchant_id": master.merchant_id,
+                    "warehouse_id": master.warehouse_id,
+                    "sku": detail.sku,
+                    "batch_no": detail.batch_no,
+                    "adj_type": AdjustmentType(detail.adj_type),
+                    "qty": int(detail.qty),
+                    "reason": detail.reason,
+                    "status": AdjustmentStatus(master.status),
+
+                    # Approval workflow (keep outside meta)
+                    "approved_by": master.approved_by,
+                    "approved_at": master.approved_at,
+                    "applied_at": master.applied_at,
+                    "rejected_at": master.rejected_at,
+
+                    # Audit fields (meta only)
+                    "created_by": master.created_by,
+                    "created_by_username": master.created_by_username,
+                    "created_at": detail.created_at,
+                    "updated_by": master.updated_by,
+                    "updated_by_username": master.updated_by_username,
+                    "updated_at": master.updated_at,
+                }
+
+                formatted = format_meta_field(row_dict)
+                return formatted
                 
         except HTTPException:
             raise
@@ -731,7 +756,8 @@ class StockAdjustmentService:
     @staticmethod
     async def approve_adjustment(
         adjustment_id: str,
-        payload: ApproveStockAdjustmentRequest
+        payload: ApproveStockAdjustmentRequest,
+        current_user:dict
     ) -> StockAdjustmentResponse:
         """Approve pending adjustment based on adjustment ID (accepts both master and detail IDs)."""
         try:
@@ -805,6 +831,9 @@ class StockAdjustmentService:
                 master.status = "approved"
                 master.approved_by = payload.approved_by
                 master.approved_at = datetime.utcnow()
+                master.updated_at = datetime.utcnow()
+                master.updated_by = current_user.user_id
+                master.updated_by_username = current_user.username
                 
                 # Apply all details
                 for detail_item in details:
@@ -815,22 +844,34 @@ class StockAdjustmentService:
                 
                 await session.commit()
                 
-                return StockAdjustmentResponse(
-                    adjustment_id=str(detail.adjustment_detail_id),
-                    merchant_id=master.merchant_id,
-                    warehouse_id=master.warehouse_id,
-                    sku=detail.sku,
-                    batch_no=detail.batch_no,
-                    adj_type=AdjustmentType(detail.adj_type),
-                    qty=int(detail.qty),
-                    reason=detail.reason,
-                    status=AdjustmentStatus(master.status),
-                    created_by=master.created_by,
-                    approved_by=master.approved_by,
-                    created_at=detail.created_at,
-                    approved_at=master.approved_at,
-                    applied_at=master.approved_at
-                )
+                row_dict = {
+                    "adjustment_id": str(detail.adjustment_detail_id),
+                    "merchant_id": master.merchant_id,
+                    "warehouse_id": master.warehouse_id,
+                    "sku": detail.sku,
+                    "batch_no": detail.batch_no,
+                    "adj_type": AdjustmentType(detail.adj_type),
+                    "qty": int(detail.qty),
+                    "reason": detail.reason,
+                    "status": AdjustmentStatus(master.status),
+
+                    # Workflow fields (stay outside meta)
+                    "approved_by": master.approved_by,
+                    "approved_at": master.approved_at,
+                    "applied_at": master.applied_at,
+
+                    # Audit fields (go inside meta)
+                    "created_by": master.created_by,
+                    "created_by_username": master.created_by_username,
+                    "created_at": detail.created_at,
+                    "updated_by": master.updated_by,
+                    "updated_by_username": master.updated_by_username,
+                    "updated_at": master.updated_at,
+                }
+
+                formatted = format_meta_field(row_dict)
+
+                return StockAdjustmentResponse(**formatted)
                 
         except HTTPException:
             raise
@@ -983,7 +1024,11 @@ class StockAdjustmentService:
                         m.created_by,
                         m.approved_by,
                         m.created_at,
-                        m.approved_at
+                        m.approved_at,
+                        m.created_by_username,
+                        m.updated_at,
+                        m.updated_by,
+                        m.updated_by_username
                     FROM trans.scm_stock_adjustment_master m
                     LEFT JOIN trans.scm_warehouse_ref w ON m.warehouse_id::text = w.warehouse_id::text
                     WHERE 1=1
@@ -1072,29 +1117,35 @@ class StockAdjustmentService:
                         result_list.append(item)
                     return result_list, total_count
                 else:
+                    result_list = []
                     # Return full model
-                    return [
-                        StockAdjustmentMasterResponse(
-                            adjustment_master_id=str(row.adjustment_master_id),
-                            adjustment_number=row.adjustment_number,
-                            merchant_id=row.merchant_id,
-                            warehouse_id=row.warehouse_id,
-                            warehouse_code=row.warehouse_code,
-                            warehouse_name=row.warehouse_name,
-                            adjustment_date=row.adjustment_date,
-                            description=row.description,
-                            additional_notes=row.additional_notes,
-                            status=row.status,
-                            total_items=row.total_items or 0,
-                            total_value=float(row.total_adjustment_value) if row.total_adjustment_value else 0.0,
-                            created_by=row.created_by,
-                            approved_by=row.approved_by,
-                            created_at=row.created_at,
-                            approved_at=row.approved_at
-                        )
-                        for row in rows
-                    ], total_count
-                
+                    for row in rows:
+                        row_dict = {
+                            "adjustment_master_id": str(row.adjustment_master_id),
+                            "adjustment_number": row.adjustment_number,
+                            "merchant_id": row.merchant_id,
+                            "warehouse_id": row.warehouse_id,
+                            "warehouse_code": row.warehouse_code,
+                            "warehouse_name": row.warehouse_name,
+                            "adjustment_date": row.adjustment_date,
+                            "description": row.description,
+                            "additional_notes": row.additional_notes,
+                            "status": row.status,
+                            "total_items": row.total_items or 0,
+                            "total_value": float(row.total_adjustment_value) if row.total_adjustment_value else 0.0,
+                            "created_by": row.created_by,
+                            "created_at": row.created_at,
+                            "approved_by": row.approved_by,
+                            "approved_at": row.approved_at,
+                            "created_by_username": row.created_by_username,
+                            "updated_by_username": row.updated_by_username,
+                            "updated_at": row.updated_at,
+                            "updated_by": row.updated_by,
+                        }
+                        print(row_dict)
+                        formatted = format_meta_field(row_dict)
+                        result_list.append(formatted)
+                    return result_list, total_count
         except Exception as e:
             logger.error(f"Error listing adjustment masters", exc_info=e)
             raise HTTPException(

app/inventory/stock/models/model.py

@@ -110,6 +110,11 @@ class ScmStockAdjustmentMaster(Base):
     approved_at = Column(TIMESTAMP(timezone=True), nullable=True)
     rejected_at = Column(TIMESTAMP(timezone=True), nullable=True)
     applied_at = Column(TIMESTAMP(timezone=True), nullable=True)
+    # NEW COLUMNS
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(100), nullable=True)
+    created_by_username = Column(String(100), nullable=True)
+    updated_at = Column(TIMESTAMP(timezone=True), nullable=True)
     
     # Rejection info
     rejection_reason = Column(Text, nullable=True)

app/inventory/stock/services/service.py

@@ -13,6 +13,7 @@ import json
 import logging
 from fastapi import HTTPException
 
+from app.core.utils import format_meta_field
 from app.purchases.receipts.models.model import ScmGrnItem
 
 logger = logging.getLogger(__name__)
@@ -443,8 +444,10 @@ class StockService:
             base_query = """
                 SELECT 
                     stock_id, merchant_id, warehouse_id, catalogue_id, sku, batch_no,
-                    exp_dt, qty_on_hand, qty_reserved, qty_available, uom,
-                    created_at, updated_at, last_updated_at
+                    expiry_date as exp_dt, qty_on_hand, qty_reserved, qty_available, uom,
+                    created_by, created_by_username,
+                    updated_by, updated_by_username,
+                    created_at, updated_at
                 FROM trans.scm_stock
                 WHERE 1=1
             """
@@ -505,24 +508,27 @@ class StockService:
                     "qty_available": float(row.qty_available) if row.qty_available else 0,
                     "uom": row.uom,
                     "created_at": row.created_at.isoformat() if row.created_at else None,
-                    "updated_at": row.updated_at.isoformat() if row.updated_at else None,
-                    "last_updated_at": row.last_updated_at.isoformat() if row.last_updated_at else None,
+                    "updated_at": row.updated_at.isoformat() if row.updated_at else None,    
+                    "created_by": row.created_by,
+                    "created_by_username": row.created_by_username,
+                    "updated_by": row.updated_by,
+                    "updated_by_username": row.updated_by_username,
                 }
-                
+                formatted = 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:
+                            projected_item[field] = formatted[field]
                     # Always include essential fields
                     essential_fields = ["stock_id", "sku"]
                     for field in essential_fields:
-                        if field not in projected_item and field in row_dict:
-                            projected_item[field] = row_dict[field]
+                        if field not in projected_item and field in formatted:
+                            projected_item[field] = formatted[field]
                     items.append(projected_item)
                 else:
-                    items.append(row_dict)
+                    items.append(formatted)
             
             return items, total_count
             
@@ -542,9 +548,11 @@ class StockService:
             # Build base query
             base_query = """
                 SELECT 
-                    ledger_id, merchant_id, warehouse_id, catalogue_id, sku, batch_no,
-                    exp_dt, qty, uom, txn_type, ref_type, ref_id, ref_no,
-                    remarks, created_by, created_at
+                    ledger_id, merchant_id, warehouse_id, sku, batch_no,
+                    qty, txn_type, ref_type, ref_id,
+                    created_by, created_by_username,
+                    updated_by, updated_by_username,
+                    created_at, updated_at
                 FROM trans.scm_stock_ledger
                 WHERE 1=1
             """
@@ -596,35 +604,37 @@ class StockService:
                     "ledger_id": str(row.ledger_id),
                     "merchant_id": row.merchant_id,
                     "warehouse_id": row.warehouse_id,
-                    "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,
-                    "exp_dt": row.exp_dt.isoformat() if row.exp_dt else None,
                     "qty": float(row.qty) if row.qty else 0,
-                    "uom": row.uom,
                     "txn_type": row.txn_type,
                     "ref_type": row.ref_type,
                     "ref_id": str(row.ref_id),
-                    "ref_no": row.ref_no,
-                    "remarks": row.remarks,
+
+                    # Audit fields (DO NOT isoformat here)
                     "created_by": row.created_by,
-                    "created_at": row.created_at.isoformat() if row.created_at else None,
+                    "created_by_username": getattr(row, "created_by_username", None),
+                    "created_at": row.created_at,
+                    "updated_by": getattr(row, "updated_by", None),
+                    "updated_by_username": getattr(row, "updated_by_username", None),
+                    "updated_at": getattr(row, "updated_at", None),
                 }
-                
+                formatted = 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:
+                            projected_item[field] = formatted[field]
+                            projected_item[field] = formatted[field]
                     # Always include essential fields
                     essential_fields = ["ledger_id", "sku", "txn_type"]
                     for field in essential_fields:
-                        if field not in projected_item and field in row_dict:
-                            projected_item[field] = row_dict[field]
+                        if field not in projected_item and field in formatted:
+                            projected_item[field] = formatted[field]
                     items.append(projected_item)
                 else:
-                    items.append(row_dict)
+                    items.append(formatted)
             
             return items, total_count
             

app/po_returns/controllers/router.py

@@ -70,7 +70,8 @@ async def create_po_return(
         po_return, errors = await PoReturnService.create_po_return(
             db=db,
             return_data=return_data,
-            created_by=created_by
+            created_by=created_by,
+            current_user=current_user
         )
         
         if errors:
@@ -256,7 +257,8 @@ async def handle_po_return_action(
             db=db,
             po_return_id=po_return_id,
             action_request=action_request,
-            performed_by=performed_by
+            performed_by=performed_by,
+            current_user=current_user
         )
         
         if errors:

app/po_returns/models/model.py

@@ -57,9 +57,24 @@ class PoReturn(Base):
     remarks = Column(Text)
     
     # Audit fields
-    created_by = Column(String(64))
-    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
-    updated_at = Column(DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)
+    created_by = Column(String(64), nullable=False)
+    created_by_username = Column(String(100), nullable=True)
+
+    created_at = Column(
+        DateTime,
+        nullable=False,
+        default=datetime.utcnow
+    )
+
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(100), nullable=True)
+
+    updated_at = Column(
+        DateTime,
+        nullable=False,
+        default=datetime.utcnow,
+        onupdate=datetime.utcnow
+    )
     
     # Relationships
     items = relationship("PoReturnItem", back_populates="po_return", cascade="all, delete-orphan")

app/po_returns/schemas/schema.py

@@ -157,14 +157,10 @@ class PoReturnRead(BaseModel):
     return_date: datetime
     status: str
     reason_code: Optional[str]
-    remarks: Optional[str]
-    created_by: Optional[str]
-    created_at: datetime
-    updated_at: datetime
-    
+    remarks: Optional[str]    
     # Optional related data
     items: Optional[List[PoReturnItemRead]] = None
-
+    meta: Optional[Dict[str, Any]] = None  # For any additional info like approval history, etc.
     class Config:
         from_attributes = True
 

app/po_returns/services/service.py

@@ -13,6 +13,7 @@ from sqlalchemy import and_, or_, func, select, text
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
+from app.core.utils import format_meta_field
 from app.po_returns.models.model import PoReturn, PoReturnItem, ReturnReasonCode
 from app.po_returns.schemas.schema import (
     PoReturnCreate, PoReturnRead, PoReturnActionRequest, 
@@ -260,7 +261,8 @@ class PoReturnService:
     async def create_po_return(
         db: AsyncSession,
         return_data: PoReturnCreate,
-        created_by: str
+        created_by: str,
+        current_user: Optional[Dict[str, Any]] = None
     ) -> Tuple[Optional[PoReturn], List[ValidationError]]:
         """Create a PO Return"""
         errors = []
@@ -295,11 +297,22 @@ class PoReturnService:
                 supplier_id=return_data.supplier_id,
                 client_id=return_data.buyer_id,
                 warehouse_id=return_data.warehouse_id,
-                return_date=datetime.combine(return_data.po_return_date, datetime.min.time()),
+                return_date=datetime.combine(
+                    return_data.po_return_date,
+                    datetime.min.time()
+                ),
                 status="DRAFT",
                 reason_code=return_data.reason_code.value,
                 remarks=return_data.remarks,
-                created_by=created_by
+
+                # ✅ Audit fields
+                created_by=created_by,
+                created_by_username=current_user.username if current_user else None,
+                created_at=datetime.utcnow(),
+
+                updated_by=None,
+                updated_by_username=None,
+                updated_at=None,
             )
             
             db.add(po_return)
@@ -458,8 +471,51 @@ class PoReturnService:
             po_return = result.scalar_one_or_none()
             
             if po_return:
-                return PoReturnRead.from_orm(po_return)
+                po_dict = {
+                    "po_return_id": str(po_return.po_return_id),
+                    "po_return_no": po_return.po_return_no,
+                    "po_id": str(po_return.po_id),
+                    "supplier_id": po_return.supplier_id,
+                    "client_id": po_return.client_id,
+                    "warehouse_id": po_return.warehouse_id,
+                    "return_date": po_return.return_date,
+                    "status": po_return.status,
+                    "reason_code": po_return.reason_code,
+                    "remarks": po_return.remarks,
+
+                    # Audit fields
+                    "created_by": po_return.created_by,
+                    "created_by_username": po_return.created_by_username,
+                    "created_at": po_return.created_at,
+                    "updated_by": po_return.updated_by,
+                    "updated_by_username": po_return.updated_by_username,
+                    "updated_at": po_return.updated_at,
+                }
+
+                # Include items if requested
+                if include_items and po_return.items:
+                    po_dict["items"] = [
+                        {
+                            "po_return_item_id": str(item.po_return_item_id),
+                            "po_item_id": str(item.po_item_id),
+                            "catalogue_id": str(item.catalogue_id),
+                            "batch_no": item.batch_no,
+                            "expiry_date": item.expiry_date,
+                            "return_qty": float(item.return_qty),
+                            "uom": item.uom,
+                            "cost_price": float(item.cost_price),
+                            "return_value": float(item.return_value) if item.return_value else 0,
+                            "created_at": item.created_at,
+                        }
+                        for item in po_return.items
+                    ]
+
+                formatted = format_meta_field(po_dict)
+
+                return formatted
+
             return None
+
             
         except Exception as e:
             logger.error(f"Error getting PO return {po_return_id}: {e}")
@@ -470,7 +526,8 @@ class PoReturnService:
         db: AsyncSession,
         po_return_id: UUID,
         action_request: PoReturnActionRequest,
-        performed_by: str
+        performed_by: str,
+        current_user: Optional[Dict[str, Any]] = None
     ) -> Tuple[Optional[PoReturn], List[ValidationError]]:
         """Handle all PO return actions in a single method"""
         errors = []
@@ -537,6 +594,8 @@ class PoReturnService:
                     po_return.remarks = action_request.remarks
                     
                 po_return.updated_at = datetime.utcnow()
+                po_return.updated_by = performed_by
+                po_return.updated_by_username = current_user.username if current_user else None
                 
             elif action == "complete":
                 # Complete action (from separate method)
@@ -656,8 +715,53 @@ class PoReturnService:
             # Execute query
             result = await db.execute(query)
             po_returns = result.scalars().all()
-            
-            return [PoReturnRead.from_orm(ret) for ret in po_returns]
+
+            response_list = []
+
+            for ret in po_returns:
+                po_dict = {
+                    "po_return_id": str(ret.po_return_id),
+                    "po_return_no": ret.po_return_no,
+                    "po_id": str(ret.po_id),
+                    "supplier_id": ret.supplier_id,
+                    "client_id": ret.client_id,
+                    "warehouse_id": ret.warehouse_id,
+                    "return_date": ret.return_date,
+                    "status": ret.status,
+                    "reason_code": ret.reason_code,
+                    "remarks": ret.remarks,
+
+                    # Audit fields
+                    "created_by": ret.created_by,
+                    "created_by_username": ret.created_by_username,
+                    "created_at": ret.created_at,
+                    "updated_by": ret.updated_by,
+                    "updated_by_username": ret.updated_by_username,
+                    "updated_at": ret.updated_at,
+                }
+
+                # Include items (already eager loaded)
+                if ret.items:
+                    po_dict["items"] = [
+                        {
+                            "po_return_item_id": str(item.po_return_item_id),
+                            "po_item_id": str(item.po_item_id),
+                            "catalogue_id": str(item.catalogue_id),
+                            "batch_no": item.batch_no,
+                            "expiry_date": item.expiry_date,
+                            "return_qty": float(item.return_qty),
+                            "uom": item.uom,
+                            "cost_price": float(item.cost_price),
+                            "return_value": float(item.return_value) if item.return_value else 0,
+                            "created_at": item.created_at,
+                        }
+                        for item in ret.items
+                    ]
+
+                formatted = format_meta_field(po_dict)
+                response_list.append(formatted)
+
+            return response_list
                 
         except Exception as e:
             logger.error(f"Error listing PO returns: {e}")

app/purchases/orders/controllers/router.py

@@ -1,3 +1,4 @@
+import datetime
 import time
 from typing import Any, Dict
 from fastapi import APIRouter, Depends, HTTPException, Path
@@ -64,6 +65,7 @@ async def create_po(
         po_data['buyer_id'] = current_user.merchant_id
         po_data['buyer_type'] = current_user.merchant_type
         po_data['created_by'] = current_user.user_id
+        po_data['created_by_username'] = current_user.username
         
         # Create new POCreate instance with JWT data
         updated_payload = POCreate(**po_data)
@@ -302,6 +304,9 @@ async def update_po(
             
             # Convert po_data to POUpdate model
             from app.purchases.orders.schemas.schema import POUpdate
+            po.updated_by = current_user.user_id
+            po.updated_by_username = current_user.username
+            po.updated_at = datetime.utcnow()
             update_data = POUpdate(**payload.po_data)
             po = await service.update_po(po_id, update_data, merchant_id=current_user.merchant_id)
             message = f"Purchase Order {po['po_no']} updated successfully"

app/purchases/orders/models/model.py

@@ -44,7 +44,13 @@ class ScmPo(Base):
     created_by = Column(String(64), nullable=False)
     created_at = Column(TIMESTAMP(timezone=True), nullable=False, default=datetime.utcnow)
     updated_at = Column(TIMESTAMP(timezone=True), nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)
-    
+        # Audit fields
+    created_by = Column(String(64), nullable=False)
+    created_by_username = Column(String(100), nullable=True)
+
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(100), nullable=True)
+
     # Relationships
     items = relationship("ScmPoItem", back_populates="purchase_order", cascade="all, delete-orphan")
     status_logs = relationship("ScmPoStatusLog", back_populates="purchase_order", cascade="all, delete-orphan")

app/purchases/orders/schemas/schema.py

@@ -58,12 +58,16 @@ class POCreate(BaseModel):
 
     # created_by will be extracted from JWT token
     created_by: Optional[str] = Field(None, description="User who created the PO (extracted from JWT)")
+    created_by_username: Optional[str] = Field(None, description="Username of the user who created the PO (extracted from JWT)")
 
 
 class POUpdate(BaseModel):
     exp_delivery_dt: Optional[date] = Field(None, description="Updated expected delivery date")
     remarks: Optional[str] = Field(None, description="Updated remarks")
     items: Optional[List[POItemUpdate]] = Field(None, description="Updated items")
+    updated_by: Optional[str] = Field(None, description="User who updated the PO (extracted from JWT)")
+    updated_by_username: Optional[str] = Field(None, description="Username of the user who updated the PO (extracted from JWT)")
+    updated_at: Optional[datetime] = Field(None, description="Timestamp of when the PO was updated (set to current time)")
 
 
 class POItemRead(BaseModel):
@@ -124,9 +128,7 @@ class PORead(BaseModel):
     net_amt: Decimal
     status: str
     remarks: Optional[str]
-    created_by: str
-    created_at: datetime
-    updated_at: datetime
+    meta: Optional[Dict[str, Any]] = Field(None, description="HATEOAS links for related resources and actions")
     items: Optional[List[POItemRead]] = None
     status_logs: Optional[List[POStatusLogRead]] = None
 

app/purchases/orders/services/service.py

@@ -7,6 +7,7 @@ from decimal import Decimal
 from datetime import datetime
 import logging
 
+from app.core.utils import format_meta_field
 from app.purchases.orders.models.model import ScmPo, ScmPoItem, ScmPoStatusLog
 from app.purchases.orders.schemas.schema import POCreate, POUpdate, POStatusChange
 from app.purchases.utils import get_next_po_number, initialize_sequences
@@ -77,6 +78,7 @@ class OrdersService:
             status="draft",
             remarks=po_in.remarks,
             created_by=po_in.created_by,
+            created_by_username=po_in.created_by_username,
             total_amt=Decimal(0),  # Will be updated after items
             tax_amt=tax_amt,
             net_amt=Decimal(0)  # Will be updated after items
@@ -151,7 +153,7 @@ class OrdersService:
                 SELECT 
                     p.po_id, p.po_no, p.buyer_id, p.buyer_type, p.supplier_id, p.supplier_type,
                     p.po_date, p.exp_delivery_dt, p.currency, p.total_amt, p.tax_amt, p.net_amt,
-                    p.status, p.remarks, p.created_by, p.created_at, p.updated_at,
+                    p.status, p.remarks, p.created_by, p.created_by_username, p.created_at, p.updated_by, p.updated_by_username, p.updated_at,
                     buyer_ref.merchant_name as buyer_name,
                     supplier_ref.merchant_name as supplier_name
                 FROM trans.scm_po p
@@ -193,8 +195,13 @@ class OrdersService:
             "net_amt": float(po_row.net_amt) if po_row.net_amt else 0,
             "status": po_row.status,
             "remarks": po_row.remarks,
+
+            # Audit fields
             "created_by": po_row.created_by,
+            "created_by_username": getattr(po_row, "created_by_username", None),
             "created_at": po_row.created_at,
+            "updated_by": getattr(po_row, "updated_by", None),
+            "updated_by_username": getattr(po_row, "updated_by_username", None),
             "updated_at": po_row.updated_at
         }
         
@@ -276,8 +283,8 @@ class OrdersService:
                 }
                 for log in logs
             ]
-        
-        return po_dict
+        formatted = format_meta_field(po_dict)
+        return formatted
 
     async def list_pos(
         self,
@@ -297,7 +304,7 @@ class OrdersService:
             SELECT 
                 p.po_id, p.po_no, p.buyer_id, p.buyer_type, p.supplier_id, p.supplier_type,
                 p.po_date, p.exp_delivery_dt, p.currency, p.total_amt, p.tax_amt, p.net_amt,
-                p.status, p.remarks, p.created_by, p.created_at, p.updated_at,
+                p.status, p.remarks, p.created_by, p.created_at, p.updated_at,p.updated_by, p.updated_by_username,p.created_by_username,
                 buyer_ref.merchant_name as buyer_name,
                 supplier_ref.merchant_name as supplier_name,
                 EXISTS(SELECT 1 FROM trans.scm_grn g WHERE g.po_id = p.po_id) as has_grn
@@ -415,18 +422,24 @@ class OrdersService:
                 "net_amt": float(row.net_amt) if row.net_amt else 0,
                 "status": row.status,
                 "remarks": row.remarks,
+                # Audit fields (DO NOT isoformat here)
                 "created_by": row.created_by,
+                "created_by_username": getattr(row, "created_by_username", None),
+                "created_at": row.created_at,
+                "updated_by": getattr(row, "updated_by", None),
+                "updated_by_username": getattr(row, "updated_by_username", None),
+                "updated_at": row.updated_at,
                 "created_at": row.created_at.isoformat() if row.created_at else None,
                 "updated_at": row.updated_at.isoformat() if row.updated_at else None,
                 "has_grn": row.has_grn
             }
-            
+            formatted = format_meta_field(po_dict)
             # Apply projection if specified
             if projection_list:
                 projected_dict = {}
                 for field in projection_list:
-                    if field in po_dict:
-                        projected_dict[field] = po_dict[field]
+                    if field in formatted:
+                        projected_dict[field] = formatted[field]
                 # Always include essential fields
                 essential_fields = ["po_id", "po_no"]
                 for field in essential_fields:
@@ -434,7 +447,7 @@ class OrdersService:
                         projected_dict[field] = po_dict[field]
                 po_dicts.append(projected_dict)
             else:
-                po_dicts.append(po_dict)
+                po_dicts.append(formatted)
         
         return po_dicts, total_count
 

app/purchases/receipts/controllers/router.py

@@ -43,16 +43,16 @@ async def create_grn(
         # Auto-set merchant context from JWT
         payload.receiver_id = current_user.merchant_id
         payload.created_by = current_user.user_id
-        
+        payload.created_by_username = current_user.username  # Optional: include username for better audit trails   
         service = ReceiptsService(db)
         grn = await service.create_grn(payload)
         
         logger.info(
             "GRN created successfully",
             extra={
-                "grn_id": str(grn.grn_id),
-                "grn_no": grn.grn_no,
-                "po_id": str(grn.po_id),
+                "grn_id": str(grn["grn_id"]),  # Changed from grn.grn_id to grn["grn_id"]
+                "grn_no": grn["grn_no"],        # Changed from grn.grn_no to grn["grn_no"]
+                "po_id": str(grn["po_id"]) if grn.get("po_id") else None,  # Changed from grn.po_id to grn["po_id"]
                 "created_by": current_user.user_id,
                 "duration": time.time() - start_time
             }
@@ -68,7 +68,7 @@ async def create_grn(
         raise HTTPException(status_code=500, detail="Internal server error")
 
 
-@router.get("/{grn_id}", response_model=GRNRead)
+@router.get("/{grn_id}")
 async def get_grn(
     grn_id: str = Path(..., description="GRN ID"),
     current_user: TokenUser = Depends(get_current_user),

app/purchases/receipts/models/model.py

@@ -41,8 +41,11 @@ class ScmGrn(Base):
     remarks = Column(Text)
     
     # Audit
-    created_by = Column(String(64))
-    created_at = Column(TIMESTAMP(timezone=True), default=datetime.utcnow)
+    created_by = Column(String(64), nullable=False)
+    created_by_username = Column(String(100), nullable=True)
+    created_at = Column(TIMESTAMP(timezone=True), nullable=False, default=datetime.utcnow)
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(100), nullable=True)
     
     # Relationships
     purchase_order = relationship("ScmPo", back_populates="grns")

app/purchases/receipts/schemas/schema.py

@@ -58,7 +58,7 @@ class GRNCreate(BaseModel):
     shipment_id : str = Field(..., description="shipment identifier")
     received_by : str = Field(..., description="Person who received the goods")
     transporter : str = Field(..., description="Transporter details")
-
+    created_by_username: Optional[str] = Field(None, description="Username of the creator (auto-filled from JWT)")
 class GRNItemRead(BaseModel):
     grn_item_id: UUID
     grn_id: UUID
@@ -109,6 +109,7 @@ class GRNRead(BaseModel):
     received_by : Optional[str]
     transporter : Optional[str]
     items: Optional[List[GRNItemRead]] = None
+    meta: Optional[Dict[str, Any]] = None  # For any additional dynamic fields
 
     class Config:
         from_attributes = True

app/purchases/receipts/services/service.py

@@ -7,6 +7,7 @@ from decimal import Decimal
 from datetime import datetime
 import logging
 
+from app.core.utils import format_meta_field
 from app.purchases.receipts.models.model import ScmGrn, ScmGrnItem, ScmGrnIssue
 from app.purchases.orders.models.model import ScmPo, ScmPoItem
 from app.purchases.receipts.schemas.schema import GRNCreate, GRNStatusChange, GRNIssueRequest
@@ -34,7 +35,7 @@ class ReceiptsService:
         # TODO: wire taxonomy conversion once available
         return qty, uom
 
-    async def create_grn(self, grn_in: GRNCreate) -> ScmGrn:
+    async def create_grn(self, grn_in: GRNCreate):
         """Create a new Goods Receipt Note"""
         
         po = None
@@ -113,7 +114,8 @@ class ReceiptsService:
             created_by=grn_in.created_by,
             shipment_id=grn_in.shipment_id,
             received_by=grn_in.received_by,
-            transporter=grn_in.transporter
+            transporter=grn_in.transporter,
+            created_by_username=grn_in.created_by_username,
         )
         self.db.add(grn)
 
@@ -175,15 +177,68 @@ class ReceiptsService:
         logger.info(f"Created GRN {grn.grn_no} for PO {po.po_no} with {len(grn_in.items)} items")
         return grn_with_relations
 
-    async def get_grn(self, grn_id: str, include_items: bool = True) -> Optional[ScmGrn]:
-        """Get GRN by ID with optional items"""
-        query = select(ScmGrn).where(ScmGrn.grn_id == grn_id)
+    async def get_grn(
+        self,
+        grn_identifier: str,
+        include_items: bool = True
+    ) -> Optional[Dict[str, Any]]:
+        """
+        Get GRN by ID (UUID) or GRN number with optional items and formatted meta fields
+        
+        Args:
+            grn_identifier: Either a UUID string or GRN number (e.g., 'GRN-2026-000084')
+            include_items: Whether to include GRN items
+        """
         
+        # Determine if identifier is UUID or GRN number
+        try:
+            # Try to parse as UUID
+            from uuid import UUID
+            UUID(grn_identifier)
+            # If successful, query by grn_id
+            query = select(ScmGrn).where(ScmGrn.grn_id == grn_identifier)
+        except (ValueError, AttributeError):
+            # Not a valid UUID, treat as GRN number
+            query = select(ScmGrn).where(ScmGrn.grn_no == grn_identifier)
+
         if include_items:
             query = query.options(selectinload(ScmGrn.items))
-            
+
         result = await self.db.execute(query)
-        return result.scalar_one_or_none()
+        grn_obj = result.scalar_one_or_none()
+
+        if not grn_obj:
+            return None
+
+        # Convert ORM to dict safely
+        grn_dict = grn_obj.__dict__.copy()
+
+        # Remove SQLAlchemy internal state
+        grn_dict.pop("_sa_instance_state", None)
+
+        # If items exist, convert them too
+        if include_items and grn_obj.items:
+            grn_dict["items"] = [
+                {
+                    **item.__dict__,
+                    "_sa_instance_state": None
+                }
+                for item in grn_obj.items
+            ]
+            for item in grn_dict["items"]:
+                item.pop("_sa_instance_state", None)
+
+        # Format meta field but keep created_by and created_at at root level
+        formatted_data = format_meta_field(grn_dict)
+        
+        # Extract created_by and created_at from meta back to root level for schema compatibility
+        if "meta" in formatted_data:
+            if "created_by" in formatted_data["meta"]:
+                formatted_data["created_by"] = formatted_data["meta"]["created_by"]
+            if "created_at" in formatted_data["meta"]:
+                formatted_data["created_at"] = formatted_data["meta"]["created_at"]
+
+        return formatted_data
 
     async def list_grns(
         self,
@@ -213,7 +268,13 @@ class ReceiptsService:
                 g.status,
                 g.total_qty,
                 g.remarks,
-                COALESCE(emp.full_name, g.created_by) AS received_by_name
+                COALESCE(emp.full_name, g.created_by) AS received_by_name,
+                g.created_by,
+                g.created_by_username,
+                g.created_at,
+                g.updated_by,
+                g.updated_by_username,
+                g.updated_at
             FROM trans.scm_grn g
             LEFT JOIN trans.scm_po po ON g.po_id = po.po_id
             LEFT JOIN trans.merchants_ref sup ON g.supplier_id = sup.merchant_id
@@ -306,12 +367,14 @@ class ReceiptsService:
 
         # Full response
         full_list: List[Dict[str, Any]] = []
+
         for row in rows:
-            full_list.append({
-                
+            grn_dict = {
+                "grn_id": str(row.grn_id),
                 "grn_no": row.grn_no,
+                "po_id": str(row.po_id) if row.po_id else None,
                 "po_no": row.po_no,
-                "receiver_code": row.receiver_code, 
+                "receiver_code": row.receiver_code,
                 "supplier_code": row.supplier_code,
                 "supplier_name": row.supplier_name,
                 "warehouse_name": row.warehouse_name,
@@ -320,8 +383,13 @@ class ReceiptsService:
                 "total_qty": _serialize(row.total_qty),
                 "remarks": row.remarks,
                 "received_by_name": row.received_by_name,
-                
-            })
+            }
+
+            # 🔥 Apply meta formatting here
+            formatted = format_meta_field(grn_dict)
+
+            full_list.append(formatted)
+
         return full_list, total_count
 
     async def _change_status(
@@ -333,8 +401,20 @@ class ReceiptsService:
     ) -> ScmGrn:
         """Change GRN status with validation"""
         
-        # Get current GRN
-        grn = await self.get_grn(grn_id, include_items=False)
+        # Get current GRN as ORM object for updating
+        # Determine if identifier is UUID or GRN number
+        try:
+            from uuid import UUID
+            UUID(grn_id)
+            # If successful, query by grn_id
+            query = select(ScmGrn).where(ScmGrn.grn_id == grn_id)
+        except (ValueError, AttributeError):
+            # Not a valid UUID, treat as GRN number
+            query = select(ScmGrn).where(ScmGrn.grn_no == grn_id)
+        
+        result = await self.db.execute(query)
+        grn = result.scalar_one_or_none()
+        
         if not grn:
             raise ValueError("GRN not found")
 
@@ -362,12 +442,15 @@ class ReceiptsService:
     async def accept_grn(self, grn_id: str, status_change: GRNStatusChange) -> ScmGrn:
         """Accept GRN - goods are accepted into inventory and update PO status"""
         # First, get the GRN with items to check PO relationship
-        grn = await self.get_grn(grn_id, include_items=True)
-        if not grn:
+        grn_dict = await self.get_grn(grn_id, include_items=True)
+        if not grn_dict:
             raise ValueError("GRN not found")
         
-        # Change GRN status to accepted
-        grn = await self._change_status(
+        # Extract the actual UUID for database operations
+        actual_grn_uuid = str(grn_dict["grn_id"])
+        
+        # Change GRN status to accepted (returns ORM object)
+        grn_orm = await self._change_status(
             grn_id, "accepted", status_change.changed_by, status_change.remarks
         )
         
@@ -376,26 +459,26 @@ class ReceiptsService:
             from app.inventory.stock.services.service import StockService
             stock_service = StockService(self.db)
             
-            # Process GRN completion to update stock
+            # Process GRN completion to update stock - use actual UUID
             stock_results = await stock_service.process_grn_completion(
-                grn_id=str(grn_id),
+                grn_id=actual_grn_uuid,
                 completed_by=status_change.changed_by
             )
             
-            logger.info(f"GRN {grn.grn_no} stock movements processed: {len(stock_results)} entries created")
+            logger.info(f"GRN {grn_dict['grn_no']} stock movements processed: {len(stock_results)} entries created")
             
             # Check if all stock transactions succeeded
             failed_transactions = [r for r in stock_results if not r[1]]
             if failed_transactions:
-                logger.error(f"Some stock transactions failed for GRN {grn.grn_no}: {failed_transactions}")
+                logger.error(f"Some stock transactions failed for GRN {grn_dict['grn_no']}: {failed_transactions}")
                 # Continue with PO processing even if stock fails (can be retried)
             
         except Exception as e:
-            logger.error(f"Error processing stock movements for GRN {grn.grn_no}: {e}", exc_info=True)
+            logger.error(f"Error processing stock movements for GRN {grn_dict['grn_no']}: {e}", exc_info=True)
             # Don't fail the GRN acceptance if stock processing fails (can be retried)
         
         # If GRN is linked to a PO, update PO received quantities and check for auto-close
-        if grn.po_id:
+        if grn_dict.get("po_id"):
             try:
                 # Import here to avoid circular imports
                 from app.purchases.orders.services.service import OrdersService
@@ -403,14 +486,14 @@ class ReceiptsService:
                 
                 # Prepare GRN items data for PO update
                 grn_items_data = []
-                for item in grn.items:
-                    if item.po_item_id:  # Only process items linked to PO
+                for item in grn_dict.get("items", []):
+                    if item.get("po_item_id"):  # Only process items linked to PO
                         grn_items_data.append({
-                            'po_item_id': item.po_item_id,
-                            'acc_qty': item.acc_qty,
-                            'acc_ord_uom_qty': item.ord_uom_qty or item.acc_qty,
-                            'acc_ord_uom': item.ord_uom or item.uom,
-                            'sku': item.sku
+                            'po_item_id': item["po_item_id"],
+                            'acc_qty': item["acc_qty"],
+                            'acc_ord_uom_qty': item.get("ord_uom_qty") or item["acc_qty"],
+                            'acc_ord_uom': item.get("ord_uom") or item["uom"],
+                            'sku': item["sku"]
                         })
                 
                 if grn_items_data:
@@ -418,29 +501,29 @@ class ReceiptsService:
                     update_success = await po_service.update_po_received_quantities(grn_items_data)
                     
                     if update_success:
-                        logger.info(f"Updated PO received quantities for GRN {grn.grn_no}")
+                        logger.info(f"Updated PO received quantities for GRN {grn_dict['grn_no']}")
                         
                         # Check if PO should be auto-closed
                         closed_po = await po_service.check_and_auto_close_po(
-                            str(grn.po_id), 
+                            str(grn_dict["po_id"]), 
                             status_change.changed_by
                         )
                         
                         if closed_po:
                             logger.info(
-                                f"PO {closed_po.po_no} auto-closed after accepting GRN {grn.grn_no}"
+                                f"PO {closed_po.po_no} auto-closed after accepting GRN {grn_dict['grn_no']}"
                             )
                         else:
-                            logger.debug(f"PO not ready for auto-close after GRN {grn.grn_no}")
+                            logger.debug(f"PO not ready for auto-close after GRN {grn_dict['grn_no']}")
                     else:
-                        logger.warning(f"Failed to update PO quantities for GRN {grn.grn_no}")
+                        logger.warning(f"Failed to update PO quantities for GRN {grn_dict['grn_no']}")
                         
             except Exception as e:
-                logger.error(f"Error in PO auto-close process for GRN {grn.grn_no}: {e}", exc_info=True)
+                logger.error(f"Error in PO auto-close process for GRN {grn_dict['grn_no']}: {e}", exc_info=True)
                 # Don't fail the GRN acceptance if PO update fails
         
-        logger.info(f"GRN {grn.grn_no} accepted and stock movements processed successfully")
-        return grn
+        logger.info(f"GRN {grn_dict['grn_no']} accepted and stock movements processed successfully")
+        return grn_orm
 
     async def reject_grn(self, grn_id: str, status_change: GRNStatusChange) -> ScmGrn:
         """Reject GRN - goods are not accepted"""

app/system_users/schemas/schema.py

@@ -1,6 +1,7 @@
 """System User schemas for request/response models."""
 from datetime import datetime
 from typing import Optional, List, Dict
+from uuid import UUID
 from pydantic import BaseModel, Field, EmailStr, validator
 from app.system_users.models.model import UserStatus
 
@@ -52,9 +53,9 @@ class CreateUserRequest(BaseModel):
 
     username: str = Field(..., description="Unique username", min_length=3, max_length=50)
     email: EmailStr = Field(..., description="Email address")
-    merchant_id: str = Field(..., description="Merchant identifier")
+    merchant_id: UUID = Field(..., description="Merchant identifier")
     merchant_type: Optional[str] = Field(None, description="Merchant type (ncnf, cnf, distributor, retail, company)")
-    password: str = Field(..., description="Password", min_length=8, max_length=100)
+    password: str = Field(..., description="Password", min_length=6, max_length=100)
     full_name: str = Field(..., description="Full name", min_length=1, max_length=100)
     role_id: str = Field(..., description="Role identifier")
     status: UserStatus = Field(default=UserStatus.ACTIVE, description="Account status")
@@ -66,17 +67,17 @@ class CreateUserRequest(BaseModel):
             raise ValueError("Username can only contain alphanumeric characters, underscores, and periods")
         return v.lower()
 
-    @validator("password")
-    def validate_password(cls, v):
-        if len(v) < 8:
-            raise ValueError("Password must be at least 8 characters long")
-        if not any(c.isupper() for c in v):
-            raise ValueError("Password must contain at least one uppercase letter")
-        if not any(c.islower() for c in v):
-            raise ValueError("Password must contain at least one lowercase letter")
-        if not any(c.isdigit() for c in v):
-            raise ValueError("Password must contain at least one digit")
-        return v
+    # @validator("password")
+    # def validate_password(cls, v):
+    #     if len(v) < 6:
+    #         raise ValueError("Password must be at least 6 characters long")
+    #     if not any(c.isupper() for c in v):
+    #         raise ValueError("Password must contain at least one uppercase letter")
+    #     if not any(c.islower() for c in v):
+    #         raise ValueError("Password must contain at least one lowercase letter")
+    #     if not any(c.isdigit() for c in v):
+    #         raise ValueError("Password must contain at least one digit")
+    #     return v
 
 
 class UpdateUserRequest(BaseModel):

app/system_users/services/service.py

@@ -144,13 +144,13 @@ class SystemUserService:
             password_hash = self.get_password_hash(user_data.password)
 
             user_model = SystemUserModel(
-                user_id=user_id,
+                user_id=str(user_id),
                 username=user_data.username.lower(),
                 email=user_data.email.lower(),
                 password_hash=password_hash,
                 full_name=user_data.full_name,
                 role_id=user_data.role_id,
-                merchant_id=user_data.merchant_id,
+                merchant_id=str(user_data.merchant_id),
                 merchant_type=user_data.merchant_type,
                 status=UserStatus.ACTIVE,  # Set as active by default
                 last_login=None,

app/trade_invoices/controllers/router.py

@@ -50,11 +50,13 @@ async def create_invoice(
     """
     try:
         created_by = current_user.user_id
+        created_by_username = current_user.username
         
         invoice, errors = await TradeInvoiceService.create_draft_invoice(
             db=db,
             invoice_data=invoice_data,
-            created_by=created_by
+            created_by=created_by,
+            created_by_username=created_by_username
         )
         
         if errors:
@@ -165,12 +167,14 @@ async def edit_invoice(
     """
     try:
         updated_by = current_user.user_id
+        updated_by_username = current_user.username
         
         invoice, errors = await TradeInvoiceService.edit_draft_invoice(
             db=db,
             invoice_id=invoice_id,
             invoice_data=invoice_data,
-            updated_by=updated_by
+            updated_by=updated_by,
+            updated_by_username=updated_by_username
         )
         
         if errors:
@@ -226,12 +230,14 @@ async def update_invoice_status(
     """
     try:
         performed_by = current_user.user_id
+        performed_by_username = current_user.username
         
         invoice, errors = await TradeInvoiceService.update_invoice_status(
             db=db,
             invoice_id=invoice_id,
             action_request=action_request,
-            performed_by=performed_by
+            performed_by=performed_by,
+            performed_by_username=performed_by_username
         )
         
         if errors:

app/trade_invoices/models/model.py

@@ -99,8 +99,11 @@ class ScmInvoice(Base):
     
     # Audit fields
     created_by = Column(String(64), nullable=True)
+    created_by_username = Column(String(128), nullable=True)
     created_at = Column(DateTime(timezone=True), nullable=False, server_default=func.now())
     updated_at = Column(DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now())
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(128), nullable=True)
     
     # Relationships
     items = relationship("ScmInvoiceItem", back_populates="invoice", cascade="all, delete-orphan")

app/trade_invoices/services/service.py

@@ -13,6 +13,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, and_, func, text
 from sqlalchemy.orm import selectinload
 
+from app.core.utils import format_meta_field
 from app.trade_invoices.models.model import ScmInvoice, ScmInvoiceItem, ScmInvoiceStatusLog
 from app.trade_invoices.schemas.schema import (
     GSTModel, InvoiceCreate,  InvoiceActionRequest,  InvoiceValidationError, POItemModel, POShipmentSummary, POSummaryModel, PricingModel, PurchaseOrderResponseModel, QuantityModel
@@ -39,7 +40,8 @@ class TradeInvoiceService:
     async def create_draft_invoice(
         db: AsyncSession,
         invoice_data: InvoiceCreate,
-        created_by: str
+        created_by: str,
+        created_by_username:str
     ) -> Tuple[ScmInvoice, List[InvoiceValidationError]]:
         """
         Create draft invoice (PO-driven, no GRN)
@@ -130,7 +132,9 @@ class TradeInvoiceService:
             round_off_amt=invoice_data.additional_charges.round_off or 0,
 
             remarks=invoice_data.remarks,
-            created_by=created_by
+            created_by=created_by,
+            created_by_username=created_by_username,
+            created_at=dt.datetime.utcnow()
         )
 
         db.add(invoice)
@@ -306,7 +310,8 @@ class TradeInvoiceService:
         db: AsyncSession,
         invoice_id: UUID,
         action_request: InvoiceActionRequest,
-        performed_by: str
+        performed_by: str,
+        performed_by_username:str
     ) -> Tuple[ScmInvoice, List[InvoiceValidationError]]:
         """
         Update invoice status following state machine rules
@@ -350,6 +355,8 @@ class TradeInvoiceService:
         # Update invoice
         invoice.status = new_status
         invoice.updated_at = dt.datetime.utcnow()
+        invoice.updated_by = performed_by
+        invoice.updated_by_username = performed_by_username
         
         # Create status log
         status_log = ScmInvoiceStatusLog(
@@ -460,7 +467,7 @@ class TradeInvoiceService:
                 dict(row) for row in logs_result.mappings().all()
             ]
 
-        return response
+        return format_meta_field(response)
 
     @staticmethod
     async def list_invoices(
@@ -523,7 +530,10 @@ class TradeInvoiceService:
             
             query = text(query_str)
             result = await db.execute(query, params)
-            return [dict(row._mapping) for row in result.fetchall()]
+            return [
+                format_meta_field(dict(row._mapping))
+                for row in result.fetchall()
+            ]
         
         else:
 
@@ -545,7 +555,12 @@ class TradeInvoiceService:
                     i.total_tax_amt,
                     i.grand_total_amt,
                     i.status,
-                    i.created_at
+                    i.created_at,
+                    i.updated_at,
+                    i.created_by,
+                    i.created_by_username,
+                    i.updated_by,
+                    i.updated_by_username
                 FROM trans.scm_invoice i
                 JOIN trans.scm_po po
                     ON po.po_id = i.po_id
@@ -585,7 +600,10 @@ class TradeInvoiceService:
             result = await db.execute(text(sql), params)
             rows = result.mappings().all()
 
-            return [dict(row) for row in rows]
+            return [
+                format_meta_field(dict(row))
+                for row in rows
+            ]
 
     @staticmethod
     async def get_invoice_summary(
@@ -685,7 +703,7 @@ class TradeInvoiceService:
             )
     
     @staticmethod
-    async def edit_draft_invoice(db: AsyncSession, invoice_id: str, invoice_data: dict, updated_by: str):
+    async def edit_draft_invoice(db: AsyncSession, invoice_id: str, invoice_data: dict, updated_by: str, updated_by_username:str):
         EDITABLE_FIELDS = {
             "po_id": lambda v: UUID(v),
             "grn_id": lambda v: UUID(v),
@@ -699,6 +717,8 @@ class TradeInvoiceService:
             "packing_amt": lambda v: v,
             "other_charges_amt": lambda v: v,
             "round_off_amt": lambda v: v,
+            "updated_by": lambda v: v,
+            "updated_by_username": lambda v: v
         }
         result = await db.execute(
             select(ScmInvoice).where(ScmInvoice.invoice_id == invoice_id)
@@ -727,6 +747,8 @@ class TradeInvoiceService:
                 setattr(invoice, field, transformer(invoice_data[field]))
 
         invoice.updated_at = dt.datetime.utcnow()
+        invoice.updated_by = updated_by
+        invoice.updated_by_username = updated_by_username
 
         await db.commit()
         await db.refresh(invoice)

app/trade_invoices/utils.py

@@ -164,7 +164,7 @@ ALLOWED_INVOICE_PROJECTION_FIELDS = [
     "currency", "invoice_date", "payment_terms", "due_date", 
     "subtotal_amt", "discount_amt", "taxable_amt", "cgst_amt", "sgst_amt", "igst_amt",
     "total_tax_amt", "grand_total_amt", "status", "reverse_charge", "remarks",
-    "created_by", "created_at", "updated_at"
+    "created_by", "created_at", "updated_at", "created_by_username", "updated_by_username"
 ]
 
 

app/trade_relationships/controllers/router.py

@@ -85,10 +85,11 @@ async def create_trade_relationship(
     """
     try:
         user_id = getattr(current_user, 'user_id', str(current_user.id) if hasattr(current_user, 'id') else 'unknown')
-        
+        user_name = getattr(current_user, 'username', 'unknown')
         relationship = await TradeRelationshipService.create_relationship(
             data=payload,
-            created_by=user_id
+            created_by=user_id,
+            created_by_username=user_name
         )
         
         logger.info(

app/trade_relationships/models/model.py

@@ -2,7 +2,7 @@
 PostgreSQL models for SCM Trade Relationships.
 Defines the authoritative trade relationship between merchants in the supply chain.
 """
-from sqlalchemy import Column, String, Numeric, Text, TIMESTAMP, Date, Boolean, CheckConstraint, Index
+from sqlalchemy import Column, String, Numeric, Text, TIMESTAMP, Date, Boolean, CheckConstraint, Index, func
 from sqlalchemy.dialects.postgresql import UUID, ARRAY
 from datetime import datetime, date
 import uuid
@@ -174,6 +174,9 @@ class ScmTradeRelationship(Base):
         onupdate=datetime.utcnow,
         comment="Timestamp when relationship was last updated"
     )
+    created_by_username = Column(String(128), nullable=True)
+    updated_by = Column(String(64), nullable=True)
+    updated_by_username = Column(String(128), nullable=True)
     
     def __repr__(self):
         return f"<ScmTradeRelationship(id={self.relationship_id}, from={self.from_merchant_id}, to={self.to_merchant_id}, status={self.status})>"

app/trade_relationships/schemas/schema.py

@@ -208,10 +208,7 @@ class TradeRelationshipResponse(BaseModel):
     allowed_regions: Optional[List[str]] = Field(None, description="Allowed regions")
     allowed_categories: Optional[List[str]] = Field(None, description="Allowed categories")
     remarks: Optional[str] = Field(None, description="Additional notes")
-    created_by: str = Field(..., description="Created by user")
-    created_at: datetime = Field(..., description="Creation timestamp")
-    updated_at: datetime = Field(..., description="Last update timestamp")
-    
+    meta: Optional[Dict[str, Any]] = Field(None, description="Additional metadata")
     # Computed fields
     is_valid: bool = Field(..., description="Whether relationship is currently valid")
     

app/trade_relationships/services/service.py

@@ -12,6 +12,7 @@ from sqlalchemy import select, and_, or_, text, func, delete
 from sqlalchemy.orm import selectinload, aliased
 from fastapi import HTTPException, status
 
+from app.core.utils import format_meta_field
 from app.sql import async_session
 from app.core.logging import get_logger
 from app.trade_relationships.models.model import ScmTradeRelationship
@@ -52,7 +53,8 @@ class TradeRelationshipService:
     @staticmethod
     async def create_relationship(
         data: TradeRelationshipCreate, 
-        created_by: str
+        created_by: str,
+        created_by_username: str
     ) -> TradeRelationshipResponse:
         """
         Create a new trade relationship.
@@ -108,6 +110,8 @@ class TradeRelationshipService:
                     valid_to=data.valid_to,
                     remarks=data.remarks,
                     created_by=created_by,
+                    created_by_username=created_by_username,
+                    created_at=datetime.utcnow(),
                     status=RelationshipStatus.DRAFT.value
                 )
                 
@@ -772,28 +776,35 @@ class TradeRelationshipService:
             to_merchant_code = to_details.get("code")
             to_merchant_name = to_details.get("name")
         
-        return TradeRelationshipResponse(
-            relationship_id=relationship.relationship_id,
-            from_merchant_id=relationship.from_merchant_id,
-            from_merchant_code=from_merchant_code,
-            from_merchant_name=from_merchant_name,
-            to_merchant_id=relationship.to_merchant_id,
-            to_merchant_code=to_merchant_code,
-            to_merchant_name=to_merchant_name,
-            relationship_type=RelationshipType(relationship.relationship_type),
-            status=RelationshipStatus(relationship.status),
-            valid_from=relationship.valid_from,
-            valid_to=relationship.valid_to,
-            pricing_level=PricingLevel(relationship.pricing_level),
-            payment_terms=PaymentTerms(relationship.payment_terms),
-            credit_allowed=relationship.credit_allowed,
-            credit_limit=relationship.credit_limit,
-            currency=relationship.currency,
-            allowed_regions=relationship.allowed_regions,
-            allowed_categories=relationship.allowed_categories,
-            remarks=relationship.remarks,
-            created_by=relationship.created_by,
-            created_at=relationship.created_at,
-            updated_at=relationship.updated_at,
-            is_valid=relationship.is_valid()
-        )
+        data = {
+            "relationship_id": relationship.relationship_id,
+            "from_merchant_id": relationship.from_merchant_id,
+            "from_merchant_code": from_merchant_code,
+            "from_merchant_name": from_merchant_name,
+            "to_merchant_id": relationship.to_merchant_id,
+            "to_merchant_code": to_merchant_code,
+            "to_merchant_name": to_merchant_name,
+            "relationship_type": RelationshipType(relationship.relationship_type),
+            "status": RelationshipStatus(relationship.status),
+            "valid_from": relationship.valid_from,
+            "valid_to": relationship.valid_to,
+            "pricing_level": PricingLevel(relationship.pricing_level),
+            "payment_terms": PaymentTerms(relationship.payment_terms),
+            "credit_allowed": relationship.credit_allowed,
+            "credit_limit": relationship.credit_limit,
+            "currency": relationship.currency,
+            "allowed_regions": relationship.allowed_regions,
+            "allowed_categories": relationship.allowed_categories,
+            "remarks": relationship.remarks,
+            "created_by": relationship.created_by,
+            "created_by_username": relationship.created_by_username,
+            "updated_by": relationship.updated_by,
+            "updated_by_username": relationship.updated_by_username,
+            "created_at": relationship.created_at,
+            "updated_at": relationship.updated_at,
+            "is_valid": relationship.is_valid()
+        }
+
+        formatted = format_meta_field(data)
+
+        return TradeRelationshipResponse(**formatted)

app/trade_returns/services/service.py

@@ -243,7 +243,8 @@ class TradeReturnService:
     async def create_draft_return(
         db: AsyncSession,
         return_data: ReturnCreate,
-        created_by: str
+        created_by: str,
+        created_by_name: Optional[str] = None   
     ) -> Tuple[Optional[TradeReturn], List[ValidationError]]:
         """Create a draft Trade Return"""
         errors = []
@@ -285,7 +286,9 @@ class TradeReturnService:
                 supplier_name=invoice_info.supplier_name,
                 reason_code=ReturnReasonCode(return_data.reason_code.value),
                 remarks=return_data.remarks,
-                created_by=created_by
+                created_by=created_by,
+                created_by_name=created_by_name,
+                created_at=datetime.utcnow()
             )
             
             db.add(trade_return)
@@ -379,7 +382,8 @@ class TradeReturnService:
         db: AsyncSession,
         return_id: UUID,
         action_request: ReturnActionRequest,
-        performed_by: str
+        performed_by: str,
+        performed_by_name: Optional[str] = None
     ) -> Tuple[Optional[TradeReturn], List[ValidationError]]:
         """Update return status following approval lifecycle (submit/approve/reject/complete)"""
         errors = []
@@ -443,6 +447,7 @@ class TradeReturnService:
                 # Execute inventory impact only on completion
                 trade_return.updated_by = performed_by
                 trade_return.updated_at = datetime.utcnow()
+                trade_return.updated_by_username = performed_by_name
                 # Mark completion timestamp
                 try:
                     # Add completed_at if present on model

app/trade_sales/schemas/schema.py

@@ -59,7 +59,7 @@ class ClientOrderSummary(BaseModel):
     shipped_qty: Decimal
     pending_qty: Decimal
     status: str  # derived: pending | partial | completed | closed
-    
+    meta: Optional[Dict[str, Any]] = None  # For any additional info like priority, tags, etc.
     class Config:
         from_attributes = True
 
@@ -92,6 +92,7 @@ class ClientOrderDetail(BaseModel):
     total_amt: Decimal
     remarks: Optional[str] = None
     items: List[ClientOrderItem]
+    meta: Optional[Dict[str, Any]] = None  # For any additional info like priority, tags, etc.
     
     class Config:
         from_attributes = True

app/trade_sales/services/service.py

@@ -11,6 +11,7 @@ from decimal import Decimal
 from datetime import datetime, date
 import logging
 
+from app.core.utils import format_meta_field
 from app.purchases.orders.models.model import ScmPo, ScmPoItem
 from app.trade_sales.models.model import ScmTradeShipment, ScmTradeShipmentItem
 from app.inventory.stock.services.service import StockService, StockTransaction, TransactionType, ReferenceType
@@ -91,7 +92,13 @@ class TradeSalesService:
                             WHEN COALESCE(SUM(tsi.shipped_qty), 0) = 0 THEN 'pending'
                             WHEN COALESCE(SUM(tsi.shipped_qty), 0) < SUM(poi.ord_qty) THEN 'partial'
                             ELSE 'completed'
-                        END AS fulfillment_status
+                        END AS fulfillment_status,
+                        po.created_by,
+                        po.created_at,
+                        po.updated_by,
+                        po.updated_at,
+                        po.created_by_username,
+                        po.updated_by_username
                     FROM trans.scm_po po
                     LEFT JOIN trans.scm_po_item poi ON po.po_id = poi.po_id
                     LEFT JOIN trans.scm_trade_shipment_item tsi ON poi.po_item_id = tsi.po_item_id
@@ -180,7 +187,8 @@ class TradeSalesService:
                     order_dict = dict(order._mapping)
                     # Map fulfillment_status to status for Pydantic model
                     order_dict["status"] = order_dict.get("fulfillment_status")
-                    orders_list.append(ClientOrderSummary(**order_dict))
+                    formatted_data = format_meta_field(order_dict)
+                    orders_list.append(ClientOrderSummary(**formatted_data))
                 return orders_list, total_count
             
         except Exception as e:
@@ -262,6 +270,17 @@ class TradeSalesService:
                 })
             
             order_dict["items"] = items
+            meta_fields = {
+                "created_by": order_dict.pop("created_by", None),
+                "created_at": order_dict.pop("created_at", None),
+                "updated_by": order_dict.pop("updated_by", None),
+                "updated_at": order_dict.pop("updated_at", None),
+                "created_by_username": order_dict.pop("created_by_username", None),
+                "updated_by_username": order_dict.pop("updated_by_username", None),
+            }
+
+            order_dict.update(format_meta_field(meta_fields))
+
             return ClientOrderDetail(**order_dict)
             
         except Exception as e: