Skip to content

Commit 717ea34

Browse files
committed
getOnlineUsers with Alt Phone
1 parent fd845b0 commit 717ea34

1 file changed

Lines changed: 13 additions & 17 deletions

File tree

care/facility/api/viewsets/facility.py

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
from django.conf import settings
2-
from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector
3-
from django.db import transaction
4-
from django.db.models.query_utils import Q
52
from django_filters import rest_framework as filters
63
from djqscsv import render_to_csv_response
74
from dry_rest_permissions.generics import DRYPermissionFiltersBase, DRYPermissions
@@ -10,24 +7,17 @@
107
from rest_framework.decorators import action
118
from rest_framework.permissions import IsAuthenticated
129
from rest_framework.response import Response
13-
from simple_history.utils import bulk_create_with_history
1410

15-
from care.facility.api.serializers.facility import (
16-
FacilityBasicInfoSerializer,
17-
FacilitySerializer,
18-
)
19-
from care.facility.api.serializers.patient import PatientListSerializer
11+
from care.facility.api.serializers.facility import FacilityBasicInfoSerializer, FacilitySerializer
2012
from care.facility.models import (
2113
Facility,
2214
FacilityCapacity,
2315
FacilityPatientStatsHistory,
2416
HospitalDoctors,
2517
PatientRegistration,
26-
facility,
2718
)
28-
from care.users.api.serializers.user import UserBaseMinimumSerializer
19+
from care.users.api.serializers.user import UserAssignedSerializer
2920
from care.users.models import User
30-
from config.utils import get_psql_search_tokens
3121

3222

3323
class FacilityFilter(filters.FilterSet):
@@ -71,7 +61,11 @@ class FacilityViewSet(
7161
IsAuthenticated,
7262
DRYPermissions,
7363
)
74-
filter_backends = (FacilityQSPermissions, filters.DjangoFilterBackend, drf_filters.SearchFilter)
64+
filter_backends = (
65+
FacilityQSPermissions,
66+
filters.DjangoFilterBackend,
67+
drf_filters.SearchFilter,
68+
)
7569
filterset_class = FacilityFilter
7670
lookup_field = "external_id"
7771

@@ -93,7 +87,8 @@ def destroy(self, request, *args, **kwargs):
9387
return super().destroy(request, *args, **kwargs)
9488
else:
9589
return Response(
96-
{"facility": "cannot delete facility with active patients"}, status=status.HTTP_403_FORBIDDEN
90+
{"facility": "cannot delete facility with active patients"},
91+
status=status.HTTP_403_FORBIDDEN,
9792
)
9893
return Response({"permission": "denied"}, status=status.HTTP_403_FORBIDDEN)
9994

@@ -128,17 +123,18 @@ def get_users(self, request, external_id):
128123
if user_type_filter:
129124
users = users.filter(user_type=user_type_filter)
130125
users = users.order_by("-last_login")
131-
data = UserBaseMinimumSerializer(users, many=True)
126+
data = UserAssignedSerializer(users, many=True)
132127
return Response(data.data)
133128

134129

135130
class AllFacilityViewSet(
136-
mixins.RetrieveModelMixin, mixins.ListModelMixin, viewsets.GenericViewSet,
131+
mixins.RetrieveModelMixin,
132+
mixins.ListModelMixin,
133+
viewsets.GenericViewSet,
137134
):
138135
queryset = Facility.objects.all().select_related("local_body", "district", "state")
139136
serializer_class = FacilityBasicInfoSerializer
140137
filter_backends = (filters.DjangoFilterBackend, drf_filters.SearchFilter)
141138
filterset_class = FacilityFilter
142139
lookup_field = "external_id"
143140
search_fields = ["name", "district__name", "state__name"]
144-

0 commit comments

Comments
 (0)