M2M handling in 3 DREF types

Author: szabozoltan69

dref/serializers.py

@@ -691,6 +691,52 @@ def update(self, instance, validated_data):
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
         validated_data["modified_at"] = timezone.now()
         dref = super().update(instance, validated_data)
+
+        # Helper for robust M2M update
+        def m2m(data, model_cls):
+            ids = []
+            for item in data:
+                if isinstance(item, dict):
+                    item_id = item.get("id")
+                    if item_id:
+                        ids.append(item_id)
+                    else:
+                        obj = model_cls.objects.create(**item)
+                        ids.append(obj.id)
+                else:
+                    ids.append(item)
+            return ids
+
+        # planned_interventions M2M handling
+        planned_interventions_data = self.initial_data.get("planned_interventions")
+        if planned_interventions_data is not None:
+            dref.planned_interventions.set(m2m(planned_interventions_data, PlannedIntervention))
+
+        # needs_identified M2M handling
+        needs_identified_data = self.initial_data.get("needs_identified")
+        if needs_identified_data is not None:
+            dref.needs_identified.set(m2m(needs_identified_data, IdentifiedNeed))
+
+        # national_society_actions M2M handling
+        national_society_actions_data = self.initial_data.get("national_society_actions")
+        if national_society_actions_data is not None:
+            dref.national_society_actions.set(m2m(national_society_actions_data, NationalSocietyAction))
+
+        # risk_security M2M handling
+        risk_security_data = self.initial_data.get("risk_security")
+        if risk_security_data is not None:
+            dref.risk_security.set(m2m(risk_security_data, RiskSecurity))
+
+        # source_information M2M handling
+        source_information_data = self.initial_data.get("source_information")
+        if source_information_data is not None:
+            dref.source_information.set(m2m(source_information_data, SourceInformation))
+
+        # proposed_action M2M handling
+        proposed_action_data = self.initial_data.get("proposed_action")
+        if proposed_action_data is not None:
+            dref.proposed_action.set(m2m(proposed_action_data, ProposedAction))
+
         if to:
             transaction.on_commit(lambda: send_dref_email.delay(dref.id, list(to), "Updated"))
         return dref
@@ -1079,7 +1125,53 @@ def update(self, instance, validated_data):
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
         validated_data["modified_at"] = timezone.now()
-        return super().update(instance, validated_data)
+        operational_update = super().update(instance, validated_data)
+
+        def m2m(data, model_cls):
+            ids = []
+            for item in data:
+                if isinstance(item, dict):
+                    item_id = item.get("id")
+                    if item_id:
+                        ids.append(item_id)
+                    else:
+                        obj = model_cls.objects.create(**item)
+                        ids.append(obj.id)
+                else:
+                    ids.append(item)
+            return ids
+
+        # planned_interventions M2M handling
+        planned_interventions_data = self.initial_data.get("planned_interventions")
+        if planned_interventions_data is not None:
+            operational_update.planned_interventions.set(m2m(planned_interventions_data, PlannedIntervention))
+
+        # needs_identified M2M handling
+        needs_identified_data = self.initial_data.get("needs_identified")
+        if needs_identified_data is not None:
+            operational_update.needs_identified.set(m2m(needs_identified_data, IdentifiedNeed))
+
+        # national_society_actions M2M handling
+        national_society_actions_data = self.initial_data.get("national_society_actions")
+        if national_society_actions_data is not None:
+            operational_update.national_society_actions.set(m2m(national_society_actions_data, NationalSocietyAction))
+
+        # risk_security M2M handling
+        risk_security_data = self.initial_data.get("risk_security")
+        if risk_security_data is not None:
+            operational_update.risk_security.set(m2m(risk_security_data, RiskSecurity))
+
+        # source_information M2M handling
+        source_information_data = self.initial_data.get("source_information")
+        if source_information_data is not None:
+            operational_update.source_information.set(m2m(source_information_data, SourceInformation))
+
+        # proposed_action M2M handling
+        proposed_action_data = self.initial_data.get("proposed_action")
+        if proposed_action_data is not None:
+            operational_update.proposed_action.set(m2m(proposed_action_data, ProposedAction))
+
+        return operational_update
 
 
 class DrefFinalReportSerializer(NestedUpdateMixin, NestedCreateMixin, ModelSerializer):
@@ -1520,7 +1612,53 @@ def update(self, instance, validated_data):
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
         validated_data["modified_at"] = timezone.now()
         validated_data["modified_by"] = self.context["request"].user
-        return super().update(instance, validated_data)
+        final_report = super().update(instance, validated_data)
+
+        def m2m(data, model_cls):
+            ids = []
+            for item in data:
+                if isinstance(item, dict):
+                    item_id = item.get("id")
+                    if item_id:
+                        ids.append(item_id)
+                    else:
+                        obj = model_cls.objects.create(**item)
+                        ids.append(obj.id)
+                else:
+                    ids.append(item)
+            return ids
+
+        # planned_interventions M2M handling
+        planned_interventions_data = self.initial_data.get("planned_interventions")
+        if planned_interventions_data is not None:
+            final_report.planned_interventions.set(m2m(planned_interventions_data, PlannedIntervention))
+
+        # needs_identified M2M handling
+        needs_identified_data = self.initial_data.get("needs_identified")
+        if needs_identified_data is not None:
+            final_report.needs_identified.set(m2m(needs_identified_data, IdentifiedNeed))
+
+        # national_society_actions M2M handling
+        national_society_actions_data = self.initial_data.get("national_society_actions")
+        if national_society_actions_data is not None:
+            final_report.national_society_actions.set(m2m(national_society_actions_data, NationalSocietyAction))
+
+        # risk_security M2M handling
+        risk_security_data = self.initial_data.get("risk_security")
+        if risk_security_data is not None:
+            final_report.risk_security.set(m2m(risk_security_data, RiskSecurity))
+
+        # source_information M2M handling
+        source_information_data = self.initial_data.get("source_information")
+        if source_information_data is not None:
+            final_report.source_information.set(m2m(source_information_data, SourceInformation))
+
+        # proposed_action M2M handling
+        proposed_action_data = self.initial_data.get("proposed_action")
+        if proposed_action_data is not None:
+            final_report.proposed_action.set(m2m(proposed_action_data, ProposedAction))
+
+        return final_report
 
 
 class CompletedDrefOperationsSerializer(serializers.ModelSerializer):