adding model caching and resolving n+1 issues

care/emr/api/viewsets/facility.py

@@ -84,7 +84,7 @@ class FacilityViewSet(EMRModelViewSet):
     filter_backends = [DjangoFilterBackend]
 
     def get_queryset(self):
-        qs = super().get_queryset()
+        qs = super().get_queryset().select_related("geo_organization")
         if self.request.user.is_superuser:
             return qs
         organization_ids = list(
@@ -217,4 +217,6 @@ class AllFacilityViewSet(EMRModelReadOnlyViewSet):
     search_fields = ["name"]
 
     def get_queryset(self):
-        return Facility.objects.filter(is_public=True).select_related()
+        return Facility.objects.filter(is_public=True).select_related(
+            "geo_organization"
+        )

care/emr/api/viewsets/location.py

@@ -176,14 +176,14 @@ def get_queryset(self):
     def organizations(self, request, *args, **kwargs):
         # AuthZ is controlled from the get_queryset method, no need to repeat
         instance = self.get_object()
-        encounter_organizations = FacilityLocationOrganization.objects.filter(
+        location_organizations = FacilityLocationOrganization.objects.filter(
             location=instance
         ).select_related("organization")
         data = [
             FacilityOrganizationReadSpec.serialize(
-                encounter_organization.organization
+                location_organization.organization
             ).to_json()
-            for encounter_organization in encounter_organizations
+            for location_organization in location_organizations
         ]
         return Response({"results": data})
 

care/emr/api/viewsets/organization.py

@@ -325,4 +325,6 @@ def get_queryset(self):
             raise PermissionDenied(
                 "User does not have the required permissions to list users"
             )
-        return OrganizationUser.objects.filter(organization=organization)
+        return OrganizationUser.objects.filter(
+            organization=organization
+        ).select_related("role")

care/emr/api/viewsets/patient.py

@@ -15,6 +15,7 @@
 from care.emr.models import Organization, PatientUser, TokenBooking
 from care.emr.models.patient import Patient, PatientIdentifier, PatientIdentifierConfig
 from care.emr.models.scheduling.token import Token
+from care.emr.resources.base import model_from_cache
 from care.emr.resources.patient.spec import (
     PatientCreateSpec,
     PatientIdentifierConfigRequest,
@@ -90,11 +91,7 @@ def validate_data(self, instance, model_obj=None):
                 raise ValidationError("Year of birth cannot be after the year of death")
 
     def get_queryset(self):
-        qs = (
-            super()
-            .get_queryset()
-            .select_related("created_by", "updated_by", "geo_organization")
-        )
+        qs = super().get_queryset().select_related("geo_organization")
         if self.action != "list":
             patient = get_object_or_404(
                 Patient, external_id=self.kwargs.get("external_id")
@@ -200,7 +197,9 @@ def search(self, request, *args, **kwargs):
         if not request_data.phone_number and not request_data.config:
             raise ValidationError("Either phone number or config is required")
         if request_data.phone_number:
-            queryset = Patient.objects.filter(phone_number=request_data.phone_number)
+            queryset = Patient.objects.filter(
+                phone_number=request_data.phone_number
+            ).select_related("geo_organization")
             partial = True
         else:
             config_queryset = PatientIdentifierConfig.objects.filter(
@@ -243,7 +242,7 @@ def search(self, request, *args, **kwargs):
 
             queryset = Patient.objects.filter(
                 id__in=identifier_queryset.values("patient_id")
-            )
+            ).select_related("geo_organization")
 
             if config.config.get("retrieve_config", {}).get(
                 "retrieve_with_year_of_birth"
@@ -268,7 +267,9 @@ class SearchRetrieveRequestSpec(BaseModel):
     @action(detail=False, methods=["POST"])
     def search_retrieve(self, request, *args, **kwargs):
         request_data = self.SearchRetrieveRequestSpec(**request.data)
-        queryset = Patient.objects.filter(phone_number=request_data.phone_number)
+        queryset = Patient.objects.filter(
+            phone_number=request_data.phone_number
+        ).select_related("geo_organization")
         queryset = queryset.filter(year_of_birth=request_data.year_of_birth)
         for patient in queryset:
             if str(patient.external_id)[:5] == request_data.partial_id:
@@ -285,7 +286,7 @@ def get_users(self, request, *args, **kwargs):
         patient = self.get_object()
         patient_users = PatientUser.objects.filter(patient=patient)
         data = [
-            UserSpec.serialize(patient_user.user).to_json()
+            model_from_cache(UserSpec, id=patient_user.user_id)
             for patient_user in patient_users
         ]
         return Response({"results": data})
@@ -305,7 +306,7 @@ def add_user(self, request, *args, **kwargs):
         if PatientUser.objects.filter(user=user, patient=patient).exists():
             raise ValidationError("User already exists")
         PatientUser.objects.create(user=user, patient=patient, role=role)
-        return Response(UserSpec.serialize(user).to_json())
+        return Response(model_from_cache(UserSpec, id=user.id))
 
     class PatientUserDeleteSpec(BaseModel):
         user: UUID4

care/emr/api/viewsets/scheduling/availability.py

@@ -253,7 +253,7 @@ def get_slots_for_day_handler(
             start_datetime__date=request_data.day,
             end_datetime__date=request_data.day,
             resource=resource,
-        )
+        ).select_related("availability")
         if is_public is True:
             created_slots = created_slots.filter(availability__schedule__is_public=True)
         for slot in created_slots:

care/emr/api/viewsets/scheduling/booking.py

@@ -29,6 +29,7 @@
 )
 from care.emr.models.scheduling import SchedulableResource, TokenBooking
 from care.emr.models.scheduling.token import Token, TokenCategory, TokenQueue
+from care.emr.resources.base import model_from_cache
 from care.emr.resources.charge_item.handle_charge_item_cancel import (
     handle_charge_item_cancel,
 )
@@ -277,7 +278,7 @@ def available_users(self, request, *args, **kwargs):
         return Response(
             {
                 "users": [
-                    UserSpec.serialize(user_resource.user).to_json()
+                    model_from_cache(UserSpec, id=user_resource.user_id)
                     for user_resource in user_resources
                 ]
             }

care/emr/resources/allergy_intolerance/spec.py

@@ -8,7 +8,6 @@
 from care.emr.resources.allergy_intolerance.valueset import CARE_ALLERGY_CODE_VALUESET
 from care.emr.resources.base import EMRResource
 from care.emr.resources.common.coding import Coding
-from care.emr.resources.user.spec import UserSpec
 from care.emr.utils.valueset_coding_type import ValueSetBoundCoding
 
 
@@ -134,9 +133,6 @@ class AllergyIntoleranceReadSpec(BaseAllergyIntoleranceSpec):
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
         mapping["id"] = obj.external_id
-        if obj.created_by:
-            mapping["created_by"] = UserSpec.serialize(obj.created_by)
-        if obj.updated_by:
-            mapping["updated_by"] = UserSpec.serialize(obj.updated_by)
+        cls.serialize_audit_users(mapping, obj)
         if obj.encounter:
             mapping["encounter"] = obj.encounter.external_id

care/emr/resources/base.py

@@ -162,9 +162,9 @@ def to_json(self):
     def serialize_audit_users(cls, mapping, obj):
         from care.emr.resources.user.spec import UserSpec
 
-        if obj.created_by_id:
+        if hasattr(obj, "created_by_id") and obj.created_by_id:
             mapping["created_by"] = model_from_cache(UserSpec, id=obj.created_by_id)
-        if obj.updated_by_id:
+        if hasattr(obj, "updated_by_id") and obj.updated_by_id:
             mapping["updated_by"] = model_from_cache(UserSpec, id=obj.updated_by_id)
 
 
@@ -272,7 +272,7 @@ def model_from_cache(model: EMRResource, quiet=True, **kwargs) -> dict[str, Any]
         data = model.serialize(obj)
         cache.set(model_cache_key(model_string(db_model), model.__name__, pk), data)
 
-    return dict(data)
+    return data.model_dump(mode="json")
 
 
 # TODO: add param for manually adding dependencies for cache invalidation

care/emr/resources/condition/spec.py

@@ -131,10 +131,7 @@ def perform_extra_serialization(cls, mapping, obj):
         if obj.encounter:
             mapping["encounter"] = obj.encounter.external_id
 
-        if obj.created_by:
-            mapping["created_by"] = UserSpec.serialize(obj.created_by)
-        if obj.updated_by:
-            mapping["updated_by"] = UserSpec.serialize(obj.updated_by)
+        cls.serialize_audit_users(mapping, obj)
 
 
 class ConditionUpdateSpec(BaseConditionSpec):

care/emr/resources/consent/spec.py

@@ -7,7 +7,7 @@
 
 from care.emr.models import Encounter, FileUpload
 from care.emr.models.consent import Consent
-from care.emr.resources.base import EMRResource, PeriodSpec
+from care.emr.resources.base import EMRResource, PeriodSpec, model_from_cache
 from care.emr.resources.file_upload.spec import (
     FileCategoryChoices,
     FileTypeChoices,
@@ -117,9 +117,9 @@ def perform_extra_serialization(cls, mapping, obj):
         mapping["encounter"] = obj.encounter.external_id
 
         for verification in obj.verification_details:
-            verification["verified_by"] = UserSpec.serialize(
-                User.objects.get(external_id=verification["verified_by"])
-            ).to_json()
+            verification["verified_by"] = model_from_cache(
+                UserSpec, external_id=verification["verified_by"]
+            )
 
         mapping["verification_details"] = obj.verification_details
 

care/emr/resources/device/history_spec.py

@@ -3,9 +3,8 @@
 from pydantic import UUID4
 
 from care.emr.models import DeviceServiceHistory
-from care.emr.resources.base import EMRResource
+from care.emr.resources.base import EMRResource, model_from_cache
 from care.emr.resources.user.spec import UserSpec
-from care.users.models import User
 
 
 class DeviceServiceHistorySpecBase(EMRResource):
@@ -41,10 +40,9 @@ def perform_extra_serialization(cls, mapping, obj):
         edit_history = []
         for history in obj.edit_history:
             user = history.get("updated_by")
-            user_obj = User.objects.filter(id=user).first()
-            if user_obj:
-                history["updated_by"] = UserSpec.serialize(user_obj).to_json()
+            if user:
+                history["updated_by"] = model_from_cache(UserSpec, id=user)
             else:
-                history["updated_by"] = {}  # Edge Case
+                history["updated_by"] = {}
             edit_history.append(history)
         mapping["edit_history"] = edit_history

care/emr/resources/encounter/spec.py

@@ -161,7 +161,9 @@ def perform_extra_serialization(cls, mapping, obj):
             mapping["appointment"] = TokenBookingReadSpec.serialize(
                 obj.appointment
             ).to_json()
-        organizations = EncounterOrganization.objects.filter(encounter=obj)
+        organizations = EncounterOrganization.objects.filter(
+            encounter=obj
+        ).select_related("organization")
         mapping["organizations"] = [
             FacilityOrganizationReadSpec.serialize(encounter_org.organization).to_json()
             for encounter_org in organizations

care/emr/resources/facility/spec.py

@@ -6,7 +6,7 @@
 
 from care.emr.models import Organization
 from care.emr.models.patient import PatientIdentifierConfigCache
-from care.emr.resources.base import EMRResource, cacheable, model_from_cache
+from care.emr.resources.base import EMRResource, cacheable
 from care.emr.resources.common.coding import Coding
 from care.emr.resources.common.monetary_component import MonetaryComponentDefinition
 from care.emr.resources.invoice.default_expression_evaluator import (
@@ -105,12 +105,9 @@ class FacilityReadSpec(FacilityBaseSpec):
 
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
-        from care.emr.resources.user.spec import UserSpec
-
         mapping["id"] = obj.external_id
         mapping["read_cover_image_url"] = obj.read_cover_image_url()
-        if obj.created_by:
-            mapping["created_by"] = model_from_cache(UserSpec, id=obj.created_by_id)
+        cls.serialize_audit_users(mapping, obj)
         mapping["facility_type"] = REVERSE_FACILITY_TYPES[obj.facility_type]
         if obj.geo_organization:
             mapping["geo_organization"] = OrganizationReadSpec.serialize(

care/emr/resources/facility_organization/spec.py

@@ -85,11 +85,7 @@ class FacilityOrganizationReadSpec(FacilityOrganizationBaseSpec):
     def perform_extra_serialization(cls, mapping, obj):
         mapping["id"] = obj.external_id
         mapping["parent"] = obj.get_parent_json()
-
-        if obj.created_by:
-            mapping["created_by"] = UserSpec.serialize(obj.created_by)
-        if obj.updated_by:
-            mapping["updated_by"] = UserSpec.serialize(obj.updated_by)
+        cls.serialize_audit_users(mapping, obj)
 
 
 class FacilityOrganizationRetrieveSpec(FacilityOrganizationReadSpec):

care/emr/resources/file_upload/spec.py

@@ -6,7 +6,7 @@
 from pydantic import UUID4, field_validator
 
 from care.emr.models import FileUpload
-from care.emr.resources.base import EMRResource
+from care.emr.resources.base import EMRResource, model_from_cache
 from care.emr.resources.user.spec import UserSpec
 from care.utils.models.validators import file_name_validator
 
@@ -92,10 +92,10 @@ def perform_extra_serialization(cls, mapping, obj):
         mapping["id"] = obj.external_id
         mapping["extension"] = obj.get_extension()
         mapping["mime_type"] = obj.meta.get("mime_type")
-        if obj.created_by:
-            mapping["uploaded_by"] = UserSpec.serialize(obj.created_by)
-        if obj.archived_by:
-            mapping["archived_by"] = UserSpec.serialize(obj.archived_by)
+        if obj.created_by_id:
+            mapping["uploaded_by"] = model_from_cache(UserSpec, id=obj.created_by_id)
+        if obj.archived_by_id:
+            mapping["archived_by"] = model_from_cache(UserSpec, id=obj.archived_by_id)
 
 
 class FileUploadRetrieveSpec(FileUploadListSpec):
@@ -112,8 +112,8 @@ def perform_extra_serialization(cls, mapping, obj):
         else:
             mapping["read_signed_url"] = obj.files_manager.read_signed_url(obj)
 
-        if obj.updated_by:
-            mapping["updated_by"] = UserSpec.serialize(obj.updated_by)
+        if obj.updated_by_id:
+            mapping["updated_by"] = model_from_cache(UserSpec, id=obj.updated_by_id)
 
 
 class ConsentFileUploadCreateSpec(FileUploadBaseSpec):

care/emr/resources/healthcare_service/spec.py

@@ -3,7 +3,6 @@
 from pydantic import UUID4
 
 from care.emr.models.healthcare_service import HealthcareService
-from care.emr.models.location import FacilityLocation
 from care.emr.models.organization import FacilityOrganization
 from care.emr.resources.base import EMRResource
 from care.emr.resources.facility_organization.spec import FacilityOrganizationReadSpec
@@ -69,18 +68,13 @@ class HealthcareServiceRetrieveSpec(HealthcareServiceReadSpec):
 
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
+        from care.emr.models.location import FacilityLocation
+
         super().perform_extra_serialization(mapping, obj)
-        locations = []
-        for location in obj.locations:
-            try:
-                locations.append(
-                    FacilityLocationListSpec.serialize(
-                        FacilityLocation.objects.get(id=location)
-                    ).to_json()
-                )
-            except Exception:  # noqa S110
-                pass
-        mapping["locations"] = locations
+        mapping["locations"] = [
+            FacilityLocationListSpec.serialize(location).to_json()
+            for location in FacilityLocation.objects.filter(id__in=obj.locations)
+        ]
         if obj.managing_organization:
             mapping["managing_organization"] = FacilityOrganizationReadSpec.serialize(
                 obj.managing_organization

care/emr/resources/location/spec.py

@@ -7,7 +7,6 @@
 from care.emr.models.location import FacilityLocation
 from care.emr.resources.base import EMRResource
 from care.emr.resources.common import Coding
-from care.emr.resources.user.spec import UserSpec
 
 
 class LocationEncounterAvailabilityStatusChoices(str, Enum):
@@ -151,10 +150,7 @@ class FacilityLocationRetrieveSpec(FacilityLocationListSpec):
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
         super().perform_extra_serialization(mapping, obj)
-        if obj.created_by:
-            mapping["created_by"] = UserSpec.serialize(obj.created_by)
-        if obj.updated_by:
-            mapping["updated_by"] = UserSpec.serialize(obj.updated_by)
+        cls.serialize_audit_users(mapping, obj)
 
 
 class FacilityLocationEncounterBaseSpec(EMRResource):

care/emr/resources/medication/administration/spec.py

@@ -191,5 +191,4 @@ def perform_extra_serialization(cls, mapping, obj):
                 obj.administered_product
             )
 
-        if obj.created_by:
-            mapping["created_by"] = UserSpec.serialize(obj.created_by)
+        cls.serialize_audit_users(mapping, obj)

care/emr/resources/medication/dispense/dispense_order.py

@@ -60,7 +60,8 @@ class MedicationDispenseOrderReadSpec(BaseMedicationDispenseOrderSpec):
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
         mapping["id"] = obj.external_id
-        mapping["location"] = FacilityLocationListSpec.serialize(obj.location).to_json()
+        location = FacilityLocation.objects.get(id=obj.location_id)
+        mapping["location"] = FacilityLocationListSpec.serialize(location).to_json()
         mapping["patient"] = PatientListSpec.serialize(obj.patient).to_json()
 
 
@@ -74,5 +75,6 @@ class MedicationDispenseOrderRetrieveSpec(MedicationDispenseOrderReadSpec):
     def perform_extra_serialization(cls, mapping, obj):
         cls.serialize_audit_users(mapping, obj)
         mapping["id"] = obj.external_id
-        mapping["location"] = FacilityLocationListSpec.serialize(obj.location).to_json()
+        location = FacilityLocation.objects.get(id=obj.location_id)
+        mapping["location"] = FacilityLocationListSpec.serialize(location).to_json()
         mapping["patient"] = PatientRetrieveSpec.serialize(obj.patient).to_json()