Merge pull request #57 from andela/bg-fix-search-responses-165962764

#165962764 Fix-search-error-messages
andela · May 14, 2019 · 7c907da · 7c907da
2 parents aa3f730 + be34b4b
commit 7c907da
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/authors/apps/articles/serializers.py b/authors/apps/articles/serializers.py
@@ -92,13 +92,13 @@ class ArticlePaginator(PageNumberPagination):
     """
 
     def get_paginated_response(self, data):
-        return Response(OrderedDict([
+        return OrderedDict([
             ("pageCount", len(self.page.object_list)),
             ('articlesCount', self.page.paginator.count),
             ('next', self.get_next_link()),
             ('previous', self.get_previous_link()),
             ('results', data)
-        ]))
+        ])
 
 
 class FavoritesSerializer(serializers.ModelSerializer):

diff --git a/authors/apps/articles/tests/basetests.py b/authors/apps/articles/tests/basetests.py
@@ -869,3 +869,13 @@ def filter_by_tag_and_title(self):
                                    format='json'
                                    )
         return response
+
+    def filter_by_author_and_title(self):
+        """
+        Filter by tag
+        """
+        response = self.client.get((self.articles_url)
+                                   + '?author=' + 'philip' + '?title=' + 'ted',
+                                   format='json'
+                                   )
+        return response
diff --git a/authors/apps/articles/tests/test_filters.py b/authors/apps/articles/tests/test_filters.py
@@ -25,9 +25,9 @@ def test_filter_non_author(self):
         self.create_an_article()
         response = self.filter_by_non_author()
         self.assertEqual(response.status_code,
-                         status.HTTP_404_NOT_FOUND
+                         status.HTTP_200_OK
                          )
-        message = response.data.get("error")
+        message = response.data.get("message")
         self.assertEqual(message, 'We couldn’t find any articles')
 
     def test_filter_by_one_tag(self):
@@ -69,3 +69,13 @@ def test_filter_by_title_and_tags(self):
         self.assertEqual(response.status_code,
                          status.HTTP_200_OK
                          )
+
+    def test_filter_by_author_and_title(self):
+        """
+        tests filter for articles by author and title
+        """
+        self.create_an_article()
+        response = self.filter_by_author_and_title()
+        self.assertEqual(response.status_code,
+                         status.HTTP_200_OK
+                         )
diff --git a/authors/apps/articles/views.py b/authors/apps/articles/views.py
@@ -127,11 +127,9 @@ def get(self, request):
         response = paginator.get_paginated_response({
             "articles": serializer.data
         })
-        if not serializer.data:
-            response = Response(data={
-                "error": "We couldn’t find any articles"
-            }, status=status.HTTP_404_NOT_FOUND)
-        return response
+        if response.get("articlesCount") == 0:
+            response["message"] = "We couldn’t find any articles"
+        return Response(response)
 
 
 class RetrieveUpdateArticleAPIView(GenericAPIView):