Scheduling Validations

care/emr/api/viewsets/facility.py

@@ -104,7 +104,7 @@ def get_queryset(self):
         return User.objects.filter(
             id__in=SchedulableUserResource.objects.filter(
                 facility__external_id=self.kwargs["facility_external_id"]
-            ).values("resource_id")
+            ).values("user_id")
         )
 
 

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

@@ -8,6 +8,7 @@
 from pydantic import UUID4, BaseModel, model_validator
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 
 from care.emr.api.viewsets.base import EMRBaseViewSet, EMRRetrieveMixin
@@ -26,7 +27,7 @@
 
 
 class SlotsForDayRequestSpec(BaseModel):
-    resource: UUID4
+    user: UUID4
     day: datetime.date
 
 
@@ -38,7 +39,7 @@ class AppointmentBookingSpec(BaseModel):
 class AvailabilityStatsRequestSpec(BaseModel):
     from_date: datetime.date
     to_date: datetime.date
-    resource: UUID4
+    user: UUID4
 
     @model_validator(mode="after")
     def validate_period(self):
@@ -105,12 +106,12 @@ def get_slots_for_day(self, request, *args, **kwargs):
     @classmethod
     def get_slots_for_day_handler(cls, facility_external_id, request_data):
         request_data = SlotsForDayRequestSpec(**request_data)
-        user = User.objects.filter(external_id=request_data.resource).first()
+        user = get_object_or_404(User, external_id=request_data.user)
         if not user:
             raise ValidationError("Resource does not exist")
         schedulable_resource_obj = SchedulableUserResource.objects.filter(
             facility__external_id=facility_external_id,
-            resource=user,
+            user=user,
         ).first()
         if not schedulable_resource_obj:
             raise ValidationError("Resource is not schedulable")
@@ -214,7 +215,7 @@ def availability_stats(self, request, *args, **kwargs):
         user = User.objects.filter(external_id=request_data.resource).first()
         if not user:
             raise ValidationError("User does not exist")
-        resource = SchedulableUserResource.objects.filter(resource=user).first()
+        resource = SchedulableUserResource.objects.filter(user=user).first()
         if not resource:
             raise ValidationError("Resource is not schedulable")
 

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

@@ -14,7 +14,7 @@
 
 
 class AvailabilityExceptionFilters(FilterSet):
-    resource = UUIDFilter(field_name="resource__resource__external_id")
+    user = UUIDFilter(field_name="resource__user__external_id")
 
 
 class AvailabilityExceptionsViewSet(EMRModelViewSet):

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

@@ -26,14 +26,14 @@ class TokenBookingFilters(FilterSet):
     status = CharFilter(field_name="status")
     date = DateFilter(field_name="token_slot__start_datetime__date")
     slot = UUIDFilter(field_name="token_slot__external_id")
-    resource = UUIDFilter(method="filter_by_resource")
+    user = UUIDFilter(method="filter_by_user")
     patient = UUIDFilter(field_name="patient__external_id")
 
-    def filter_by_resource(self, queryset, name, value):
+    def filter_by_user(self, queryset, name, value):
         if not value:
             return queryset
         resource = SchedulableUserResource.objects.filter(
-            resource__external_id=value
+            user__external_id=value
         ).first()
         if not resource:
             return queryset.none()
@@ -90,13 +90,13 @@ def get_queryset(self):
         )
 
     @action(detail=False, methods=["GET"])
