Merge pull request readthedocs#6325 from stsewd/dont-error-on-wrong-input

Don't error on non existing version

Author: ericholscher

readthedocs/search/api.py

@@ -6,8 +6,9 @@
 from rest_framework.exceptions import ValidationError
 from rest_framework.pagination import PageNumberPagination
 
+from readthedocs.projects.models import HTMLFile
+from readthedocs.search import tasks, utils
 from readthedocs.search.faceted_search import PageSearch
-from readthedocs.search import utils, tasks
 
 
 log = logging.getLogger(__name__)
@@ -79,9 +80,11 @@ def get_queryset(self):
         kwargs['filters']['project'] = [p.slug for p in self.get_all_projects()]
         kwargs['filters']['version'] = self.request.query_params.get('version')
         if not kwargs['filters']['project']:
-            raise ValidationError("Unable to find a project to search")
+            log.info("Unable to find a project to search")
+            return HTMLFile.objects.none()
         if not kwargs['filters']['version']:
-            raise ValidationError("Unable to find a version to search")
+            log.info("Unable to find a version to search")
+            return HTMLFile.objects.none()
         user = self.request.user
         queryset = PageSearch(
             query=query, user=user, **kwargs

readthedocs/search/tests/test_api.py

@@ -1,17 +1,17 @@
 import re
-import pytest
 
+import pytest
 from django.core.urlresolvers import reverse
 from django_dynamic_fixture import G
 
 from readthedocs.builds.models import Version
-from readthedocs.projects.models import HTMLFile
+from readthedocs.projects.models import HTMLFile, Project
+from readthedocs.search.documents import PageDocument
 from readthedocs.search.tests.utils import (
-    get_search_query_from_project_file,
-    SECTION_FIELDS,
     DOMAIN_FIELDS,
+    SECTION_FIELDS,
+    get_search_query_from_project_file,
 )
-from readthedocs.search.documents import PageDocument
 
 
 @pytest.mark.django_db
@@ -224,3 +224,30 @@ def test_doc_search_subprojects(self, api_client, all_projects):
         # Check the link is the subproject document link
         document_link = subproject.get_docs_url(version_slug=version.slug)
         assert document_link in first_result['link']
+
+    def test_doc_search_unexisting_project(self, api_client):
+        project = 'notfound'
+        assert not Project.objects.filter(slug=project).exists()
+
+        search_params = {
+            'q': 'documentation',
+            'project': project,
+            'version': 'latest',
+        }
+        resp = api_client.get(self.url, search_params)
+        assert resp.status_code == 404
+
+    def test_doc_search_unexisting_version(self, api_client, project):
+        version = 'notfound'
+        assert not project.versions.filter(slug=version).exists()
+
+        search_params = {
+            'q': 'documentation',
+            'project': project.slug,
+            'version': version,
+        }
+        resp = api_client.get(self.url, search_params)
+        assert resp.status_code == 200
+
+        data = resp.data['results']
+        assert len(data) == 0