From e26fc7fae11dca08f40232733059e2a68718f06a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 2 Dec 2022 12:57:18 +0100 Subject: [PATCH] Fixing broken document migration * adds changes to document migration to correctly migrate documents --- api/utils/serializer/v1/intervention.py | 2 +- intervention/forms/intervention.py | 1 + intervention/forms/modals/document.py | 4 +--- intervention/models/intervention.py | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/utils/serializer/v1/intervention.py b/api/utils/serializer/v1/intervention.py index 5f06ccd..cd044ea 100644 --- a/api/utils/serializer/v1/intervention.py +++ b/api/utils/serializer/v1/intervention.py @@ -133,7 +133,6 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1, id__in=payments ) obj.payments.set(payments) - obj.send_data_to_egon() return obj def create_model_from_json(self, json_model, user): @@ -201,6 +200,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1, obj.save() obj.mark_as_edited(user, edit_comment="API update") + obj.send_data_to_egon() celery_update_parcels.delay(obj.geometry.id) diff --git a/intervention/forms/intervention.py b/intervention/forms/intervention.py index 10b84e6..56d6b68 100644 --- a/intervention/forms/intervention.py +++ b/intervention/forms/intervention.py @@ -385,6 +385,7 @@ class EditInterventionForm(NewInterventionForm): geometry = geom_form.save(user_action) self.instance.geometry = geometry self.instance.save() + self.instance.send_data_to_egon() return self.instance diff --git a/intervention/forms/modals/document.py b/intervention/forms/modals/document.py index 17dfa56..0daf3eb 100644 --- a/intervention/forms/modals/document.py +++ b/intervention/forms/modals/document.py @@ -25,8 +25,6 @@ class NewInterventionDocumentModalForm(NewDocumentModalForm): """ doc = super().save(*args, **kwargs) - - if self.instance.payments.exists(): - self.instance.send_data_to_egon() + self.instance.send_data_to_egon() return doc diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py index 91c0ddb..49c95c6 100644 --- a/intervention/models/intervention.py +++ b/intervention/models/intervention.py @@ -145,7 +145,8 @@ class Intervention(BaseObject, Returns: """ - celery_export_to_egon.delay(self.id) + if self.payments.exists(): + celery_export_to_egon.delay(self.id) def set_recorded(self, user: User) -> UserActionLogEntry: log_entry = super().set_recorded(user)