remove testing changes

Author: kathryn-dale

metrics/data/managers/core_models/time_series.py

@@ -13,6 +13,7 @@
 from django.db.models.query_utils import Q
 from django.utils import timezone
 
+from metrics.api.permissions.fluent_permissions import validate_permissions_for_non_public
 from metrics.data.models import RBACPermission
 
 ALLOWABLE_METRIC_VALUE_RANGE_TYPE = tuple[str | float | int, str | float | int]
@@ -603,18 +604,15 @@ def query_for_data(
 
         """
         rbac_permissions: Iterable[RBACPermission] = rbac_permissions or []
-        has_access_to_non_public_data: bool = (
-            True  # TODO: Remove this - manually set for caching testing
+        has_access_to_non_public_data: bool = validate_permissions_for_non_public(
+            theme=theme,
+            sub_theme=sub_theme,
+            topic=topic,
+            metric=metric,
+            geography_type=geography_type,
+            geography=geography,
+            rbac_permissions=rbac_permissions,
         )
-        # has_access_to_non_public_data: bool = validate_permissions_for_non_public(
-        #     theme=theme,
-        #     sub_theme=sub_theme,
-        #     topic=topic,
-        #     metric=metric,
-        #     geography_type=geography_type,
-        #     geography=geography,
-        #     rbac_permissions=rbac_permissions,
-        # )
 
         return self.get_queryset().query_for_data(
             fields_to_export=fields_to_export,

public_api/serializers/api_time_series_request_serializer.py

@@ -78,7 +78,7 @@ def get_queryset(self) -> "APITimeSeriesQuerySet":
         """
         kwargs: dict[str, str] = self.get_kwargs_from_request()
         return self.api_time_series_manager.get_distinct_column_values_with_filters(
-            lookup_field=self.lookup_field, restrict_to_public=False, **kwargs
+            lookup_field=self.lookup_field, restrict_to_public=True, **kwargs
         )
 
     def build_timeseries_dto_slice(self) -> list[APITimeSeriesDTO]: