Merge Develop to staging

care/emr/api/viewsets/base.py

@@ -46,18 +46,18 @@ def emr_exception_handler(exc, context):
     return drf_exception_handler(exc, context)
 
 
-class EMRQuestionnaireMixin:
-    @action(detail=False, methods=["GET"])
-    def questionnaire_spec(self, *args, **kwargs):
-        return Response(
-            {"version": "1.0", "questions": self.pydantic_model.as_questionnaire()}
-        )
-
-    @action(detail=False, methods=["GET"])
-    def json_schema_spec(self, *args, **kwargs):
-        return Response(
-            {"version": "1.0", "questions": self.pydantic_model.model_json_schema()}
-        )
+# class EMRQuestionnaireMixin:
+#     @action(detail=False, methods=["GET"])
+#     def questionnaire_spec(self, *args, **kwargs):
+#         return Response(
+#             {"version": "1.0", "questions": self.pydantic_model.as_questionnaire()}
+#         )
+#
+#     @action(detail=False, methods=["GET"])
+#     def json_schema_spec(self, *args, **kwargs):
+#         return Response(
+#             {"version": "1.0", "questions": self.pydantic_model.model_json_schema()}
+#         )
 
 
 class EMRRetrieveMixin:

care/emr/api/viewsets/condition.py

@@ -1,34 +1,26 @@
 from django_filters import CharFilter, FilterSet, UUIDFilter
+from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.exceptions import ValidationError
 from rest_framework.generics import get_object_or_404
 
 from care.emr.api.viewsets.base import (
-    EMRBaseViewSet,
-    EMRCreateMixin,
-    EMRListMixin,
     EMRModelViewSet,
     EMRQuestionnaireResponseMixin,
-    EMRRetrieveMixin,
-    EMRUpdateMixin,
-    EMRUpsertMixin,
 )
 from care.emr.api.viewsets.encounter_authz_base import EncounterBasedAuthorizationBase
 from care.emr.models.condition import Condition
 from care.emr.models.encounter import Encounter
-from care.emr.models.patient import Patient
 from care.emr.registries.system_questionnaire.system_questionnaire import (
     InternalQuestionnaireRegistry,
 )
 from care.emr.resources.condition.spec import (
     CategoryChoices,
-    ChronicConditionUpdateSpec,
     ConditionReadSpec,
     ConditionSpec,
     ConditionUpdateSpec,
 )
 from care.emr.resources.questionnaire.spec import SubjectType
-from care.security.authorization import AuthorizationController
 
 
 class ValidateEncounterMixin:
@@ -49,6 +41,14 @@ def validate_data(self, instance, model_obj=None):
             )
 
 
+class CategoryFilter(filters.CharFilter):
+    def filter(self, qs, value):
+        if value:
+            categories = value.split(",")
+            return qs.filter(category__in=categories)
+        return qs
+
+
 class ConditionFilters(FilterSet):
     encounter = UUIDFilter(field_name="encounter__external_id")
     clinical_status = CharFilter(field_name="clinical_status", lookup_expr="iexact")
@@ -57,6 +57,7 @@ class ConditionFilters(FilterSet):
     )
     severity = CharFilter(field_name="severity", lookup_expr="iexact")
     name = CharFilter(field_name="code__display", lookup_expr="icontains")
