|
1 |
| -from django.db.models import Q, Value |
2 |
| -from django.db.models.functions import Concat |
| 1 | +from django.db.models import Q |
3 | 2 | from django_filters import rest_framework as filters
|
4 | 3 | from rest_framework.decorators import action
|
5 | 4 | from rest_framework.exceptions import PermissionDenied, ValidationError
|
@@ -200,25 +199,11 @@ def mine(self, request, *args, **kwargs):
|
200 | 199 |
|
201 | 200 |
|
202 | 201 | class OrganizationUserFilter(filters.FilterSet):
|
203 |
| - name = filters.CharFilter(method="filter_name") |
204 | 202 | phone_number = filters.CharFilter(
|
205 | 203 | field_name="user__phone_number", lookup_expr="iexact"
|
206 | 204 | )
|
207 | 205 | username = filters.CharFilter(field_name="user__username", lookup_expr="icontains")
|
208 | 206 |
|
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 |
| - |
222 | 207 |
|
223 | 208 | class OrganizationUsersViewSet(EMRModelViewSet):
|
224 | 209 | database_model = OrganizationUser
|
|
0 commit comments