Fix issues with location spec

ohcnetwork · Jan 29, 2025 · 73ff1bc · 73ff1bc
1 parent 644210d
commit 73ff1bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/care/emr/api/viewsets/location.py b/care/emr/api/viewsets/location.py
@@ -65,9 +65,10 @@ def validate_destroy(self, instance):
         # TODO Add validation to check if patient association exists
 
     def validate_data(self, instance, model_obj=None):
+        facility = self.get_facility_obj()
         if not model_obj and instance.parent:
             parent = get_object_or_404(FacilityLocation, external_id=instance.parent)
-            if parent.facility_id != instance.facility_id:
+            if parent.facility_id != facility.id:
                 raise PermissionDenied("Parent Incompatible with Location")
             if parent.mode == FacilityLocationModeChoices.instance.value:
                 raise ValidationError("Instances cannot have children")

diff --git a/care/emr/resources/location/spec.py b/care/emr/resources/location/spec.py
@@ -90,7 +90,7 @@ def validate_parent_organization(self):
         if (
             self.parent
             and not FacilityLocation.objects.filter(
-                external_id=self.parent, mode=FacilityLocationModeChoices.instance.value
+                external_id=self.parent, mode=FacilityLocationModeChoices.kind.value
             ).exists()
         ):
             err = "Parent not found"