more fixup

Author: safwanrahman

readthedocs/search/api.py

@@ -12,12 +12,13 @@ class PageSearchAPIView(generics.ListAPIView):
     serializer_class = PageSearchSerializer
 
     def get_queryset(self):
-        """Return Elasticsearch DSL Search object instead of Django Queryset.
+        """
+        Return Elasticsearch DSL Search object instead of Django Queryset.
 
         Django Queryset and elasticsearch-dsl ``Search`` object is similar pattern.
         So for searching, its possible to return ``Search`` object instead of queryset.
         The ``filter_backends`` and ``pagination_class`` is compatible with ``Search``
         """
         query = self.request.query_params.get('query', '')
-        queryset = PageDocument.search(query=query)
+        queryset = PageDocument.simple_search(query=query)
         return queryset

readthedocs/search/documents.py

@@ -87,9 +87,8 @@ def faceted_search(cls, query, projects_list=None, versions_list=None, using=Non
         return FileSearch(**kwargs)
 
     @classmethod
-    def search(cls, *args, **kwargs):
-        query = kwargs.pop('query')
-        es_search = super(PageDocument, cls).search(*args, **kwargs)
+    def simple_search(cls, query, using=None, index=None):
+        es_search = cls.search(using=using, index=index)
         es_query = cls.get_es_query(query=query)
 
         es_search = es_search.query(es_query).highlight('content')

readthedocs/search/filters.py

@@ -7,8 +7,11 @@ class SearchFilterBackend(filters.BaseFilterBackend):
 
     """Filter search result with project"""
 
-    def filter_queryset(self, request, es_search, view):
+    def filter_queryset(self, request, queryset, view):
         """Overwrite the method to compatible with Elasticsearch DSL Search object."""
+        # ``queryset`` is actually a Elasticsearch DSL ``Search`` object.
+        # So change the variable name
+        es_search = queryset
         project_slug = request.query_params.get('project')
         version_slug = request.query_params.get('version')
         project_slug_list = get_project_slug_list_or_404(project_slug=project_slug,

readthedocs/search/utils.py

@@ -315,6 +315,7 @@ def parse_sections(documentation_type, content):
 def get_project_slug_list_or_404(project_slug, user):
     """
     Return list of subproject's slug including own slug.
+
     If the project is not available to user, redirect to 404
     """
     queryset = Project.objects.api(user).only('slug')