fix url

Author: aidan

metrics/api/urls_construction.py

@@ -98,7 +98,7 @@ def construct_cms_admin_urlpatterns(
     ]
 
 
-DEFAULT_PUBLIC_API_PREFIX = "api/public/timeseries/"
+DEFAULT_PUBLIC_API_PREFIX = "api/public/"
 
 
 def construct_public_api_urlpatterns(

public_api/urls.py

@@ -34,6 +34,9 @@
 )
 from public_api.views.timeseries_viewset import APITimeSeriesViewSet
 
+TIMESERIES_PREFIX = "timeseries/"
+SEARCH_PREFIX = "search/"
+
 
 def construct_url_patterns_for_public_api(
     *,
@@ -49,8 +52,12 @@ def construct_url_patterns_for_public_api(
         set of versioned URLS.
     """
     urls = []
-    urls.extend(_construct_version_one_urls(prefix=prefix))
-    urls.extend(_construct_version_two_urls(prefix=prefix))
+    # Timeseries API
+    urls.extend(_construct_version_one_urls(prefix=prefix + TIMESERIES_PREFIX))
+    urls.extend(_construct_version_two_urls(prefix=prefix + TIMESERIES_PREFIX))
+
+    # Search API
+    urls.extend(_construct_search_urls(prefix=prefix + SEARCH_PREFIX))
 
     if MetricsPublicAPIInterface.is_auth_enabled():
         urls.append(
@@ -160,11 +167,6 @@ def _construct_version_two_urls(
             PublicAPIRootViewV2.as_view(),
             name="public-api-v2",
         ),
-        path(
-            f"{prefix}v2/search",
-            SearchView.as_view(),
-            name="search",
-        ),
         path(
             f"{prefix}v2/themes/",
             ThemeListViewV2.as_view(),
@@ -228,3 +230,25 @@ def _construct_version_two_urls(
             name="timeseries-list-v2",
         ),
     ]
+
+
+def _construct_search_urls(
+    *,
+    prefix: str,
+) -> list[resolvers.URLResolver]:
+    """Returns a list of URLResolvers for the public search API
+
+    Args:
+        prefix: The prefix to add to the start of the url paths
+
+    Returns:
+        List of `URLResolver` objects each representing a
+        set of versioned URLS.
+    """
+    return [
+        path(
+            f"{prefix}v1",
+            SearchView.as_view(),
+            name="search",
+        ),
+    ]

tests/integration/public_api/v2/views/test_search.py

@@ -18,7 +18,7 @@ class TestSearchAPIView:
 
     @property
     def path(self) -> str:
-        return "/api/public/timeseries/v2/search"
+        return "/api/public/search/v1"
 
     @property
     def target_domain(self) -> str: