From 9c0e895c16009dce46e4ca50e19a776eadf7dff7 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 30 Oct 2024 14:01:59 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20du=20fix=20des=20dupliqu?=
 =?UTF-8?q?=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #180
---
 src/agenda_culturel/forms.py                      |  6 +++---
 src/agenda_culturel/models.py                     | 15 ++++++++++++++-
 .../templates/agenda_culturel/fix_duplicate.html  |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py
index 1159027..62d70d5 100644
--- a/src/agenda_culturel/forms.py
+++ b/src/agenda_culturel/forms.py
@@ -162,13 +162,13 @@ class FixDuplicates(Form):
             choices += [
                 (
                     "SelectA",
-                    "Ces événements sont identiques, on garde A et on masque B",
+                    "Ces événements sont identiques, on conserve A et on masque B",
                 )
             ]
             choices += [
                 (
                     "SelectB",
-                    "Ces événements sont identiques, on garde B et on masque A",
+                    "Ces événements sont identiques, on conserve B et on masque A",
                 )
             ]
             choices += [
@@ -189,7 +189,7 @@ class FixDuplicates(Form):
                 choices += [
                     (
                         "Select" + i,
-                        "Ces événements sont identiques, on garde "
+                        "Ces événements sont identiques, on conserve "
                         + i
                         + " et on masque les autres",
                     )
diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py
index 9f1534a..b7d5708 100644
--- a/src/agenda_culturel/models.py
+++ b/src/agenda_culturel/models.py
@@ -222,7 +222,11 @@ class DuplicatedEvents(models.Model):
             if event is None:
                 event = e
             e.masked = e != event
-        Event.objects.bulk_update(events, fields=["masked"])
+            if e != event and e.same_uuid(event):
+                e.status = Event.STATUS.TRASH
+        if not event is None:
+            event.status = Event.STATUS.PUBLISHED
+        Event.objects.bulk_update(events, fields=["masked", "status"])
         self.save()
         return len(events)
         
@@ -953,6 +957,15 @@ class Event(models.Model):
                 if Event.is_ancestor_uuid(s_uuid, e_uuid):
                     return True
         return False
+    
+    def same_uuid(self, event):
+        if self.uuids is None or event.uuids is None:
+            return False
+        for s_uuid in self.uuids:
+            for e_uuid in event.uuids:
+                if s_uuid == e_uuid:
+                    return True
+        return False
 
     def get_possibly_duplicated(self):
         if self.possibly_duplicated is None:
diff --git a/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html b/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html
index 5e6cc00..6a68eb9 100644
--- a/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html
+++ b/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html
@@ -29,6 +29,7 @@
 
             <form method="post">{% csrf_token %}
                 {{ form.as_p }}
+                <p>Remarque&nbsp;: les éléments masqués qui ont la même source que l'élément à l'élément conservé seront également marqués supprimés.</p>
                 <div class="grid buttons">
                     <a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{% url 'duplicates' %}{% endif %}" role="button" class="secondary">Annuler</a>
                     <input type="submit" value="Appliquer">