DREF3 enhancement – is_latest_stage

Author: szabozoltan69

dref/serializers.py

@@ -1712,6 +1712,7 @@ class BaseDref3Serializer(serializers.ModelSerializer):
     sector_national_society_strengthening_budget = serializers.SerializerMethodField()
     sector_national_society_strengthening_people_targeted = serializers.SerializerMethodField()
     public = serializers.SerializerMethodField(read_only=True)
+    is_latest_stage = serializers.SerializerMethodField(read_only=True)
     status = serializers.IntegerField(read_only=True)
     status_display = serializers.CharField(source="get_status_display", read_only=True)
     approved = serializers.SerializerMethodField()
@@ -1723,6 +1724,9 @@ class BaseDref3Serializer(serializers.ModelSerializer):
     def get_public(self, obj):
         return self.context.get("public")
 
+    def get_is_latest_stage(self, obj):
+        return self.context.get("is_latest_stage")
+
     def get_stage(self, obj):
         return self.context.get("stage")
 
@@ -2105,6 +2109,7 @@ class Meta:
             "sector_national_society_strengthening_budget",
             "sector_national_society_strengthening_people_targeted",
             "public",
+            "is_latest_stage",
             "status",
             "status_display",
             "approved",

dref/test_dref3_filters.py

@@ -204,3 +204,46 @@ def test_status_display_labels(self):
         appeal_a_statuses = {r["status_display"] for r in rows if r["appeal_id"] == "APPEAL_A"}
         # Expected labels
         assert {"Approved", "Finalized", "Draft"}.issubset(appeal_a_statuses)
+
+    def test_is_latest_stage_flag_progression(self):
+        """Verify is_latest_stage shifts to the newest approved stage only."""
+        self.authenticate(self.superuser)
+        # Initial: all DRAFT -> no latest stage
+        resp_initial = self.client.get(f"/api/v2/dref3/{self.dref_a.appeal_code}/")
+        self.assertEqual(resp_initial.status_code, status.HTTP_200_OK)
+        data_initial = resp_initial.json()
+        assert all(not row.get("is_latest_stage") for row in data_initial)
+
+        # Approve application
+        self.dref_a.status = Dref.Status.APPROVED
+        self.dref_a.save(update_fields=["status"])
+        resp_after_app = self.client.get(f"/api/v2/dref3/{self.dref_a.appeal_code}/")
+        self.assertEqual(resp_after_app.status_code, status.HTTP_200_OK)
+        data_after_app = resp_after_app.json()
+        # Application should be latest stage
+        latest_flags = [row.get("is_latest_stage") for row in data_after_app]
+        assert any(latest_flags), "Expected one latest stage after application approval"
+        app_rows = [row for row in data_after_app if row["stage"] == "Application"]
+        assert app_rows and app_rows[0]["is_latest_stage"] is True
+
+        # Approve operational update -> flag moves
+        self.op_a1.status = Dref.Status.APPROVED
+        self.op_a1.save(update_fields=["status"])
+        resp_after_op = self.client.get(f"/api/v2/dref3/{self.dref_a.appeal_code}/")
+        self.assertEqual(resp_after_op.status_code, status.HTTP_200_OK)
+        data_after_op = resp_after_op.json()
+        app_row = [r for r in data_after_op if r["stage"] == "Application"][0]
+        op_row = [r for r in data_after_op if r["stage"].startswith("Operational Update")][0]
+        assert app_row["is_latest_stage"] is False
+        assert op_row["is_latest_stage"] is True
+
+        # Approve final report -> flag moves again
+        self.final_a.status = Dref.Status.APPROVED
+        self.final_a.save(update_fields=["status"])
+        resp_after_fr = self.client.get(f"/api/v2/dref3/{self.dref_a.appeal_code}/")
+        self.assertEqual(resp_after_fr.status_code, status.HTTP_200_OK)
+        data_after_fr = resp_after_fr.json()
+        fr_row = [r for r in data_after_fr if r["stage"] == "Final Report"][0]
+        op_row = [r for r in data_after_fr if r["stage"].startswith("Operational Update")][0]
+        assert op_row["is_latest_stage"] is False
+        assert fr_row["is_latest_stage"] is True

dref/views.py

@@ -740,9 +740,27 @@ def retrieve(self, request, *args, **kwargs):
         allocation_count = 1  # Dref Application is always the first allocation
         public = code not in self.get_nonsuperusers_excluded_codes()
         a = ["First", "Second", "Third", "Fourth", "Fifth", "Sixth", "Seventh", "Eighth", "Ninth", "Tenth"]
-        for instance in instances:
+
+        # is_latest_stage: the last APPROVED-status instance and next instance either absent or not APPROVED
+        latest_index = None
+        for i, inst in enumerate(instances):
+            if getattr(inst, "status", None) == Dref.Status.APPROVED:
+                next_inst = instances[i + 1] if i + 1 < len(instances) else None
+                if next_inst is None or getattr(next_inst, "status", None) != Dref.Status.APPROVED:
+                    latest_index = i
+        # Build serialized rows with flag
+        for i, instance in enumerate(instances):
+            is_latest_stage = i == latest_index
             if isinstance(instance, Dref):
-                serializer = Dref3Serializer(instance, context={"stage": "Application", "allocation": a[0], "public": public})
+                serializer = Dref3Serializer(
+                    instance,
+                    context={
+                        "stage": "Application",
+                        "allocation": a[0],
+                        "public": public,
+                        "is_latest_stage": is_latest_stage,
+                    },
+                )
             elif isinstance(instance, DrefOperationalUpdate):
                 ops_update_count += 1
                 if instance.additional_allocation and len(a) > allocation_count:
@@ -753,15 +771,21 @@ def retrieve(self, request, *args, **kwargs):
                 serializer = DrefOperationalUpdate3Serializer(
                     instance,
                     context={
-                        "stage": "Operational Update " + str(ops_update_count),
+                        "stage": f"Operational Update {ops_update_count}",
                         "allocation": allocation,
                         "public": public,
+                        "is_latest_stage": is_latest_stage,
                     },
                 )
             elif isinstance(instance, DrefFinalReport):
                 serializer = DrefFinalReport3Serializer(
                     instance,
-                    context={"stage": "Final Report", "allocation": "No allocation", "public": public},
+                    context={
+                        "stage": "Final Report",
+                        "allocation": "No allocation",
+                        "public": public,
+                        "is_latest_stage": is_latest_stage,
+                    },
                 )
             else:
                 continue