API: separate querysets from API V2 and V3

readthedocs/api/v2/views/model_views.py

@@ -163,7 +163,7 @@ def get_queryset(self):
         api_key = getattr(self.request, "build_api_key", None)
         if api_key:
             return self.get_queryset_for_api_key(api_key)
-        return self.model.objects.api(self.request.user)
+        return self.model.objects.api_v2(self.request.user)
 
 
 class ProjectViewSet(DisableListEndpoint, UpdateModelMixin, UserSelectViewSet):
@@ -417,7 +417,7 @@ class RemoteOrganizationViewSet(viewsets.ReadOnlyModelViewSet):
 
     def get_queryset(self):
         return (
-            self.model.objects.api(self.request.user)
+            self.model.objects.api_v2(self.request.user)
             .filter(
                 remote_organization_relations__account__provider__in=[
                     service.adapter.provider_id for service in registry
@@ -439,7 +439,7 @@ def get_queryset(self):
             return self.model.objects.none()
 
         # TODO: Optimize this query after deployment
-        query = self.model.objects.api(self.request.user).annotate(
+        query = self.model.objects.api_v2(self.request.user).annotate(
             admin=Case(
                 When(
                     remote_repository_relations__user=self.request.user,

readthedocs/api/v3/tests/mixins.py

@@ -147,6 +147,7 @@ def setUp(self):
             has_pdf=True,
             has_epub=True,
             has_htmlzip=True,
+            privacy_level=PUBLIC,
         )
 
         self.organization = fixture.get(

readthedocs/builds/querysets.py

@@ -119,6 +119,11 @@ def public(
     def api(self, user=None):
         return self.public(user, only_active=False)
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
     def for_reindex(self):
         """
         Get all versions that can be reindexed.
@@ -205,6 +210,11 @@ def public(self, user=None, project=None):
     def api(self, user=None):
         return self.public(user)
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
     def concurrent(self, project):
         """
         Check if the max build concurrency for this project was reached.
@@ -305,3 +315,8 @@ def public(self, user=None):
 
     def api(self, user=None):
         return self.public(user)
+
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)

readthedocs/oauth/querysets.py

@@ -16,6 +16,11 @@ def api(self, user=None):
             return self.none()
         return self.filter(users=user)
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
 
 class RemoteRepositoryQuerySet(RelatedUserQuerySet):
     def for_project_linking(self, user):

readthedocs/projects/querysets.py

@@ -156,6 +156,11 @@ def dashboard(self, user):
     def api(self, user=None):
         return self.public(user)
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
     def single_owner(self, user):
         """
         Returns projects where `user` is the only owner.
@@ -213,6 +218,11 @@ def public(self, user=None, project=None):
     def api(self, user=None):
         return self.public(user)
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
 
 class ParentRelatedProjectQuerySet(RelatedProjectQuerySet):
     project_field = "parent"

readthedocs/redirects/querysets.py

@@ -40,6 +40,11 @@ def api(self, user=None):
             queryset = self._add_from_user_projects(queryset, user)
         return queryset
 
+    def api_v2(self, *args, **kwargs):
+        # API v2 is the same as API v3 for .org, but it's
+        # different for .com, this method is overridden there.
+        return self.api(*args, **kwargs)
+
     def get_matching_redirect_with_path(
         self, filename, path=None, language=None, version_slug=None, forced_only=False
     ):