Update queryset references in views to avoid cached results (#2582)

* update queryset references in views to avoid cached results * fix
ohcnetwork · Nov 6, 2024 · d6d069e · d6d069e
1 parent 5cba13c
commit d6d069e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/care/facility/api/viewsets/mixins/access.py b/care/facility/api/viewsets/mixins/access.py
@@ -5,7 +5,7 @@
 
 class UserAccessMixin:
     def get_queryset(self):
-        queryset = self.queryset
+        queryset = super().get_queryset()
         model = self.queryset.__dict__["model"]
 
         if not self.request.user.is_superuser:

diff --git a/care/facility/api/viewsets/patient_consultation.py b/care/facility/api/viewsets/patient_consultation.py
@@ -82,8 +82,9 @@ def get_permissions(self):
         return super().get_permissions()
 
     def get_queryset(self):
+        queryset = super().get_queryset()
         if self.serializer_class == PatientConsultationSerializer:
-            self.queryset = self.queryset.prefetch_related(
+            queryset = queryset.prefetch_related(
                 "assigned_to",
                 Prefetch(
                     "assigned_to__skills",
@@ -95,13 +96,11 @@ def get_queryset(self):
                 "current_bed__assets__current_location",
             )
         if self.request.user.is_superuser:
-            return self.queryset
+            return queryset
         if self.request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
-            return self.queryset.filter(
-                patient__facility__state=self.request.user.state
-            )
+            return queryset.filter(patient__facility__state=self.request.user.state)
         if self.request.user.user_type >= User.TYPE_VALUE_MAP["DistrictLabAdmin"]:
-            return self.queryset.filter(
+            return queryset.filter(
                 patient__facility__district=self.request.user.district
             )
         allowed_facilities = get_accessible_facilities(self.request.user)
@@ -111,7 +110,7 @@ def get_queryset(self):
         )
         # A user should be able to see all consultations part of their home facility
         applied_filters |= Q(facility=self.request.user.home_facility)
-        return self.queryset.filter(applied_filters)
+        return queryset.filter(applied_filters)
 
     @transaction.non_atomic_requests
     def create(self, request, *args, **kwargs) -> Response:

diff --git a/care/facility/api/viewsets/patient_external_test.py b/care/facility/api/viewsets/patient_external_test.py
@@ -95,7 +95,7 @@ class PatientExternalTestViewSet(
     parser_classes = (MultiPartParser, FormParser, JSONParser)
 
     def get_queryset(self):
-        queryset = self.queryset
+        queryset = super().get_queryset()
         if not self.request.user.is_superuser:
             if self.request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:
                 queryset = queryset.filter(district__state=self.request.user.state)

diff --git a/care/facility/api/viewsets/patient_otp_data.py b/care/facility/api/viewsets/patient_otp_data.py
@@ -18,7 +18,7 @@ class OTPPatientDataViewSet(RetrieveModelMixin, ListModelMixin, GenericViewSet):
 
     def get_queryset(self):
         is_otp_login = getattr(self.request.user, "is_alternative_login", False)
-        queryset = self.queryset
+        queryset = super().get_queryset()
         if is_otp_login:
             queryset = queryset.filter(phone_number=self.request.user.phone_number)
         else:

diff --git a/care/facility/api/viewsets/shifting.py b/care/facility/api/viewsets/shifting.py
@@ -109,16 +109,17 @@ class ShiftingViewSet(
     filterset_class = ShiftingFilterSet
 
     def get_queryset(self) -> QuerySet:
+        queryset = super().get_queryset()
         if self.action == "list":
-            self.queryset = self.queryset.select_related(
+            queryset = queryset.select_related(
                 "origin_facility",
                 "shifting_approving_facility",
                 "assigned_facility",
                 "patient",
             )
 
         else:
-            self.queryset = self.queryset.select_related(
+            queryset = queryset.select_related(
                 "origin_facility",
                 "origin_facility__ward",
                 "origin_facility__local_body",
@@ -148,7 +149,7 @@ def get_queryset(self) -> QuerySet:
                 "created_by",
                 "last_edited_by",
             )
-        return self.queryset
+        return queryset
 
     def get_serializer_class(self):
         serializer_class = self.serializer_class

diff --git a/care/users/api/viewsets/users.py b/care/users/api/viewsets/users.py
@@ -125,7 +125,7 @@ class UserViewSet(
 
     def get_queryset(self):
         if self.request.user.is_superuser:
-            return self.queryset
+            return super().get_queryset()
         query = Q(id=self.request.user.id)
         if self.request.user.user_type >= User.TYPE_VALUE_MAP["StateReadOnlyAdmin"]:
             query |= Q(
@@ -178,7 +178,7 @@ def getcurrentuser(self, request):
         )
 
     def destroy(self, request, *args, **kwargs):
-        queryset = self.queryset
+        queryset = self.get_queryset()
         username = kwargs["username"]
         if request.user.is_superuser:
             pass