Merge branch 'main' into feature/CDD-3295-dual-category-chart-interface

Author: tushortz

metrics/api/urls_construction.py

@@ -138,7 +138,7 @@ def construct_public_api_urlpatterns(
 cold_alert_list = ColdAlertViewSet.as_view({"get": "list"})
 cold_alert_detail = ColdAlertViewSet.as_view({"get": "retrieve"})
 
-permission_set_urlpatterns = [
+generic_permission_set_urlpatterns = [
     path(
         f"{API_PREFIX}data-hierarchy/subthemes/<str:theme_id>",
         SubThemesByThemeView.as_view(),
@@ -159,6 +159,8 @@ def construct_public_api_urlpatterns(
         GeographiesByGeographyTypeView.as_view(),
         name="get_geographies",
     ),
+]
+permission_set_urlpatterns = [
     path(
         f"{API_PREFIX}user/<str:user_id>/permissions",
         UserPermissionSetsByUserIdView.as_view(),
@@ -313,13 +315,15 @@ def construct_urlpatterns(
             constructed_url_patterns += construct_cms_admin_urlpatterns(
                 app_mode=app_mode
             )
+            constructed_url_patterns += generic_permission_set_urlpatterns
             constructed_url_patterns += audit_api_urlpatterns
         case enums.AppMode.PUBLIC_API.value:
             constructed_url_patterns += construct_public_api_urlpatterns(
                 app_mode=app_mode
             )
         case enums.AppMode.PRIVATE_API.value:
             constructed_url_patterns += private_api_urlpatterns
+            constructed_url_patterns += generic_permission_set_urlpatterns
             constructed_url_patterns += permission_set_urlpatterns
         case enums.AppMode.FEEDBACK_API.value:
             constructed_url_patterns += feedback_urlpatterns
@@ -338,5 +342,6 @@ def construct_urlpatterns(
             constructed_url_patterns += feedback_urlpatterns
             constructed_url_patterns += audit_api_urlpatterns
             constructed_url_patterns += permission_set_urlpatterns
+            constructed_url_patterns += generic_permission_set_urlpatterns
 
     return constructed_url_patterns

requirements-prod.txt

@@ -31,7 +31,7 @@ grimp==3.14
 gunicorn==26.0.0
 html5lib==1.1
 identify==2.6.19
-idna==3.16
+idna==3.17
 importlib-metadata==9.0.0
 inflection==0.5.1
 iniconfig==2.3.0
@@ -55,7 +55,7 @@ packaging==26.2
 pathspec==1.1.1
 pbr==7.0.3
 Pillow==12.2.0
-platformdirs==4.9.6
+platformdirs==4.10.0
 plotly==6.7.0
 pluggy==1.6.0
 pyjwt==2.13.0

tests/unit/metrics/api/test_urls_construction.py

@@ -57,6 +57,18 @@
     "public_api",
 ]
 
+PERMISSION_SET_PATHS = [
+    "api/user/<str:user_id>/permissions",
+    "api/user/<str:user_id>/permissions/hierarchy",
+]
+
+GENERIC_PERMISSION_SET_PATHS = [
+    "api/data-hierarchy/subthemes/<str:theme_id>",
+    "api/data-hierarchy/topics/<str:sub_theme_id>",
+    "api/data-hierarchy/metrics/<str:topic_id>",
+    "api/data-hierarchy/geographies/<str:geography_type_id>",
+]
+
 
 def _flatten_urls(*, urlpatterns: list[URLPattern | URLResolver]) -> list[URLPattern]:
     """Takes a list of URLPatterns and URLResolvers and returns
@@ -183,7 +195,9 @@ class TestConstructUrlpatterns:
 
     @pytest.mark.parametrize(
         "private_api_endpoint_path",
-        PRIVATE_API_ENDPOINT_PATHS,
+        PRIVATE_API_ENDPOINT_PATHS
+        + PERMISSION_SET_PATHS
+        + GENERIC_PERMISSION_SET_PATHS,
     )
     def test_private_api_mode_returns_private_api_urls(
         self, private_api_endpoint_path: str
@@ -369,7 +383,7 @@ def test_cms_admin_mode_returns_cms_admin_urls(self):
 
     @pytest.mark.parametrize(
         "included_endpoint_path",
-        AUDIT_API_ENDPOINT_PATHS,
+        AUDIT_API_ENDPOINT_PATHS + GENERIC_PERMISSION_SET_PATHS,
     )
     def test_cms_admin_mode_returns_all_expected_urls(
         self, included_endpoint_path: str
@@ -392,7 +406,8 @@ def test_cms_admin_mode_returns_all_expected_urls(
         "excluded_endpoint_path",
         PRIVATE_API_ENDPOINT_PATHS
         + PUBLIC_API_ENDPOINT_PATHS
-        + FEEDBACK_API_ENDPOINT_PATHS,
+        + FEEDBACK_API_ENDPOINT_PATHS
+        + PERMISSION_SET_PATHS,
     )
     def test_cms_admin_mode_does_not_return_other_urls(
         self, excluded_endpoint_path: str