UPDATE

economic_overview/defaults.py

@@ -0,0 +1,8 @@
+EMPTY_ECONOMIC_OVERVIEW = {
+    "economicData": [],
+    "chartSeries": [],
+    "chartCategories": [],
+    "status": "empty",
+    "source": "db",
+    "warnings": ["No persisted economic overview data is available for this farm."],
+}

economic_overview/services.py

@@ -1,11 +1,11 @@
 from copy import deepcopy
 
-from .mock_data import ECONOMIC_OVERVIEW
+from .defaults import EMPTY_ECONOMIC_OVERVIEW
 from .models import EconomicOverviewLog
 
 
 def get_economic_overview_data(farm=None):
-    data = deepcopy(ECONOMIC_OVERVIEW)
+    data = deepcopy(EMPTY_ECONOMIC_OVERVIEW)
 
     if farm is None:
         return data
@@ -14,6 +14,9 @@ def get_economic_overview_data(farm=None):
     if log is None:
         return data
 
+    data["status"] = "success"
+    data["source"] = "db"
+    data["warnings"] = []
     if log.economic_data:
         data["economicData"] = deepcopy(log.economic_data)
     if log.chart_series:

economic_overview/tests.py

@@ -79,3 +79,19 @@ class EconomyOverviewViewTests(TestCase):
 
         with self.assertRaises(Resolver404):
             resolve("/api/economic-overview/summary/")
+
+    @patch("economic_overview.views.external_api_request")
+    def test_overview_returns_structured_502_for_invalid_upstream_payload(self, mock_external_api_request):
+        mock_external_api_request.return_value = AdapterResponse(
+            status_code=200,
+            data={"data": []},
+        )
+
+        request = self.factory.post("/api/economy/overview/", {"farm_uuid": str(self.farm.farm_uuid)}, format="json")
+        force_authenticate(request, user=self.user)
+
+        response = EconomyOverviewView.as_view()(request)
+
+        self.assertEqual(response.status_code, 502)
+        self.assertEqual(response.data["data"]["error_code"], "invalid_payload")
+        self.assertEqual(response.data["data"]["source"], "ai_provider")

economic_overview/views.py

@@ -1,16 +1,58 @@
+import logging
+
 from drf_spectacular.utils import extend_schema
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from config.failure_contract import StructuredServiceError
 from config.swagger import status_response
 from external_api_adapter import request as external_api_request
+from external_api_adapter.exceptions import ExternalAPIRequestError
 from farm_hub.models import FarmHub
 from .models import EconomicOverviewLog
 from .serializers import EconomicOverviewRequestSerializer, EconomicOverviewSerializer
 
+logger = logging.getLogger(__name__)
+
+
+class EconomicOverviewAdapterError(StructuredServiceError):
+    def __init__(self, *, error_code: str, message: str, source: str, retriable: bool = False, details: dict | None = None):
+        super().__init__(
+            error_code=error_code,
+            message=message,
+            source=source,
+            retriable=retriable,
+            details=details,
+        )
+
 
 class EconomyOverviewView(APIView):
+    @staticmethod
+    def _extract_result_or_error(adapter_data):
+        if not isinstance(adapter_data, dict):
+            raise EconomicOverviewAdapterError(
+                error_code="invalid_payload",
+                message="Economic overview adapter returned a non-object payload.",
+                source="ai_provider",
+            )
+
+        data = adapter_data.get("data")
+        if isinstance(data, dict) and isinstance(data.get("result"), dict):
+            return data["result"]
+        if isinstance(data, dict):
+            return data
+
+        result = adapter_data.get("result")
+        if isinstance(result, dict):
+            return result
+
+        raise EconomicOverviewAdapterError(
+            error_code="invalid_payload",
+            message="Economic overview adapter payload did not contain structured result data.",
+            source="ai_provider",
+        )
+
     @staticmethod
     def _get_farm(request, farm_uuid):
         if not farm_uuid:
@@ -26,27 +68,14 @@ class EconomyOverviewView(APIView):
                 status=status.HTTP_404_NOT_FOUND,
             )
 
-    @staticmethod
-    def _extract_result(adapter_data):
-        if not isinstance(adapter_data, dict):
-            return {}
-
-        data = adapter_data.get("data")
-        if isinstance(data, dict) and isinstance(data.get("result"), dict):
-            return data["result"]
-        if isinstance(data, dict):
-            return data
-
-        result = adapter_data.get("result")
-        if isinstance(result, dict):
-            return result
-
-        return adapter_data
-
     @staticmethod
     def _persist_log(farm, overview_data):
         if not isinstance(overview_data, dict):
-            return
+            raise EconomicOverviewAdapterError(
+                error_code="invalid_payload",
+                message="Economic overview data must be a JSON object before persistence.",
+                source="backend",
+            )
         EconomicOverviewLog.objects.create(
             farm=farm,
             economic_data=overview_data.get("economicData", []),
@@ -68,12 +97,26 @@ class EconomyOverviewView(APIView):
             return error_response
 
         payload = {"farm_uuid": str(farm.farm_uuid)}
-        adapter_response = external_api_request(
-            "ai",
-            "/api/economy/overview/",
-            method="POST",
-            payload=payload,
-        )
+        try:
+            adapter_response = external_api_request(
+                "ai",
+                "/api/economy/overview/",
+                method="POST",
+                payload=payload,
+            )
+        except ExternalAPIRequestError as exc:
+            logger.error("Economic overview upstream request failed for farm_uuid=%s: %s", farm.farm_uuid, exc)
+            failure = EconomicOverviewAdapterError(
+                error_code="upstream_unavailable",
+                message="Economic overview upstream request failed.",
+                source="ai_provider",
+                retriable=True,
+                details={"farm_uuid": str(farm.farm_uuid)},
+            )
+            return Response(
+                {"code": 503, "msg": "error", "data": failure.to_dict()},
+                status=status.HTTP_503_SERVICE_UNAVAILABLE,
+            )
 
         if adapter_response.status_code >= 400:
             response_data = (
@@ -86,8 +129,15 @@ class EconomyOverviewView(APIView):
                 status=adapter_response.status_code,
             )
 
-        overview_data = self._extract_result(adapter_response.data)
-        if isinstance(overview_data, dict):
-            overview_data.setdefault("farm_uuid", str(farm.farm_uuid))
-        self._persist_log(farm, overview_data)
+        try:
+            overview_data = self._extract_result_or_error(adapter_response.data)
+            if isinstance(overview_data, dict):
+                overview_data.setdefault("farm_uuid", str(farm.farm_uuid))
+            self._persist_log(farm, overview_data)
+        except EconomicOverviewAdapterError as exc:
+            logger.error("Economic overview payload handling failed for farm_uuid=%s: %s", farm.farm_uuid, exc)
+            return Response(
+                {"code": 502, "msg": "error", "data": exc.to_dict()},
+                status=status.HTTP_502_BAD_GATEWAY,
+            )
         return Response({"code": 200, "msg": "success", "data": overview_data}, status=status.HTTP_200_OK)