PER data-fetcher functionality to backend side, v1.3

Author: szabozoltan69

per/drf_views.py

@@ -125,6 +125,27 @@ def _contains_affirmative(text: str) -> bool:
     return any(word in normalized for word in AFFIRMATIVE_WORDS)
 
 
+def _phase_display_from_int(phase: int | None, existing_display: str | None = None) -> str | None:
+    """Return normalized phase display using Overview.Phase IntegerChoices.
+
+    Uses the IntegerChoices label, then normalizes:
+    - "WorkPlan" -> "Workplan"
+    - "Action And Accountability" -> "Action & accountability"
+    """
+    label = None
+    try:
+        if isinstance(phase, int):
+            label = Overview.Phase(phase).label  # from IntegerChoices
+    except Exception:
+        label = None
+    disp = label or existing_display
+    if disp == "Action And Accountability":
+        return "Action & accountability"
+    if disp == "WorkPlan":
+        return "Workplan"
+    return disp
+
+
 class PERDocsFilter(filters.FilterSet):
     id = filters.NumberFilter(field_name="id", lookup_expr="exact")
 
@@ -659,11 +680,7 @@ def list(self, request, *args, **kwargs):
         results = data.get("results") if isinstance(data, dict) else data
         if results:
             for row in results:
-                pd = row.get("phase_display")
-                if pd == "Action And Accountability":
-                    row["phase_display"] = "Action & accountability"
-                elif pd == "WorkPlan":
-                    row["phase_display"] = "Workplan"
+                row["phase_display"] = _phase_display_from_int(row.get("phase"), row.get("phase_display"))
         return Response(data)
 
 
@@ -734,13 +751,8 @@ def get(self, request):
         )
         items = []
         for ov in latest_overviews:
-            # Normalize phase display and keep raw phase if available
-            phase_display = getattr(ov, "phase_display", None)
-            normalized_phase_display = phase_display
-            if phase_display == "Action And Accountability":
-                normalized_phase_display = "Action & accountability"
-            elif phase_display == "WorkPlan":
-                normalized_phase_display = "Workplan"
+            # Compute normalized phase display from int value or existing string
+            normalized_phase_display = _phase_display_from_int(getattr(ov, "phase", None), getattr(ov, "phase_display", None))
 
             # Attach components from latest assessment tied to the overview
             components = []