[DEV-15427] Fixed Incorrect Category Field Modification

usaspending_api/search/tests/integration/spending_by_category/test_spending_by_county.py

@@ -75,3 +75,48 @@ def test_correct_response_of_empty_list(client, monkeypatch, elasticsearch_trans
     }
     assert resp.status_code == status.HTTP_200_OK, "Failed to return 200 Response"
     assert resp.json() == expected_response
+
+
+def test_category_dataclass_subaward_caching(client, monkeypatch, awards_and_transactions,
+                                                elasticsearch_subaward_index, elasticsearch_transaction_index):
+    # Tests that the Category dataclass is not being cached incorrectly
+    # Originally would happen when updated by subaward spending levels
+    # tested by making a spending_level subawards request and then requesting on transaction level
+    setup_elasticsearch_test(monkeypatch, elasticsearch_subaward_index)
+
+    sub_resp = client.post(
+        "/api/v2/search/spending_by_category/county",
+        content_type="application/json",
+        data=json.dumps({
+            "filters": {"time_period": [{"start_date": "2018-10-01", "end_date": "2020-09-30"}]},
+            "spending_level": "subawards"
+        }),
+    )
+
+    assert sub_resp.status_code == status.HTTP_200_OK, "Failed to return 200 Response"
+    assert sub_resp.json().get("spending_level") == "subawards"
+    setup_elasticsearch_test(monkeypatch, elasticsearch_transaction_index)
+
+    trn_resp = client.post(
+        "/api/v2/search/spending_by_category/county",
+        content_type="application/json",
+        data=json.dumps({
+            "filters": {"time_period": [{"start_date": "2018-10-01", "end_date": "2020-09-30"}]},
+            "spending_level": "transactions"
+        }),
+    )
+
+    expected_response = {
+        "category": "county",
+        "limit": 10,
+        "page_metadata": {"page": 1, "next": None, "previous": None, "hasNext": False, "hasPrevious": False},
+        "results": [
+            {"amount": 550005.0, "code": "001", "id": None, "name": "CHARLESTON", "total_outlays": None},
+            {"amount": 5500.0, "code": "005", "id": None, "name": "TEST NAME", "total_outlays": None},
+            {"amount": 50.0, "code": "005", "id": None, "name": "TEST NAME", "total_outlays": None},
+        ],
+        "messages": _expected_messages(),
+        "spending_level": "transactions",
+    }
+    assert trn_resp.status_code == status.HTTP_200_OK, "Failed to return 200 Response"
+    assert trn_resp.json() == expected_response

usaspending_api/search/v2/views/spending_by_category_views/spending_by_category.py

@@ -1,7 +1,7 @@
 import copy
 import logging
 from abc import ABCMeta, abstractmethod
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import List, Optional, Union
 
 from django.conf import settings
@@ -32,7 +32,7 @@
 logger = logging.getLogger(__name__)
 
 
-@dataclass
+@dataclass(frozen=True)
 class Category:
     name: str
     agg_key: str
@@ -68,6 +68,10 @@ class AbstractSpendingByCategoryViewSet(APIView, metaclass=ABCMeta):
     def post(self, request: Request, *args, **kwargs) -> Response:
         original_filters = request.data.get("filters")
 
+        # Creates an instance copy for the category for each request
+        # Prevents modifications from previous requests affecting current requests
+        self.category = copy.deepcopy(self.category)
+
         # Handles case where the request has already been validated by an implementation of the abstract class
         validated_payload = kwargs.get("validated_payload", self.validate_payload(request))
 
@@ -126,8 +130,10 @@ def validate_payload(self, request: Request) -> dict:
     def perform_search(self, original_filters: dict) -> dict:
         if self.spending_level == SpendingLevel.SUBAWARD:
             # Swap the agg_key fields for the equivalent Subaward fields, if applicable
-            self.category.agg_key = self.subaward_agg_key_mapper.get(self.category.agg_key, self.category.agg_key)
-
+            self.category = replace(
+                self.category,
+                agg_key=self.subaward_agg_key_mapper.get(self.category.agg_key, self.category.agg_key)
+            )
             query_with_filters = QueryWithFilters(QueryType.SUBAWARDS)
             filter_query = query_with_filters.generate_elasticsearch_query(self.filters)
             results = self.query_elasticsearch(filter_query)