fixup

Author: aidan

public_api/version_02/views/search.py

@@ -21,7 +21,7 @@ def get(self, request: Request):
         limit = int(request.GET.get("limit", 0))
         fields = request.GET.get("fields", ["title", "slug"])
         meta = request.GET.get("meta", ["id"])
-        topic_results = TopicPage.objects.all().search(search)
+        topic_results = TopicPage.objects.live().search(search)
         if not limit or topic_results.count() < limit:
             # TODO: go get more
             # results = queryset

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

@@ -13,9 +13,6 @@
 @pytest.mark.django_db(True)
 class TestSearchAPIView:
 
-    _topics = []
-    _pages = []
-
     @property
     def path(self) -> str:
         return "/api/public/search/v1"
@@ -64,7 +61,7 @@ def other_pages(self) -> [UKHSAPage]:
     def test_search_finds_topics_only(self, topics, other_pages):
         """
         Given a string that matches all topic pages
-        When the GET /api/public/v2/search API is called with that query and a limit of 5
+        When the API is called with that query and a limit of 5
         Then the results will include only topic pages
         """
 
@@ -89,7 +86,32 @@ def test_search_finds_topics_only(self, topics, other_pages):
     def test_search_finds_topics_and_pages(self, topics, other_pages):
         """
         Given a string that matches 2 topic page
-        When GET /api/public/v2/search is called with that query and no limit
+        When the API is called with that query and no limit
+        Then the results will include the matching topic pages and others with the topics first
+        """
+
+        # Given
+        search = "rare"  # All topics have a title, only even ones have rare in it
+        query = f"search={search}"
+        expected_results = [t for t in topics if "rare" in t.title]
+
+        # When
+        client = RequestsClient()
+        url = f"{self.target_domain}{self.path}?{query}"
+        response: Response = client.get(url)
+
+        # Then
+        assert response.status_code == HTTPStatus.OK
+        response_data: list[dict] = response.json()
+        assert len(expected_results) == len(response_data)
+        for page in expected_results:
+            target = {"title": page.title, "slug": page.slug}
+            assert response_data.index(target) > -1
+
+    def test_search_doesnt_find_unpublish_pages(self, topics, other_pages):
+        """
+        Given a string that matches 2 topic page
+        When the API is called with that query and no limit
         Then the results will include the matching topic pages and others with the topics first
         """