From 97229ea18c0b40b943c26b9478ecc9394cc05190 Mon Sep 17 00:00:00 2001 From: Jacob Jeevan Date: Wed, 17 Jun 2026 17:46:45 +0530 Subject: [PATCH 1/3] feat: allow clearing facility_org/org --- care/emr/resources/tag/config_spec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/care/emr/resources/tag/config_spec.py b/care/emr/resources/tag/config_spec.py index e05ca0ceea..892a4db550 100644 --- a/care/emr/resources/tag/config_spec.py +++ b/care/emr/resources/tag/config_spec.py @@ -68,8 +68,8 @@ class TagConfigBaseSpec(EMRResource): class TagConfigUpdateSpec(TagConfigBaseSpec): - facility_organization: UUID4 | None = None - organization: UUID4 | None = None + facility_organization: UUID4 | None + organization: UUID4 | None def perform_extra_deserialization(self, is_update, obj): if self.organization: From 9dadc15351f8f6b9f5419e398936bcc082e005d7 Mon Sep 17 00:00:00 2001 From: Jacob Jeevan Date: Wed, 17 Jun 2026 18:50:10 +0530 Subject: [PATCH 2/3] chore: add else condition --- care/emr/resources/tag/config_spec.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/care/emr/resources/tag/config_spec.py b/care/emr/resources/tag/config_spec.py index 892a4db550..220e6ab0c9 100644 --- a/care/emr/resources/tag/config_spec.py +++ b/care/emr/resources/tag/config_spec.py @@ -76,12 +76,16 @@ def perform_extra_deserialization(self, is_update, obj): obj.organization = get_object_or_404( Organization.objects.only("id"), external_id=self.organization ) + else: + obj.organization = None if self.facility_organization: obj.facility_organization = get_object_or_404( FacilityOrganization.objects.only("id"), external_id=self.facility_organization, facility=obj.facility, ) + else: + obj.facility_organization = None class TagConfigWriteSpec(TagConfigBaseSpec): From e3f7a7d8ad7bcf7a4f6179f570fe9f6a876c538d Mon Sep 17 00:00:00 2001 From: Jacob Jeevan Date: Wed, 24 Jun 2026 00:34:46 +0530 Subject: [PATCH 3/3] chore: allow none default --- care/emr/resources/tag/config_spec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/care/emr/resources/tag/config_spec.py b/care/emr/resources/tag/config_spec.py index 220e6ab0c9..dced74bbfc 100644 --- a/care/emr/resources/tag/config_spec.py +++ b/care/emr/resources/tag/config_spec.py @@ -68,8 +68,8 @@ class TagConfigBaseSpec(EMRResource): class TagConfigUpdateSpec(TagConfigBaseSpec): - facility_organization: UUID4 | None - organization: UUID4 | None + facility_organization: UUID4 | None = None + organization: UUID4 | None = None def perform_extra_deserialization(self, is_update, obj): if self.organization: