Address PR feedback with correct decorator ordring see HEA-872

Author: girumb

apps/baseline/tests/test_viewsets.py

@@ -600,19 +600,24 @@ def test_filter_by_wealth_characteristic(self):
         self.assertEqual(len(response.json()), 1)
 
     def test_conditional_request_headers(self):
-
         cache.clear()  # Clear cache to ensure clean state
-        # Test that response includes ETag and Last-Modified headers
+
+        # Test that 200 response includes ETag, Last-Modified, Cache-Control, and Expires headers
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertIn("ETag", response.headers)
         self.assertIn("Last-Modified", response.headers)
+        self.assertIn("Cache-Control", response.headers)
+        self.assertIn("Expires", response.headers)
         self.assertTrue(response.headers["ETag"].startswith('W/"'))  # Weak ETag format
 
         # Test If-None-Match returns 304 when not modified
         etag = response.headers["ETag"]
+        cache.clear()
         response = self.client.get(self.url, HTTP_IF_NONE_MATCH=etag)
         self.assertEqual(response.status_code, 304)
+        self.assertIn("Cache-Control", response.headers)
+        self.assertIn("Expires", response.headers)
 
         # Test If-None-Match returns 200 when data is modified
         cache.clear()  # Clear cache before testing modified data
@@ -624,9 +629,12 @@ def test_conditional_request_headers(self):
         self.assertNotEqual(response.headers["ETag"], etag)
 
         # Test If-Modified-Since with future date returns 304
+        cache.clear()
         future_date = http_date((now() + timedelta(days=1)).timestamp())
         response = self.client.get(self.url, HTTP_IF_MODIFIED_SINCE=future_date)
         self.assertEqual(response.status_code, 304)
+        self.assertIn("Cache-Control", response.headers)
+        self.assertIn("Expires", response.headers)
 
 
 class LivelihoodZoneBaselineFacetedSearchViewTestCase(APITestCase):

apps/baseline/viewsets.py

@@ -278,8 +278,8 @@ def get_serializer_class(self):
             return LivelihoodZoneBaselineGeoSerializer  # Use GeoFeatureModelSerializer for GeoJSON
         return LivelihoodZoneBaselineSerializer
 
+    @method_decorator(cache_page(60 * 60 * 24))  # Cache on server for 24 hours - must be above condition per RFC 9110
     @method_decorator(condition(etag_func=get_baseline_etag, last_modified_func=get_baseline_last_modified))
-    @method_decorator(cache_page(60 * 60 * 24))  # Cache on server for 24 hours
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)