Merge Conflicts (#41)

Co-authored-by: Sayan Datta <sayan@Sayans-MacBook-Air.local>
Reviewed-on: #41

backend/services/imports/ingest_service.py

@@ -202,6 +202,7 @@ def create_import_batch_record(
     mapping_manifest: dict[str, Any],
     source_system: str = "csv_upload",
     uploaded_by_id: str | None = None,
+    tenant_id: str | None = None,
 ) -> dict[str, Any]:
     """
     Build the workflow_import_batches record payload.
@@ -216,6 +217,7 @@ def create_import_batch_record(
         "mapped_count": mapping_manifest.get("mapped_count", 0),
         "unresolved_count": mapping_manifest.get("unmapped_count", 0),
         "uploaded_by": uploaded_by_id,
+        "tenant_id": tenant_id,
         "lifecycle": "parsed",
         "mapping_manifest": mapping_manifest,
         "created_at": now,
@@ -230,15 +232,16 @@ async def persist_import_batch(conn: Any, batch: dict[str, Any]) -> str:
     await conn.execute(
         """
         INSERT INTO workflow_import_batches (
-            batch_id, source_system, uploaded_filename, mime_type, row_count,
+            batch_id, tenant_id, source_system, uploaded_filename, mime_type, row_count,
             mapped_count, unresolved_count, uploaded_by, lifecycle, mapping_manifest,
             created_at, updated_at
         ) VALUES (
-            $1::uuid, $2, $3, $4, $5, $6, $7,
-            $8::uuid, $9::import_lifecycle, $10::jsonb, NOW(), NOW()
+            $1::uuid, $2, $3, $4, $5, $6, $7, $8,
+            $9::uuid, $10::import_lifecycle, $11::jsonb, NOW(), NOW()
         )
         """,
         batch["batch_id"],
+        batch["tenant_id"],
         batch["source_system"],
         batch.get("uploaded_filename", "unknown.csv"),
         batch.get("mime_type", "text/csv"),
@@ -253,7 +256,7 @@ async def persist_import_batch(conn: Any, batch: dict[str, Any]) -> str:
 
 
 async def persist_proposals_as_workflow_actions(
-    conn: Any, proposals: list[dict[str, Any]]
+    conn: Any, proposals: list[dict[str, Any]], tenant_id: str
 ) -> int:
     """
     Insert proposals into workflow_actions table for human review.
@@ -264,15 +267,16 @@ async def persist_proposals_as_workflow_actions(
         await conn.execute(
             """
             INSERT INTO workflow_actions (
-                action_id, action_type, target_domain, proposal_payload,
+                action_id, tenant_id, action_type, target_domain, proposal_payload,
                 reasoning_summary, confidence, status, approval_required,
                 created_by_agent, created_at, updated_at
             ) VALUES (
-                $1::uuid, 'import_proposal', 'crm', $2::jsonb,
-                $3, $4, 'pending'::wf_status, $5, 'ingest_service', NOW(), NOW()
+                $1::uuid, $2, 'import_proposal', 'crm', $3::jsonb,
+                $4, $5, 'pending'::wf_status, $6, 'ingest_service', NOW(), NOW()
             )
             """,
             p["proposal_id"],
+            tenant_id,
             json.dumps(p),
             f"Import row {p['row_number']}: {p['canonical_payload'].get('full_name', 'unknown')}",
             p["confidence"],