Skip to content

Commit fdaa7e3

Browse files
authored
chore: remove pagination warnings (SecObserve#4208)
1 parent 8a61da3 commit fdaa7e3

23 files changed

Lines changed: 33 additions & 33 deletions

backend/application/access_control/queries/api_token.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def get_api_tokens() -> QuerySet[API_Token_Multiple]:
1919
if user is None:
2020
return API_Token_Multiple.objects.none()
2121

22-
api_tokens = API_Token_Multiple.objects.all()
22+
api_tokens = API_Token_Multiple.objects.all().order_by("id")
2323

2424
if user.is_superuser:
2525
return api_tokens
@@ -33,7 +33,7 @@ def get_api_tokens_for_user(given_user: User) -> QuerySet[API_Token_Multiple]:
3333
if current_user is None:
3434
return API_Token_Multiple.objects.none()
3535

36-
api_tokens = API_Token_Multiple.objects.filter(user=given_user)
36+
api_tokens = API_Token_Multiple.objects.filter(user=given_user).order_by("id")
3737

3838
if current_user.is_superuser:
3939
return api_tokens

backend/application/access_control/queries/authorization_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def get_authorization_groups() -> QuerySet[Authorization_Group]:
1010
if user is None:
1111
return Authorization_Group.objects.none()
1212

13-
authorization_groups = Authorization_Group.objects.all()
13+
authorization_groups = Authorization_Group.objects.all().order_by("id")
1414

1515
if user.is_superuser:
1616
return authorization_groups

backend/application/access_control/queries/authorization_group_member.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_authorization_group_members() -> QuerySet[Authorization_Group_Member]:
2828
if user is None:
2929
return Authorization_Group_Member.objects.none()
3030

31-
authorization_group_members = Authorization_Group_Member.objects.all()
31+
authorization_group_members = Authorization_Group_Member.objects.all().order_by("id")
3232

3333
if user.is_superuser:
3434
return authorization_group_members

backend/application/access_control/queries/user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_users() -> QuerySet[User]:
3737
if user is None:
3838
return User.objects.none()
3939

40-
users = User.objects.all()
40+
users = User.objects.all().order_by("id")
4141

4242
if user.is_superuser or not user.is_external:
4343
return users
@@ -53,7 +53,7 @@ def get_users_without_api_tokens() -> QuerySet[User]:
5353
if user is None:
5454
return User.objects.none()
5555

56-
users = User.objects.exclude(username__startswith="-product-")
56+
users = User.objects.exclude(username__startswith="-product-").order_by("id")
5757

5858
if user.is_superuser:
5959
return users

backend/application/core/queries/branch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_branches(with_annotations: bool = False) -> QuerySet[Branch]:
3737
if user is None:
3838
return Branch.objects.none()
3939

40-
branches = Branch.objects.all()
40+
branches = Branch.objects.all().order_by("id")
4141
branches = _add_annotations(branches, with_annotations)
4242

4343
if not user.is_superuser:

backend/application/core/queries/component.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def get_components() -> QuerySet[Component]:
3030
if user is None:
3131
return Component.objects.none()
3232

33-
components = Component.objects.all()
33+
components = Component.objects.all().order_by("id")
3434

3535
if not user.is_superuser:
3636
product_members = Product_Member.objects.filter(product=OuterRef("product_id"), user=user)

backend/application/core/queries/observation.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def get_observations() -> QuerySet[Observation]:
3030
if user is None:
3131
return Observation.objects.none()
3232

33-
observations = Observation.objects.all()
33+
observations = Observation.objects.all().order_by("id")
3434

3535
if not user.is_superuser:
3636
product_members = Product_Member.objects.filter(product=OuterRef("product_id"), user=user)
@@ -87,7 +87,7 @@ def get_observations_for_vulnerability_check(
8787
upload_filename="",
8888
api_configuration_name="",
8989
origin_service__name=service,
90-
)
90+
).order_by("id")
9191

9292
return Observation.objects.filter(
9393
product=product,
@@ -96,7 +96,7 @@ def get_observations_for_vulnerability_check(
9696
upload_filename="",
9797
api_configuration_name="",
9898
origin_service__isnull=True,
99-
)
99+
).order_by("id")
100100

101101

102102
def get_evidences() -> QuerySet[Evidence]:
@@ -105,7 +105,7 @@ def get_evidences() -> QuerySet[Evidence]:
105105
if user is None:
106106
return Evidence.objects.none()
107107

108-
evidences = Evidence.objects.all()
108+
evidences = Evidence.objects.all().order_by("id")
109109

110110
if not user.is_superuser:
111111
product_members = Product_Member.objects.filter(product=OuterRef("observation__product_id"), user=user)
@@ -148,7 +148,7 @@ def get_potential_duplicates() -> QuerySet[Potential_Duplicate]:
148148
if user is None:
149149
return Potential_Duplicate.objects.none()
150150

151-
potential_duplicates = Potential_Duplicate.objects.all()
151+
potential_duplicates = Potential_Duplicate.objects.all().order_by("id")
152152

153153
if not user.is_superuser:
154154
product_members = Product_Member.objects.filter(product=OuterRef("observation__product_id"), user=user)
@@ -198,7 +198,7 @@ def get_observation_logs() -> QuerySet[Observation_Log]:
198198
if user is None:
199199
return Observation_Log.objects.none()
200200

201-
observation_logs = Observation_Log.objects.all()
201+
observation_logs = Observation_Log.objects.all().order_by("id")
202202

203203
if not user.is_superuser:
204204
product_members = Product_Member.objects.filter(product=OuterRef("observation__product_id"), user=user)

backend/application/core/queries/product.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def get_products(
6969
if user is None:
7070
return Product.objects.none()
7171

72-
products = Product.objects.all()
72+
products = Product.objects.all().order_by("id")
7373

7474
if is_product_group is not None:
7575
products = _add_annotations(products, is_product_group, with_observation_annotations, with_metrics_annotations)

backend/application/core/queries/product_member.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def get_product_members() -> QuerySet[Product_Member]:
2929
if user is None:
3030
return Product_Member.objects.none()
3131

32-
product_members = Product_Member.objects.exclude(user__username__startswith="-product-")
32+
product_members = Product_Member.objects.exclude(user__username__startswith="-product-").order_by("id")
3333

3434
if user.is_superuser:
3535
return product_members
@@ -53,7 +53,7 @@ def get_product_authorization_group_members() -> QuerySet[Product_Authorization_
5353
if user is None:
5454
return Product_Authorization_Group_Member.objects.none()
5555

56-
product_authorization_group_members = Product_Authorization_Group_Member.objects.all()
56+
product_authorization_group_members = Product_Authorization_Group_Member.objects.all().order_by("id")
5757

5858
if user.is_superuser:
5959
return product_authorization_group_members

backend/application/core/queries/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_services(with_annotations: bool = False) -> QuerySet[Service]:
3737
if user is None:
3838
return Service.objects.none()
3939

40-
services = Service.objects.all()
40+
services = Service.objects.all().order_by("id")
4141
services = _add_annotations(services, with_annotations)
4242

4343
if not user.is_superuser:

0 commit comments

Comments
 (0)