🗃️ add updated relation between imports and main items

11 files changed, 180 insertions, 4 deletions

diff --git a/archaeological_context_records/migrations/0113_contextrecord_imports_updated.py b/archaeological_context_records/migrations/0113_contextrecord_imports_updated.py
new file mode 100644
index 000000000..bda2c3122
--- /dev/null
+++ b/archaeological_context_records/migrations/0113_contextrecord_imports_updated.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.24 on 2023-09-22 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0230_auto_20230922_1443'),
+        ('archaeological_context_records', '0112_migrate_created'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contextrecord',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_context_records_contextrecord', to='ishtar_common.Import'),
+        ),
+    ]
diff --git a/archaeological_files/migrations/0112_file_imports_updated.py b/archaeological_files/migrations/0112_file_imports_updated.py
new file mode 100644
index 000000000..226f4988a
--- /dev/null
+++ b/archaeological_files/migrations/0112_file_imports_updated.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.24 on 2023-09-22 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0230_auto_20230922_1443'),
+        ('archaeological_files', '0111_migrate_created'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='file',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_files_file', to='ishtar_common.Import'),
+        ),
+    ]
diff --git a/archaeological_finds/migrations/0113_auto_20230922_1443.py b/archaeological_finds/migrations/0113_auto_20230922_1443.py
new file mode 100644
index 000000000..ba2e761f3
--- /dev/null
+++ b/archaeological_finds/migrations/0113_auto_20230922_1443.py
@@ -0,0 +1,39 @@
+# Generated by Django 2.2.24 on 2023-09-22 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0230_auto_20230922_1443'),
+        ('archaeological_finds', '0112_migrate_created'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='basefind',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_basefind', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='find',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_find', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='property',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_property', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='treatment',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_treatment', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='treatmentfile',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_treatmentfile', to='ishtar_common.Import'),
+        ),
+    ]
diff --git a/archaeological_operations/migrations/0113_auto_20230922_1443.py b/archaeological_operations/migrations/0113_auto_20230922_1443.py
new file mode 100644
index 000000000..7070b0c33
--- /dev/null
+++ b/archaeological_operations/migrations/0113_auto_20230922_1443.py
@@ -0,0 +1,39 @@
+# Generated by Django 2.2.24 on 2023-09-22 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0230_auto_20230922_1443'),
+        ('archaeological_operations', '0112_migrate_created'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='administrativeact',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_administrativeact', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='archaeologicalsite',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_archaeologicalsite', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='operation',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_operation', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='parcel',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_parcel', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='parcelowner',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_parcelowner', to='ishtar_common.Import'),
+        ),
+    ]
diff --git a/archaeological_warehouse/migrations/0119_auto_20230922_1443.py b/archaeological_warehouse/migrations/0119_auto_20230922_1443.py
new file mode 100644
index 000000000..43020abc3
--- /dev/null
+++ b/archaeological_warehouse/migrations/0119_auto_20230922_1443.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.24 on 2023-09-22 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0230_auto_20230922_1443'),
+        ('archaeological_warehouse', '0118_auto_20230807_1106'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='container',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_warehouse_container', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='warehouse',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_warehouse_warehouse', to='ishtar_common.Import'),
+        ),
+    ]
diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md
index cf881bdaf..9940ffad1 100644
--- a/changelog/en/changelog_2022-06-15.md
+++ b/changelog/en/changelog_2022-06-15.md
@@ -9,6 +9,9 @@ v4.0.XX - 2099-12-31
   - automatic progress refresh
   - reorganization of fields
   - improved presentation
+  - 
+### Technical ###
+- update relationship between imports and main items
 
 v4.0.75 - 2024-04-16
 --------------------
diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md
index b5265c4d0..95cc9a36f 100644
--- a/changelog/fr/changelog_2023-01-25.md
+++ b/changelog/fr/changelog_2023-01-25.md
@@ -9,6 +9,8 @@ v4.0.XX - 2099-12-31
   - raffrachissement automatique de l'avancement
   - réorganisation des champs
   - amélioration de la présentation
+### Technique ###
+- relation de mise à jour entre imports et les éléments principaux
 
 v4.0.75 - 2024-04-16
 --------------------
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 45aea5c13..c4805eed6 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1216,8 +1216,11 @@ class Importer(object):
         if self.import_instance:
             self.import_instance.add_imported_line(self.idx_line)
 
-        if self.import_instance and hasattr(obj, "imports") and created:
-            obj.imports.add(self.import_instance)
+        if self.import_instance:
+            if created:
+                obj.imports.add(self.import_instance)
+            else:
+                obj.imports_updated.add(self.import_instance)
 
         if created:
             self.number_created += 1
diff --git a/ishtar_common/migrations/0230_auto_20230920_1417.py b/ishtar_common/migrations/0230_auto_20230922_1443.py
index e7a22d119..7839e0cd0 100644
--- a/ishtar_common/migrations/0230_auto_20230920_1417.py
+++ b/ishtar_common/migrations/0230_auto_20230922_1443.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-09-20 14:17
+# Generated by Django 2.2.24 on 2023-09-22 14:43
 
 import django.core.validators
 from django.db import migrations, models
@@ -36,6 +36,16 @@ class Migration(migrations.Migration):
             options={'verbose_name': 'Import - Item key', 'verbose_name_plural': 'Import - Item keys'},
         ),
         migrations.AddField(
+            model_name='document',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_document', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='geovectordata',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_geovectordata', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
             model_name='import',
             name='next_import',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='imports', to='ishtar_common.Import', verbose_name='Next import'),
@@ -65,6 +75,21 @@ class Migration(migrations.Migration):
             name='tab_number',
             field=models.PositiveIntegerField(default=1, help_text='When using an Excel or Calc file choose the tab number. Keep it to 1 by default.', validators=[django.core.validators.MinValueValidator(1)], verbose_name='Tab number'),
         ),
+        migrations.AddField(
+            model_name='organization',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_organization', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='person',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_person', to='ishtar_common.Import'),
+        ),
+        migrations.AddField(
+            model_name='town',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_town', to='ishtar_common.Import'),
+        ),
         migrations.AlterField(
             model_name='import',
             name='imported_images',
diff --git a/ishtar_common/migrations/0231_default_mandatory_keys.py b/ishtar_common/migrations/0231_default_mandatory_keys.py
index f93891e56..d364f01dc 100644
--- a/ishtar_common/migrations/0231_default_mandatory_keys.py
+++ b/ishtar_common/migrations/0231_default_mandatory_keys.py
@@ -30,7 +30,7 @@ def migrate(apps, __):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0230_auto_20230920_1417'),
+        ('ishtar_common', '0230_auto_20230922_1443'),
     ]
 
     operations = [
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index ccc70d81c..aa6a329c3 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -1098,6 +1098,9 @@ class Imported(models.Model):
     )
     timestamp_geo = models.IntegerField(_("Timestamp geo"), null=True, blank=True)
     timestamp_label = models.IntegerField(_("Timestamp label"), null=True, blank=True)
+    imports_updated = models.ManyToManyField(
+        Import, blank=True, related_name="import_updated_%(app_label)s_%(class)s"
+    )
 
     class Meta:
         abstract = True