From a4c99fd922b3f32c78e695d4c709d76a0f1633e9 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 12 Jul 2024 18:26:52 +0300 Subject: [PATCH] Fixed Issue of Facility Update in facility_models.py --- facilities/models/facility_models.py | 29 +++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/facilities/models/facility_models.py b/facilities/models/facility_models.py index 5057bd2e..f934e36b 100755 --- a/facilities/models/facility_models.py +++ b/facilities/models/facility_models.py @@ -306,20 +306,22 @@ def push_facility_updates_to_dhis2(self, org_unit_id, facility_updates_payload): if r.json()["status"] != "OK": - r = requests.post( - settings.DHIS_ENDPOINT + "api/organisationUnits/", - auth=(settings.DHIS_USERNAME, settings.DHIS_PASSWORD), - headers={ - "Accept": "application/json" - }, - json=facility_updates_payload - ) + # r = requests.post( + # settings.DHIS_ENDPOINT + "api/organisationUnits/", + # auth=(settings.DHIS_USERNAME, settings.DHIS_PASSWORD), + # headers={ + # "Accept": "application/json" + # }, + # json=facility_updates_payload + # ) - # raise ValidationError( - # { - # "Error!": ["Unable to push facility updates to DHIS2"] - # } - # ) + raise ValidationError( + { + "Error!": ["Unable to push facility updates to KHIS. Created a new facility {}".format(r.text())] + } + ) + else: + return r.json() def format_coordinates(self, str_coordinates): @@ -2291,6 +2293,7 @@ def push_facility_updates(self): LOGGER.error('[>>>>>Info] coordinates: {}, FacilityCoordinatesObj: {}'.format(coordinates, FacilityCoordinates.objects.values('coordinates') .get(facility_id=self.facility.id)['coordinates'])) + new_facility_updates_payload = { "code": str(self.facility.code), "name": str(self.facility.name),