From 9c677ef564ecb3f5990c129975978eccd49c2b20 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Sun, 8 Sep 2024 11:43:36 +0200
Subject: 🐛 merge: do not merge import association
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise, this may result in unwanted deletion when deleting an import
---
 ishtar_common/tests.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'ishtar_common/tests.py')

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 90e8d3991..f9c928d5e 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -65,6 +65,7 @@ from django.urls import reverse
 from ishtar_common import models, models_common, forms_common
 from ishtar_common import views
 from ishtar_common.apps import admin_site
+from ishtar_common.models_imports import Import, ImporterType
 from ishtar_common.serializers import (
     type_serialization,
     SERIALIZATION_VERSION,
@@ -2022,8 +2023,34 @@ class MergeTest(TestCase):
             name="George", history_modifier=self.user, attached_to=self.company_1
         )
 
+    def set_up_person_merge(self):
+        # create arbitrary imports
+        imp_model = models.ImporterModel.objects.create(
+            klass="ishtar_common.models.Parcel", name="Parcel"
+        )
+        importer_type = models.ImporterType.objects.create(associated_models=imp_model)
+        imprt1 = models.Import.objects.create(
+            name="Test",
+            user=models.IshtarUser.objects.all()[0],
+            importer_type=importer_type,
+        )
+        imprt2 = models.Import.objects.create(
+            name="Test 2",
+            user=models.IshtarUser.objects.all()[0],
+            importer_type=importer_type,
+        )
+        self.person_1.imports.add(imprt1)
+        self.person_2.imports.add(imprt2)
+        return imprt1, imprt2
+
     def test_person_merge(self):
+        imprt1, __ = self.set_up_person_merge()
+
         self.person_1.merge(self.person_2)
+
+        # do not merge associated imports
+        self.assertEqual(self.person_1.imports.count(), 1)
+        self.assertEqual(self.person_1.imports.all()[0].pk, imprt1.pk)
         # preserve existing fields
         self.assertEqual(self.person_1.name, "Boule")
         # fill missing fields
-- 
cgit v1.2.3