Location API fixes

care/emr/api/viewsets/location.py

@@ -359,11 +359,8 @@ def _validate_data(self, instance, model_obj=None):
                 start_datetime__lte=end_datetime, end_datetime__gte=start_datetime
             ).exists():
                 raise ValidationError("Conflict in schedule")
-        else:
-            if base_qs.filter(
-                start_datetime__gte=start_datetime
-            ).exists():
-                raise ValidationError("Conflict in schedule")
+        elif base_qs.filter(start_datetime__gte=start_datetime).exists():
+            raise ValidationError("Conflict in schedule")
 
         # Ensure that there is no other association at this point
         if (

care/emr/resources/location/spec.py

@@ -104,6 +104,7 @@ def perform_extra_deserialization(self, is_update, obj):
             obj.parent = None
         obj.availability_status = LocationAvailabilityStatusChoices.available.value
 
+
 class FacilityLocationListSpec(FacilityLocationSpec):
     parent: dict
     mode: str
@@ -164,7 +165,7 @@ class FacilityLocationEncounterReadSpec(FacilityLocationEncounterBaseSpec):
     encounter: UUID4
     start_datetime: datetime.datetime
     end_datetime: datetime.datetime | None = None
-    status : str
+    status: str
 
     created_by: dict | None = None
     updated_by: dict | None = None

config/api_router.py

@@ -25,7 +25,10 @@
     FacilityOrganizationViewSet,
 )
 from care.emr.api.viewsets.file_upload import FileUploadViewSet
-from care.emr.api.viewsets.location import FacilityLocationViewSet, FacilityLocationEncounterViewSet
+from care.emr.api.viewsets.location import (
+    FacilityLocationEncounterViewSet,
+    FacilityLocationViewSet,
+)
 from care.emr.api.viewsets.medication_administration import (
     MedicationAdministrationViewSet,
 )
@@ -162,7 +165,9 @@
     basename="location",
 )
 
-facility_location_nested_router = NestedSimpleRouter(facility_nested_router, r"location", lookup="location")
+facility_location_nested_router = NestedSimpleRouter(
+    facility_nested_router, r"location", lookup="location"
+)
 
 facility_location_nested_router.register(
     r"association",
@@ -238,5 +243,4 @@
     path("", include(organization_nested_router.urls)),
     path("", include(facility_organization_nested_router.urls)),
     path("", include(facility_location_nested_router.urls)),
-
 ]