chore: add filters + rework display of roles #198

SELab-2 · Apr 7, 2024 · 86c422b · 86c422b
1 parent 0e83335
commit 86c422b
Show file tree

Hide file tree

Showing 4 changed files with 159 additions and 152 deletions.
diff --git a/backend/api/views/user_view.py b/backend/api/views/user_view.py
@@ -23,14 +23,26 @@ def search(self, request: Request) -> Response:
         self.pagination_class = BasicPagination
 
         search = request.query_params.get("search", "")
+        identifier = request.query_params.get("id", "")
         username = request.query_params.get("username", "")
         email = request.query_params.get("email", "")
 
+        queryset1 = self.get_queryset().filter(
+            id__icontains=search
+        )
+        queryset2 = self.get_queryset().filter(
+            username__icontains=search
+        )
+        queryset3 = self.get_queryset().filter(
+            email__icontains=search
+        )
+        queryset1 = queryset1.union(queryset2, queryset3)
         queryset = self.get_queryset().filter(
-            id__icontains=search,
+            id__icontains=identifier,
             username__icontains=username,
             email__icontains=email
         )
+        queryset = queryset.intersection(queryset1)
 
         serializer = self.serializer_class(self.paginate_queryset(queryset), many=True, context={
             "request": request

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/types/filter/Filter.ts b/frontend/src/types/filter/Filter.ts
@@ -1,5 +1,6 @@
 export const USER_FILTER = {
     search: '',
+    id: '',
     username: '',
     email: ''
 };