Breaking up #12495 into multiple stages of work. (#12503)

Author: agjohnson

readthedocs/projects/views/public.py

@@ -23,6 +23,7 @@
 from django.views.generic import ListView
 from taggit.models import Tag
 
+from readthedocs.api.mixins import CDNCacheTagsMixin
 from readthedocs.builds.constants import BUILD_STATE_FINISHED
 from readthedocs.builds.constants import EXTERNAL
 from readthedocs.builds.constants import INTERNAL
@@ -299,7 +300,7 @@ def verify_project_token(cls, token, project_slug):
 project_badge = never_cache(ProjectBadgeView.as_view())
 
 
-class ProjectDownloadMediaBase(CDNCacheControlMixin, ServeDocsMixin, View):
+class ProjectDownloadMediaBase(CDNCacheControlMixin, CDNCacheTagsMixin, ServeDocsMixin, View):
     # Use new-style URLs (same domain as docs) or old-style URLs (dashboard URL)
     same_domain_url = False
 
@@ -382,13 +383,28 @@ def get(
                 slug=version_slug,
             )
 
+        # TODO don't do this, it's a leftover of trying to use CDNCacheTagsMixin
+        # without class level variables. See proxito.views.serve for
+        # other instances of this pattern to update.
+        # See: https://github.com/readthedocs/readthedocs.org/pull/12495
+        self.project = version.project
+        self.version = version
+
         return self._serve_dowload(
             request=request,
             project=version.project,
             version=version,
             type_=type_,
         )
 
+    def _get_project(self):
+        """Hack for CDNCacheTagsMixin, get project set in `get()`."""
+        return self.project
+
+    def _get_version(self):
+        """Hack for CDNCacheTagsMixin, get version set in `get()`."""
+        return self.version
+
 
 class ProjectDownloadMedia(SettingsOverrideObject):
     _default_class = ProjectDownloadMediaBase

readthedocs/proxito/tests/test_full.py

@@ -547,6 +547,7 @@ def test_download_files_public_version(self):
                 headers={"host": "project.dev.readthedocs.io"},
             )
             self.assertEqual(resp.status_code, 200)
+            self.assertEqual(resp["Cache-Tag"], "project,project:latest")
             extension = "zip" if type_ == MEDIA_TYPE_HTMLZIP else type_
             self.assertEqual(
                 resp["X-Accel-Redirect"],
@@ -560,6 +561,7 @@ def test_download_files_public_version(self):
                 headers={"host": "project.dev.readthedocs.io"},
             )
             self.assertEqual(resp.status_code, 200)
+            self.assertEqual(resp["Cache-Tag"], "translation,translation:latest")
             extension = "zip" if type_ == MEDIA_TYPE_HTMLZIP else type_
             self.assertEqual(
                 resp["X-Accel-Redirect"],
@@ -604,6 +606,7 @@ def test_download_files_private_version(self):
                 headers={"host": "project.dev.readthedocs.io"},
             )
             self.assertEqual(resp.status_code, 200)
+            self.assertEqual(resp["Cache-Tag"], "project,project:latest")
             extension = "zip" if type_ == MEDIA_TYPE_HTMLZIP else type_
             self.assertEqual(
                 resp["X-Accel-Redirect"],