Rename model and related manager objects to query

Author: davegaeddert

demos/full/tests/test_urls.py

@@ -9,7 +9,7 @@ def test_admin_access(db):
     # Login required
     assert client.get("/admin/").status_code == 302
 
-    user = User.objects.create(email="admin@example.com", password="strongpass1")
+    user = User.query.create(email="admin@example.com", password="strongpass1")
     client.force_login(user)
 
     # Not admin yet

plain-admin/plain/admin/cards/charts.py

@@ -61,7 +61,7 @@ def get_trend_data(self) -> list[int | float]:
             iterator = datetime_range.iter_months
 
         counts_by_date = (
-            self.model.objects.filter(**filter_kwargs)
+            self.model.query.filter(**filter_kwargs)
             .annotate(chart_date=truncator(self.datetime_field))
             .values("chart_date")
             .annotate(chart_date_count=Count("id"))

plain-admin/plain/admin/impersonate/middleware.py

@@ -9,7 +9,7 @@ def get_user_by_id(id):
     UserModel = get_user_model()
 
     try:
-        return UserModel.objects.get(id=id)
+        return UserModel.query.get(id=id)
     except UserModel.DoesNotExist:
         return None
 

plain-admin/plain/admin/views/models.py

@@ -100,7 +100,7 @@ def get_objects(self):
     def get_initial_queryset(self):
         # Separate override for the initial queryset
         # so that annotations can be added BEFORE order_by, etc.
-        return self.model.objects.all()
+        return self.model.query.all()
 
     def order_queryset(self, queryset):
         if order_by := self.request.query_params.get("order_by"):
@@ -187,7 +187,7 @@ def get_field_value(self, obj, field: str):
             return get_model_field(obj, field)
 
     def get_object(self):
-        return self.model.objects.get(id=self.url_kwargs["id"])
+        return self.model.query.get(id=self.url_kwargs["id"])
 
 
 class AdminModelCreateView(AdminCreateView):
@@ -227,7 +227,7 @@ def get_path(cls) -> str:
         return f"{cls.model._meta.model_name}/<int:id>/update/"
 
     def get_object(self):
-        return self.model.objects.get(id=self.url_kwargs["id"])
+        return self.model.query.get(id=self.url_kwargs["id"])
 
 
 class AdminModelDeleteView(AdminDeleteView):
@@ -244,4 +244,4 @@ def get_path(cls) -> str:
         return f"{cls.model._meta.model_name}/<int:id>/delete/"
 
     def get_object(self):
-        return self.model.objects.get(id=self.url_kwargs["id"])
+        return self.model.query.get(id=self.url_kwargs["id"])

plain-admin/tests/test_admin.py

@@ -9,7 +9,7 @@ def test_admin_login_required(db):
     # Login required
     assert client.get("/admin/").status_code == 302
 
-    user = User.objects.create(username="test")
+    user = User.query.create(username="test")
     client.force_login(user)
 
     # Not admin yet

plain-api/plain/api/README.md

@@ -58,7 +58,7 @@ class PullRequestView(BaseAPIView):
     def get(self):
         try:
             pull = (
-                PullRequest.objects.all()
+                PullRequest.query.all()
                 .visible_to_user(self.request.user)
                 .get(uuid=self.url_kwargs["uuid"])
             )
@@ -124,7 +124,7 @@ class PullRequestView(BaseAPIView):
     def get(self):
         try:
             pull = (
-                PullRequest.objects.all()
+                PullRequest.query.all()
                 .visible_to_user(self.request.user)
                 .get(uuid=self.url_kwargs["uuid"])
             )
@@ -176,7 +176,7 @@ class PullRequestView(BaseAPIView):
     def delete(self):
         try:
             pull = (
-                PullRequest.objects.all()
+                PullRequest.query.all()
                 .visible_to_user(self.request.user)
                 .get(uuid=self.url_kwargs["uuid"])
             )
@@ -224,8 +224,8 @@ class User(models.Model):
 Generating API keys is something you will need to do in your own code, wherever it makes sense to do so.
 
 ```python
-user = User.objects.first()
-user.api_key = APIKey.objects.create()
+user = User.query.first()
+user.api_key = APIKey.query.create()
 user.save()
 ```
 
@@ -321,12 +321,12 @@ class TeamAccountAPIView(BaseAPIView):
     def team_account(self):
         try:
             if self.organization:
-                return TeamAccount.objects.get(
+                return TeamAccount.query.get(
                     team__organization=self.organization, uuid=self.url_kwargs["uuid"]
                 )
 
             if self.request.user:
-                return TeamAccount.objects.get(
+                return TeamAccount.query.get(
                     team__organization__in=self.request.user.organizations.all(),
                     uuid=self.url_kwargs["uuid"],
                 )

plain-api/plain/api/views.py

@@ -79,7 +79,7 @@ def get_api_key(self):
                 )
 
             try:
-                api_key = APIKey.objects.get(token=header_token)
+                api_key = APIKey.query.get(token=header_token)
             except APIKey.DoesNotExist:
                 raise ResponseException(
                     JsonResponse(

plain-auth/plain/auth/sessions.py

@@ -115,7 +115,7 @@ def get_user(request):
 
     UserModel = get_user_model()
     try:
-        user = UserModel.objects.get(id=request.session[USER_ID_SESSION_KEY])
+        user = UserModel.query.get(id=request.session[USER_ID_SESSION_KEY])
     except UserModel.DoesNotExist:
         return None
 

plain-auth/tests/test_views.py

@@ -22,7 +22,7 @@ def test_admin_required(db):
     # login required first
     assert client.get("/admin/").status_code == 302
 
-    user = get_user_model().objects.create(username="user")
+    user = get_user_model().query.create(username="user")
     client.force_login(user)
     # not admin -> 404
     assert client.get("/admin/").status_code == 404

plain-cache/plain/cache/chores.py

@@ -8,5 +8,5 @@ def clear_expired():
     """
     Delete cache items that have expired.
     """
-    result = CachedItem.objects.expired().delete()
+    result = CachedItem.query.expired().delete()
     return f"{result[0]} expired cache items deleted"