+    category = CategoryFilter()
 
 
 class SymptomViewSet(
@@ -113,97 +114,22 @@ class DiagnosisViewSet(
     # Filters
     filterset_class = ConditionFilters
     filter_backends = [DjangoFilterBackend]
+
     # Questionnaire Spec
     questionnaire_type = "diagnosis"
     questionnaire_title = "Diagnosis"
     questionnaire_description = "Diagnosis"
     questionnaire_subject_type = SubjectType.patient.value
 
-    def perform_create(self, instance):
-        instance.category = CategoryChoices.encounter_diagnosis.value
-        super().perform_create(instance)
-
     def get_queryset(self):
         # Check if the user has read access to the patient and their EMR Data
         self.authorize_read_encounter()
         return (
             super()
             .get_queryset()
-            .filter(
-                patient__external_id=self.kwargs["patient_external_id"],
-                category=CategoryChoices.encounter_diagnosis.value,
-            )
+            .filter(patient__external_id=self.kwargs["patient_external_id"])
             .select_related("patient", "encounter", "created_by", "updated_by")
         )
 
 
 InternalQuestionnaireRegistry.register(DiagnosisViewSet)
-
-
-class ChronicConditionViewSet(
-    EMRQuestionnaireResponseMixin,
-    EMRCreateMixin,
-    EMRRetrieveMixin,
-    EMRUpdateMixin,
-    EMRListMixin,
-    EMRBaseViewSet,
-    EMRUpsertMixin,
-):
-    database_model = Condition
-    pydantic_model = ConditionSpec
-    pydantic_read_model = ConditionReadSpec
-    pydantic_update_model = ChronicConditionUpdateSpec
-
-    # Filters
-    filterset_class = ConditionFilters
-    filter_backends = [DjangoFilterBackend]
-    # Questionnaire Spec
-    questionnaire_type = "chronic_condition"
-    questionnaire_title = "Chronic Condition"
-    questionnaire_description = "Chronic Condition"
-    questionnaire_subject_type = SubjectType.patient.value
-
-    def get_patient_obj(self):
-        return get_object_or_404(
-            Patient, external_id=self.kwargs["patient_external_id"]
-        )
-
-    def authorize_create(self, instance):
-        if not AuthorizationController.call(
-            "can_write_patient_obj", self.request.user, self.get_patient_obj()
-        ):
-            raise PermissionDenied("You do not have permission to update encounter")
-
-    def authorize_update(self, request_obj, model_instance):
-        encounter = get_object_or_404(Encounter, external_id=request_obj.encounter)
-        if not AuthorizationController.call(
-            "can_update_encounter_obj",
-            self.request.user,
-            encounter,
-        ):
-            raise PermissionDenied("You do not have permission to update encounter")
-
-    def perform_create(self, instance):
-        instance.category = CategoryChoices.chronic_condition.value
-        super().perform_create(instance)
-
-    def clean_update_data(self, request_data):
-        return super().clean_update_data(request_data, keep_fields={"encounter"})
-
-    def get_queryset(self):
-        if not AuthorizationController.call(
-            "can_view_clinical_data", self.request.user, self.get_patient_obj()
-        ):
-            raise PermissionDenied("Permission denied for patient data")
-        return (
-            super()
-            .get_queryset()
-            .filter(
-                patient__external_id=self.kwargs["patient_external_id"],
-                category=CategoryChoices.chronic_condition.value,
-            )
-            .select_related("patient", "encounter", "created_by", "updated_by")
-        )
-
-
-InternalQuestionnaireRegistry.register(ChronicConditionViewSet)

care/emr/api/viewsets/consent.py

@@ -34,6 +34,7 @@ def get_queryset(self):
         return (
             super()
             .get_queryset()
+            .filter(encounter__patient__external_id=self.kwargs["patient_external_id"])
             .select_related("encounter", "created_by", "updated_by")
         )
 

care/emr/api/viewsets/device.py

@@ -107,7 +107,7 @@ def perform_destroy(self, instance):
                 care_device_class = DeviceTypeRegistry.get_care_device_class(
                     instance.care_type
                 )
-                care_device_class().handle_update(self.request.data, instance)
+                care_device_class().handle_delete(instance)
             super().perform_destroy(instance)
 
     def get_queryset(self):

care/emr/api/viewsets/facility_organization.py

@@ -59,8 +59,13 @@ def validate_data(self, instance, model_obj=None):
                 raise PermissionDenied(
                     "Cannot create organizations under root organization"
                 )
-            if model_obj is None and parent.level_cache >= settings.LOCATION_MAX_DEPTH:
-                error = f"Max depth reached ({settings.LOCATION_MAX_DEPTH})"
+            if (
+                model_obj is None
+                and parent.level_cache >= settings.FACILITY_ORGANIZATION_MAX_DEPTH
+            ):
+                error = (
+                    f"Max depth reached ({settings.FACILITY_ORGANIZATION_MAX_DEPTH})"
+                )
                 raise ValidationError(error)
 
         if model_obj is None:

care/emr/api/viewsets/organization.py

@@ -83,8 +83,8 @@ def validate_data(self, instance, model_obj=None):
             parent = get_object_or_404(Organization, external_id=instance.parent)
 
             # Validate Depth
-            if parent.level_cache >= settings.LOCATION_MAX_DEPTH:
-                error = f"Max depth reached ({settings.LOCATION_MAX_DEPTH})"
+            if parent.level_cache >= settings.ORGANIZATION_MAX_DEPTH:
+                error = f"Max depth reached ({settings.ORGANIZATION_MAX_DEPTH})"
                 raise ValidationError(error)
 
     def authorize_destroy(self, instance):

care/emr/api/viewsets/questionnaire_response.py

@@ -42,7 +42,9 @@ def get_queryset(self):
                     Encounter, external_id=self.request.GET["encounter"]
                 )
         else:
-            obj = get_object_or_404(QuestionnaireResponse, self.kwargs["external_id"])
+            obj = get_object_or_404(
+                QuestionnaireResponse, external_id=self.kwargs["external_id"]
+            )
             patient = obj.patient
             encounter = obj.encounter
         if encounter:

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

@@ -18,7 +18,6 @@
 from care.emr.models.scheduling.schedule import Availability, SchedulableUserResource
 from care.emr.resources.scheduling.schedule.spec import SlotTypeOptions
 from care.emr.resources.scheduling.slot.spec import (
-    CANCELLED_STATUS_CHOICES,
     COMPLETED_STATUS_CHOICES,
     TokenBookingReadSpec,
     TokenSlotBaseSpec,
@@ -114,7 +113,7 @@ def lock_create_appointment(token_slot, patient, created_by, reason_for_visit):
             raise ValidationError("Slot is already full")
         if (
             TokenBooking.objects.filter(token_slot=token_slot, patient=patient)
-            .exclude(status__in=CANCELLED_STATUS_CHOICES)
+            .exclude(status__in=COMPLETED_STATUS_CHOICES)
             .exists()
         ):
             raise ValidationError("Patient already has a booking for this slot")

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

@@ -1,7 +1,12 @@
 from typing import Literal
 
 from django.db import transaction
-from django_filters import CharFilter, DateFromToRangeFilter, FilterSet, UUIDFilter
+from django_filters import (
+    CharFilter,
+    DateFromToRangeFilter,
+    FilterSet,
+    UUIDFilter,
+)
 from django_filters.rest_framework import DjangoFilterBackend
 from pydantic import UUID4, BaseModel
 from rest_framework.decorators import action
@@ -49,8 +54,12 @@ class TokenBookingFilters(FilterSet):
     patient = UUIDFilter(field_name="patient__external_id")
 
     def filter_by_user(self, queryset, name, value):
+        facility_external_id = self.request.parser_context.get("kwargs", {}).get(
+            "facility_external_id"
+        )
         resource = SchedulableUserResource.objects.filter(
-            user__external_id=value
+            user__external_id=value,
+            facility__external_id=facility_external_id,
         ).first()
         if not resource:
             return queryset.none()