-    def available_doctors(self, request, *args, **kwargs):
+    def available_users(self, request, *args, **kwargs):
         facility = Facility.objects.get(external_id=self.kwargs["facility_external_id"])
         facility_users = FacilityOrganizationUser.objects.filter(
             organization__facility=facility,
             user_id__in=SchedulableUserResource.objects.filter(
                 facility=facility
-            ).values("resource_id"),
+            ).values("user_id"),
         )
 
         return Response(

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

@@ -18,7 +18,7 @@
 
 
 class ScheduleFilters(FilterSet):
-    resource = UUIDFilter(field_name="resource__resource__external_id")
+    user = UUIDFilter(field_name="resource__user__external_id")
 
 
 class ScheduleViewSet(EMRModelViewSet):
@@ -51,7 +51,7 @@ def validate_data(self, instance, model_obj=None):
         facility = self.get_facility_obj()
         schedule_user = get_object_or_404(User, external_id=instance.user)
         if not FacilityOrganizationUser.objects.filter(
-            user=schedule_user, facility=facility
+            user=schedule_user, organization__facility=facility
         ).exists():
             raise ValidationError("Schedule User is not part of the facility")
 

care/emr/migrations/0061_rename_resource_schedulableuserresource_user_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.3 on 2025-01-03 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("emr", "0060_alter_medicationrequest_dosage_instruction"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="schedulableuserresource",
+            old_name="resource",
+            new_name="user",
+        ),
+        migrations.AlterField(
+            model_name="medicationrequest",
+            name="dosage_instruction",
+            field=models.JSONField(blank=True, default=list, null=True),
+        ),
+    ]

care/emr/models/scheduling/schedule.py

@@ -7,7 +7,7 @@ class SchedulableUserResource(EMRBaseModel):
     """A resource that can be scheduled for appointments."""
 
     facility = models.ForeignKey("facility.Facility", on_delete=models.CASCADE)
-    resource = models.ForeignKey("users.User", on_delete=models.CASCADE)
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE)
 
     # TODO : Index with resource and facility
 

care/emr/resources/scheduling/availability_exception/spec.py

@@ -36,9 +36,9 @@ def perform_extra_deserialization(self, is_update, obj):
         if not is_update:
             resource = None
             try:
-                user_resource = User.objects.get(external_id=self.resource)
+                user = User.objects.get(external_id=self.resource)
                 resource = SchedulableUserResource.objects.get(
-                    resource=user_resource,
+                    user=user,
                     facility=Facility.objects.get(external_id=self.facility),
                 )
                 obj.resource = resource

care/emr/resources/scheduling/schedule/spec.py

@@ -71,7 +71,7 @@ def perform_extra_deserialization(self, is_update, obj):
 
             resource, _ = SchedulableUserResource.objects.get_or_create(
                 facility=obj.facility,
-                resource=user,
+                user=user,
             )
             obj.resource = resource
             obj.availabilities = self.availabilities

care/emr/resources/scheduling/slot/spec.py

@@ -89,5 +89,5 @@ def perform_extra_serialization(cls, mapping, obj):
             exclude=["meta"]
         )
         mapping["resource"] = UserSpec.serialize(
-            User.objects.get(id=obj.token_slot.resource.resource_id)
+            User.objects.get(id=obj.token_slot.resource.user_id)
         ).model_dump(exclude=["meta"])

care/security/authorization/user_schedule.py

@@ -1,8 +1,6 @@
 from care.emr.models.organization import FacilityOrganizationUser
 from care.security.authorization import AuthorizationController
-from care.security.authorization.base import (
-    AuthorizationHandler,
-)
+from care.security.authorization.base import AuthorizationHandler
 from care.security.permissions.user_schedule import UserSchedulePermissions
 
 
@@ -42,8 +40,8 @@ def can_write_user_schedule(self, user, facility, schedule_user):
         Check if the user has permission to write schedules in the facility
         """
         facility_orgs = FacilityOrganizationUser.objects.filter(
-            user=schedule_user, facility=facility
-        ).values_list("parent_cache")
+            user=schedule_user, organization__facility=facility
+        ).values_list("organization__parent_cache", flat=True)
         cache = []
         for org_cache in facility_orgs:
             cache.extend(org_cache)
@@ -57,8 +55,8 @@ def can_write_user_booking(self, user, facility, schedule_user):
         Check if the user has permission to write schedules in the facility
         """
         facility_orgs = FacilityOrganizationUser.objects.filter(
-            user=schedule_user, facility=facility
-        ).values_list("parent_cache")
+            user=schedule_user, organization__facility=facility
+        ).values_list("organization__parent_cache", flat=True)
         cache = []
         for org_cache in facility_orgs:
             cache.extend(org_cache)