filter facility users by search fields

ohcnetwork · Nov 27, 2024 · b0067fd · b0067fd
1 parent 7c6ee37
commit b0067fd
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/care/facility/api/viewsets/facility_users.py b/care/facility/api/viewsets/facility_users.py
@@ -16,7 +16,6 @@ class UserFilter(filters.FilterSet):
         choices=[(key, key) for key in User.TYPE_VALUE_MAP],
         coerce=lambda role: User.TYPE_VALUE_MAP[role],
     )
-    username = filters.CharFilter(field_name="username", lookup_expr="icontains")
 
     class Meta:
         model = User
@@ -36,12 +35,21 @@ class FacilityUserViewSet(GenericViewSet, mixins.ListModelMixin):
 
     def get_queryset(self):
         try:
+            search_fields = {
+                key: self.request.query_params.get(key)
+                for key in self.search_fields
+                if self.request.query_params.get(key)
+            }
             facility = Facility.objects.get(
                 external_id=self.kwargs.get("facility_external_id"),
             )
             queryset = facility.users.filter(
                 deleted=False,
             ).order_by("-last_login")
+            if search_fields:
+                queryset = queryset.filter(
+                    **{key: value for key, value in search_fields.items() if value}
+                )
             return queryset.prefetch_related(
                 Prefetch(
                     "skills",