#846 [Admin] Fix pagination

BackEnd/administration/filters.py

@@ -32,7 +32,6 @@ def filter_is_deleted(self, queryset, name, value):
 
     ordering = filters.OrderingFilter(
         fields=(
-            ("id", "id"),
             ("name", "name"),
             ("surname", "surname"),
             ("email", "email"),

BackEnd/administration/pagination.py

@@ -4,6 +4,7 @@
 
 class ListPagination(PageNumberPagination):
     page_size_query_param = "page_size"
+    page_size = 20
 
     def get_paginated_response(self, data):
         return Response(

BackEnd/administration/tests/test_admin_profiles.py

@@ -75,7 +75,7 @@ def test_get_profiles_structure_json(self):
             }
         ]
         self.assertEqual(status.HTTP_200_OK, response.status_code)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
     def test_get_profile_id_authenticated(self):
         self.client.force_authenticate(self.user)

BackEnd/administration/tests/test_admin_user.py

@@ -29,45 +29,9 @@ def setUp(self):
         AdminUserFactory.reset_sequence(1)
         self.user = self.users[0]
 
-    def test_get_users_ordering_desc(self):
+    def test_get_users_ordering_default(self):
         self.client.force_authenticate(self.user)
-        response = self.client.get(path="/api/admin/users/?ordering=-id")
-        data = [
-            {
-                "id": 3,
-                "email": "test3@test.com",
-                "name": "Test person 3",
-                "surname": "Test person 3 surname",
-                "status": {
-                    "is_active": True,
-                    "is_staff": True,
-                    "is_superuser": False,
-                    "is_deleted": False,
-                },
-                "company_name": None,
-                "registration_date": None,
-            },
-            {
-                "id": 2,
-                "email": "test2@test.com",
-                "name": "Test person 2",
-                "surname": "Test person 2 surname",
-                "status": {
-                    "is_active": True,
-                    "is_staff": True,
-                    "is_superuser": False,
-                    "is_deleted": False,
-                },
-                "company_name": None,
-                "registration_date": None,
-            },
-        ]
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
-
-    def test_get_users_ordering_asc(self):
-        self.client.force_authenticate(self.user)
-        response = self.client.get(path="/api/admin/users/?ordering=id")
+        response = self.client.get(path="/api/admin/users/")
         data = [
             {
                 "id": 2,
@@ -99,7 +63,7 @@ def test_get_users_ordering_asc(self):
             },
         ]
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
     def test_get_users_filter_id_surname(self):
         self.client.force_authenticate(self.user)
@@ -121,7 +85,7 @@ def test_get_users_filter_id_surname(self):
             },
         ]
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
 
 class TestAdminUsersStatusAPITests(APITestCase):
@@ -166,7 +130,7 @@ def test_get_users_filter_status_active_staff(self):
             },
         ]
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
     def test_get_users_filter_status_superuser_staff_active(self):
         self.client.force_authenticate(self.user)
@@ -175,7 +139,7 @@ def test_get_users_filter_status_superuser_staff_active(self):
         )
         data = []
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
 
 class TestAdminUsersAPITests(APITestCase):
@@ -211,11 +175,11 @@ def test_get_users_authenticated(self):
             }
         ]
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
-    def test_get_users_filter(self):
+    def test_get_users(self):
         self.client.force_authenticate(self.user)
-        response = self.client.get(path="/api/admin/users/?ordering=id")
+        response = self.client.get(path="/api/admin/users/")
         data = [
             {
                 "id": 2,
@@ -233,7 +197,7 @@ def test_get_users_filter(self):
             }
         ]
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(data, response.json())
+        self.assertEqual(data, response.data["results"])
 
     def test_get_user_id_authenticated(self):
         self.client.force_authenticate(self.user)

BackEnd/administration/views.py

@@ -55,9 +55,7 @@ class UsersListView(ListAPIView):
     serializer_class = AdminUserListSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_class = UsersFilter
-
-    def get_queryset(self):
-        return CustomUser.objects.select_related("profile")
+    queryset = CustomUser.objects.select_related("profile").order_by("id")
 
 
 class UserDetailView(RetrieveUpdateDestroyAPIView):