fix: n+1 query on users endpoint

apps/training/views.py

@@ -159,7 +159,8 @@ def get(self, request):
                     "user": BasicUserSerializer(requests[0].user).data,
                     "requests": BaseTrainingRequestSerializer(requests, many=True).data,
                     "last_session": requests[0].last_session,
-                } for requests in sorted_requests.values()
+                }
+                for requests in sorted_requests.values()
             ]
         )
 

apps/users/urls.py

@@ -7,7 +7,6 @@
     path("<int:cid>/", views.UserInstanceView.as_view()),
     path("<int:cid>/feedback/", views.UserFeedbackView.as_view()),
     path("simplified/", views.SimplifiedActiveUserListView.as_view()),
-    path("all/", views.AllUserListView.as_view()),
     path("newest/", views.NewestUserListView.as_view()),
     path("staff/", views.StaffListView.as_view()),
 ]

apps/users/views.py

@@ -26,7 +26,7 @@ def get(self, request):
         Get list of all active users sorted by first name.
         Sorted into home and visiting controllers.
         """
-        users = User.objects.filter(status=Status.ACTIVE).order_by("first_name")
+        users = User.objects.filter(status=Status.ACTIVE).prefetch_related("roles").order_by("first_name")
         if request.user.is_authenticated and request.user.is_staff:
             serializer = AuthenticatedUserSerializer
         else:
@@ -142,18 +142,6 @@ def get(self, request):
         )
 
 
-class AllUserListView(APIView):
-    permission_classes = [IsStaff]
-
-    def get(self, request):
-        """
-        Get list of all users sorted by first name.
-        """
-        users = User.objects.order_by("first_name")
-        serializer = AuthenticatedUserSerializer(users, many=True)
-        return Response(serializer.data)
-
-
 class NewestUserListView(APIView):
     def get(self, request):
         """