Search: use doctype from indexed pages instead of the db

readthedocs/search/api.py

@@ -189,15 +189,13 @@ def _get_all_projects_data(self):
                    alias='alias',
                    version=VersionData(
                         "latest",
-                        "sphinx",
                         "https://requests.readthedocs.io/en/latest/",
                     ),
                ),
                "requests-oauth": ProjectData(
                    alias=None,
                    version=VersionData(
                        "latest",
-                       "sphinx_htmldir",
                        "https://requests-oauth.readthedocs.io/en/latest/",
                    ),
                ),
@@ -215,7 +213,6 @@ def _get_all_projects_data(self):
                 alias=None,
                 version=VersionData(
                     slug=main_version.slug,
-                    doctype=main_version.documentation_type,
                     docs_url=main_project.get_docs_url(version_slug=main_version.slug),
                 ),
             )
@@ -246,7 +243,6 @@ def _get_all_projects_data(self):
                 project_alias = subproject.superprojects.values_list('alias', flat=True).first()
                 version_data = VersionData(
                     slug=version.slug,
-                    doctype=version.documentation_type,
                     docs_url=url,
                 )
                 projects_data[subproject.slug] = ProjectData(

readthedocs/search/serializers.py

@@ -22,7 +22,7 @@
 
 # Structure used for storing cached data of a version mostly.
 ProjectData = namedtuple('ProjectData', ['version', 'alias'])
-VersionData = namedtuple('VersionData', ['slug', 'docs_url', 'doctype'])
+VersionData = namedtuple('VersionData', ['slug', 'docs_url'])
 
 
 class ProjectHighlightSerializer(serializers.Serializer):
@@ -89,7 +89,6 @@ def _get_project_data(self, obj):
             version_data = VersionData(
                 slug=obj.version,
                 docs_url=docs_url,
-                doctype=None,
             )
             projects_data[obj.project] = ProjectData(
                 alias=project_alias,
@@ -126,7 +125,7 @@ def _get_full_path(self, obj):
 
             # Generate an appropriate link for the doctypes that use htmldir,
             # and always end it with / so it goes directly to proxito.
-            if project_data.version.doctype in {SPHINX_HTMLDIR, MKDOCS}:
+            if obj.doctype in {SPHINX_HTMLDIR, MKDOCS}:
                 path = re.sub('(^|/)index.html$', '/', path)
 
             return docs_url.rstrip('/') + '/' + path.lstrip('/')

readthedocs/search/tests/test_api.py

@@ -410,6 +410,11 @@ def test_search_correct_link_for_normal_page_html_projects(self, api_client, doc
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,
@@ -428,6 +433,11 @@ def test_search_correct_link_for_index_page_html_projects(self, api_client, doct
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,
@@ -446,6 +456,11 @@ def test_search_correct_link_for_index_page_subdirectory_html_projects(self, api
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,
@@ -464,6 +479,11 @@ def test_search_correct_link_for_normal_page_htmldir_projects(self, api_client,
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,
@@ -482,6 +502,11 @@ def test_search_correct_link_for_index_page_htmldir_projects(self, api_client, d
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,
@@ -500,6 +525,11 @@ def test_search_correct_link_for_index_page_subdirectory_htmldir_projects(self,
         project.versions.update(documentation_type=doctype)
         version = project.versions.all().first()
 
+        # Refresh index
+        version_files = HTMLFile.objects.all().filter(version=version)
+        for f in version_files:
+            PageDocument().update(f)
+
         search_params = {
             'project': project.slug,
             'version': version.slug,

readthedocs/search/views.py

@@ -57,16 +57,10 @@ def _get_project(self, project_slug):
         return project
 
     def _get_project_data(self, project, version_slug):
-        version_doctype = (
-            project.versions
-            .values_list('documentation_type', flat=True)
-            .get(slug=version_slug)
-        )
         docs_url = project.get_docs_url(version_slug=version_slug)
         version_data = VersionData(
             slug=version_slug,
             docs_url=docs_url,
-            doctype=version_doctype,
         )
         project_data = {
             project.slug: ProjectData(