made neccessary changes for prefetching the skills

care/facility/api/viewsets/facility_users.py

@@ -1,3 +1,4 @@
+from django.core.exceptions import ObjectDoesNotExist
 from django_filters import rest_framework as filters
 from rest_framework import mixins
 from rest_framework.exceptions import ValidationError
@@ -10,8 +11,10 @@
 
 
 class UserFilter(filters.FilterSet):
-    user_type = filters.TypedChoiceFilter(choices=[(key, key) for key in User.TYPE_VALUE_MAP.keys()],
-                                          coerce=lambda role: User.TYPE_VALUE_MAP[role])
+    user_type = filters.TypedChoiceFilter(
+        choices=[(key, key) for key in User.TYPE_VALUE_MAP.keys()],
+        coerce=lambda role: User.TYPE_VALUE_MAP[role],
+    )
 
     class Meta:
         model = User
@@ -27,7 +30,11 @@ class FacilityUserViewSet(GenericViewSet, mixins.ListModelMixin):
 
     def get_queryset(self):
         try:
-            facility = Facility.objects.get(external_id=self.kwargs.get("facility_external_id"))
-            return facility.users.filter(deleted=False).order_by("-last_login")
-        except:
+            facility = Facility.objects.get(
+                external_id=self.kwargs.get("facility_external_id")
+            )
+            queryset = facility.users.filter(deleted=False).order_by("-last_login")
+            queryset = self.get_serializer_class().skills_eager_loading(queryset)
+            return queryset
+        except ObjectDoesNotExist:
             raise ValidationError({"Facility": "Facility not found"})

care/facility/api/viewsets/patient_consultation.py

@@ -1,4 +1,5 @@
 from django.core.validators import validate_email
+from django.db.models import Prefetch
 from django.db.models.query_utils import Q
 from django_filters import rest_framework as filters
 from drf_yasg import openapi
@@ -25,7 +26,7 @@
     email_discharge_summary,
     generate_and_upload_discharge_summary_task,
 )
-from care.users.models import User
+from care.users.models import Skill, User
 from care.utils.cache.cache_allowed_facilities import get_accessible_facilities
 
 
@@ -68,6 +69,14 @@ def get_permissions(self):
         return super().get_permissions()
 
     def get_queryset(self):
+        if self.serializer_class == PatientConsultationSerializer:
+            self.queryset = self.queryset.prefetch_related(
+                "assigned_to",
+                Prefetch(
+                    "assigned_to__skills",
+                    queryset=Skill.objects.filter(userskill__deleted=False),
+                ),
+            )
         if self.request.user.is_superuser:
             return self.queryset
         elif self.request.user.user_type >= User.TYPE_VALUE_MAP["StateLabAdmin"]:

care/users/api/serializers/user.py

@@ -3,6 +3,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.hashers import make_password
 from django.db import transaction
+from django.db.models import Prefetch
 from rest_framework import exceptions, serializers
 
 from care.facility.api.serializers.facility import FacilityBareMinimumSerializer
@@ -13,7 +14,7 @@
     StateSerializer,
 )
 from care.users.api.serializers.skill import SkillSerializer
-from care.users.models import GENDER_CHOICES
+from care.users.models import GENDER_CHOICES, Skill
 from care.utils.queryset.facility import get_home_facility_queryset
 from care.utils.serializer.external_id_field import ExternalIdSerializerField
 from care.utils.serializer.phonenumber_ispossible_field import (
@@ -358,11 +359,20 @@ class UserAssignedSerializer(serializers.ModelSerializer):
     home_facility_object = FacilityBareMinimumSerializer(
         source="home_facility", read_only=True
     )
-    skills = serializers.SerializerMethodField()
-
-    def get_skills(self, obj):
-        qs = obj.skills.filter(userskill__deleted=False)
-        return SkillSerializer(qs, many=True).data
+    # skills = serializers.SerializerMethodField()
+    skills = SkillSerializer(many=True, read_only=True)
+
+    # def get_skills(self, obj):
+    #     qs = obj.skills.filter(userskill__deleted=False)
+    #     return SkillSerializer(qs, many=True).data
+
+    @staticmethod
+    def skills_eager_loading(queryset):
+        """Perform necessary eager loading of data."""
+        queryset = queryset.prefetch_related(
+            Prefetch("skills", queryset=Skill.objects.filter(userskill__deleted=False))
+        )
+        return queryset
 
     class Meta:
         model = User