Skip to content

Commit 8845990

Browse files
committed
removed name filter
1 parent 8047529 commit 8845990

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

care/emr/api/viewsets/organization.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from django.db.models import Q, Value
2-
from django.db.models.functions import Concat
1+
from django.db.models import Q
32
from django_filters import rest_framework as filters
43
from rest_framework.decorators import action
54
from rest_framework.exceptions import PermissionDenied, ValidationError
@@ -200,25 +199,11 @@ def mine(self, request, *args, **kwargs):
200199

201200

202201
class OrganizationUserFilter(filters.FilterSet):
203-
name = filters.CharFilter(method="filter_name")
204202
phone_number = filters.CharFilter(
205203
field_name="user__phone_number", lookup_expr="iexact"
206204
)
207205
username = filters.CharFilter(field_name="user__username", lookup_expr="icontains")
208206

209-
def filter_name(self, queryset, name, value):
210-
value = value.strip()
211-
212-
queryset = queryset.annotate(
213-
full_name=Concat("user__first_name", Value(" "), "user__last_name")
214-
)
215-
216-
return queryset.filter(
217-
Q(full_name__icontains=value)
218-
| Q(user__first_name__icontains=value)
219-
| Q(user__last_name__icontains=value)
220-
)
221-
222207

223208
class OrganizationUsersViewSet(EMRModelViewSet):
224209
database_model = OrganizationUser

0 commit comments

Comments
 (0)