Merge pull request #701 from akvo/feature/700-import-7-check-final-data-generation-and-mapping

Feature/700 import 7 check final data generation and mapping

Author: wayangalihpratama

backend/assets/tests/empty.txt

@@ -1,5 +1,5 @@
 from sqlalchemy.orm import Session
-from sqlalchemy import and_, cast
+from sqlalchemy import and_, cast, or_
 from sqlalchemy.dialects.postgresql import TEXT
 from typing import Optional, List
 from typing_extensions import TypedDict
@@ -265,9 +265,15 @@ def update_case(session: Session, id: int, payload: CaseBase) -> CaseDict:
             prev_segment = (
                 session.query(Segment)
                 .filter(
-                    and_(
-                        Segment.case == case.id,
-                        Segment.id == segment.id,
+                    or_(
+                        and_(
+                            Segment.case == case.id,
+                            Segment.id == segment.id,
+                        ),
+                        and_(
+                            Segment.case == case.id,
+                            Segment.name == segment.name,
+                        ),
                     )
                 )
                 .first()

backend/assets/tests/invalid.xlsm

@@ -116,6 +116,7 @@ class CaseDetailDict(TypedDict):
     status: int
     tags: Optional[List[int]] = []
     company: Optional[int] = None
+    import_id: Optional[str] = None
 
 
 class Case(Base):
@@ -199,6 +200,12 @@ class Case(Base):
         passive_deletes=True,
         backref="company_cases",
     )
+    case_imports = relationship(
+        "CaseImport",
+        cascade="all, delete",
+        passive_deletes=True,
+        backref="case_detail",
+    )
 
     def __init__(
         self,
@@ -343,6 +350,15 @@ def to_case_list(self) -> CaseListDict:
 
     @property
     def to_case_detail(self) -> CaseDetailDict:
+        # Get the most recent import_id if exists
+        import_id = None
+        if self.case_imports:
+            # Sort by created_at and get the most recent one
+            most_recent_import = max(
+                self.case_imports, key=lambda x: x.created_at
+            )
+            import_id = str(most_recent_import.id)
+
         return {
             "id": self.id,
             "name": self.name,
@@ -374,6 +390,7 @@ def to_case_detail(self) -> CaseDetailDict:
             "tags": [ct.tag for ct in self.case_tags],
             "company": self.company,
             "status": self.status,
+            "import_id": import_id,
         }
 
     @property

backend/assets/tests/macro_validation_error.xlsm

@@ -54,6 +54,7 @@
     "/case-import",
     response_model=CaseImportResponse,
     summary="Upload case spreadsheet file",
+    name="case_import:upload_file",
     tags=ROUTE_TAG_NAME,
 )
 def case_import(
@@ -128,6 +129,7 @@ def case_import(
     "/case-import/segmentation-preview",
     response_model=SegmentationPreviewResponse,
     summary="Generate prefilled segmentation splits",
+    name="case_import:segmentation_preview",
     tags=ROUTE_TAG_NAME,
 )
 def segmentation_preview(
@@ -187,6 +189,7 @@ def segmentation_preview(
 @case_import_route.post(
     "/case-import/generate-segment-values",
     summary="Generate segment values for case commodities",
+    name="case_import:generate_segment_values",
     tags=ROUTE_TAG_NAME,
 )
 def generate_segment_values(

backend/assets/tests/valid.xlsm

@@ -403,6 +403,7 @@ async def test_update_case(
             "segments": [],
             "tags": [1],
             "company": None,
+            "import_id": None,
         }
 
     @pytest.mark.asyncio
@@ -482,4 +483,5 @@ async def test_get_case_by_id_without_segments(
             "private": False,
             "tags": [1],
             "company": None,
+            "import_id": None,
         }

backend/db/crud_case.py

@@ -225,6 +225,7 @@ async def test_get_case_by_id_with_segments(
             "private": False,
             "tags": [2, 1],
             "company": None,
+            "import_id": None,
         }
 
     @pytest.mark.asyncio

backend/models/case.py

@@ -281,6 +281,7 @@ async def test_update_case_with_segment(
             "private": False,
             "tags": [1],
             "company": 1,
+            "import_id": None,
         }
 
     @pytest.mark.asyncio