Querysets: remove private and for_project (#8158)

This aren't used, and I don't see them being used in the future.

- private: there isn't a part of our code were we want to list
  all private versions, instead we may want to use `public(user)`.
- for_project: this was listing all versions from a project and its
  translation. Not sure were we would want that, but isn't used.

Author: stsewd

readthedocs/builds/querysets.py

@@ -48,16 +48,6 @@ def public(self, user=None, project=None, only_active=True,
             queryset = queryset.filter(hidden=False)
         return queryset.distinct()
 
-    def private(self, user=None, project=None, only_active=True):
-        queryset = self.filter(privacy_level__in=[constants.PRIVATE])
-        if user:
-            queryset = self._add_user_repos(queryset, user)
-        if project:
-            queryset = queryset.filter(project=project)
-        if only_active:
-            queryset = queryset.filter(active=True)
-        return queryset.distinct()
-
     def api(self, user=None, detail=True):
         if detail:
             return self.public(user, only_active=False)
@@ -67,13 +57,6 @@ def api(self, user=None, detail=True):
             queryset = self._add_user_repos(queryset, user)
         return queryset.distinct()
 
-    def for_project(self, project):
-        """Return all versions for a project, including translations."""
-        return self.filter(
-            models.Q(project=project) |
-            models.Q(project__main_language_project=project),
-        )
-
 
 class VersionQuerySet(SettingsOverrideObject):
     _default_class = VersionQuerySetBase

readthedocs/projects/querysets.py

@@ -168,18 +168,7 @@ def _add_user_repos(self, queryset, user=None):
         return queryset
 
     def public(self, user=None, project=None):
-        kwargs = {'%s__privacy_level' % self.project_field: constants.PUBLIC}
-        queryset = self.filter(**kwargs)
-        if user:
-            queryset = self._add_user_repos(queryset, user)
-        if project:
-            queryset = queryset.filter(project=project)
-        return queryset.distinct()
-
-    def private(self, user=None, project=None):
-        kwargs = {
-            '%s__privacy_level' % self.project_field: constants.PRIVATE,
-        }
+        kwargs = {f'{self.project_field}__privacy_level': constants.PUBLIC}
         queryset = self.filter(**kwargs)
         if user:
             queryset = self._add_user_repos(queryset, user)

readthedocs/rtd_tests/tests/test_privacy.py

@@ -1,6 +1,6 @@
 import logging
-
 from unittest import mock
+
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -10,7 +10,6 @@
 from readthedocs.projects.forms import UpdateProjectForm
 from readthedocs.projects.models import Project
 
-
 log = logging.getLogger(__name__)
 
 
@@ -309,7 +308,7 @@ def test_public_download_filename(self):
         self.assertEqual(r._headers['x-accel-redirect'][1], '/proxito/media/htmlzip/django-kong/latest/django-kong.zip')
         self.assertEqual(r._headers['content-disposition'][1], 'filename=django-kong-readthedocs-io-en-latest.zip')
 
-# Build Filtering
+    # Build Filtering
 
     def test_build_filtering(self):
         kong = self._create_kong('public', 'private')
@@ -331,11 +330,3 @@ def test_build_filtering(self):
         self.client.login(username='tester', password='test')
         r = self.client.get('/projects/django-kong/builds/')
         self.assertNotContains(r, 'test-slug')
-
-    def test_queryset_chaining(self):
-        """Test that manager methods get set on related querysets."""
-        kong = self._create_kong('public', 'private')
-        self.assertEqual(
-            kong.versions.private().get(slug='latest').slug,
-            'latest',
-        )

readthedocs/rtd_tests/tests/test_version_querysets.py

@@ -130,35 +130,6 @@ def test_public_project(self):
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
 
-    def test_private(self):
-        query = Version.objects.private()
-        versions = {
-            self.version_private,
-            self.another_version_private,
-            self.shared_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_user(self):
-        query = Version.objects.private(user=self.user)
-        versions = (
-            self.user_versions |
-            {self.another_version_private}
-        )
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_project(self):
-        query = Version.objects.private(user=self.user, project=self.project)
-        versions = {
-            self.version,
-            self.version_latest,
-            self.version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
     def test_api(self):
         query = Version.objects.api()
         versions = {
@@ -178,22 +149,6 @@ def test_api_user(self):
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
 
-    def test_for_project(self):
-        self.another_project.main_language_project = self.project
-        self.another_project.save()
-
-        query = Version.objects.for_project(self.project)
-        versions = {
-            self.version,
-            self.version_latest,
-            self.version_private,
-            self.another_version,
-            self.another_version_latest,
-            self.another_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
 
 class TestVersionQuerySetWithManagerBase(TestVersionQuerySetBase):
 
@@ -303,35 +258,6 @@ def test_public_project(self):
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
 
-    def test_private(self):
-        query = Version.internal.private()
-        versions = {
-            self.version_private,
-            self.another_version_private,
-            self.shared_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_user(self):
-        query = Version.internal.private(user=self.user)
-        versions = (
-            self.user_versions |
-            {self.another_version_private}
-        )
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_project(self):
-        query = Version.internal.private(user=self.user, project=self.project)
-        versions = {
-            self.version,
-            self.version_latest,
-            self.version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
     def test_api(self):
         query = Version.internal.api()
         versions = {
@@ -351,22 +277,6 @@ def test_api_user(self):
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
 
-    def test_for_project(self):
-        self.another_project.main_language_project = self.project
-        self.another_project.save()
-
-        query = Version.internal.for_project(self.project)
-        versions = {
-            self.version,
-            self.version_latest,
-            self.version_private,
-            self.another_version,
-            self.another_version_latest,
-            self.another_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
 
 class VersionQuerySetWithExternalManagerTest(TestVersionQuerySetWithManagerBase):
 
@@ -420,37 +330,6 @@ def test_public_project(self):
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
 
-    def test_private(self):
-        query = Version.external.private()
-        versions = {
-            self.external_version_private,
-            self.another_external_version_private,
-            self.shared_external_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_user(self):
-        query = Version.external.private(user=self.user)
-        versions = {
-            self.external_version_public,
-            self.external_version_private,
-            self.another_external_version_private,
-            self.shared_external_version_public,
-            self.shared_external_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
-    def test_private_project(self):
-        query = Version.external.private(user=self.user, project=self.project)
-        versions = {
-            self.external_version_public,
-            self.external_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)
-
     def test_api(self):
         query = Version.external.api()
         versions = {
@@ -471,17 +350,3 @@ def test_api_user(self):
         }
         self.assertEqual(query.count(), len(versions))
         self.assertEqual(set(query), versions)
-
-    def test_for_project(self):
-        self.another_project.main_language_project = self.project
-        self.another_project.save()
-
-        query = Version.external.for_project(self.project)
-        versions = {
-            self.external_version_public,
-            self.external_version_private,
-            self.another_external_version_public,
-            self.another_external_version_private,
-        }
-        self.assertEqual(query.count(), len(versions))
-        self.assertEqual(set(query), versions)