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

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"
 ]