Treatments: better management of merge - tests

1 files changed, 6 insertions, 13 deletions

diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index a902741a3..29afc94e3 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -321,26 +321,19 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
         create_new_find = bool([tp for tp in treatment_types
                                 if tp.create_new_find])
 
-        dating_keys = ["period", "start_date", "end_date", "dating_type",
-                       "quality", "precise_dating"]
-        current_datings = []
         current_base_finds = []
         current_documents = []
         for upstream_item in upstream_items:
             # datings are not explicitly part of the resulting_find
             # need to reassociate with no duplicate
             for dating in upstream_item.datings.all():
-                current_dating = []
-                for key in dating_keys:
-                    value = getattr(dating, key)
-                    if hasattr(value, 'pk'):
-                        value = value.pk
-                    current_dating.append(value)
-                current_dating = tuple(current_dating)
-                if current_dating in current_datings:
-                    # do not add similar dating
+                is_present = False
+                for current_dating in new_find.datings.all():
+                    if Dating.is_identical(current_dating, dating):
+                        is_present = True
+                        break
+                if is_present:
                     continue
-                current_datings.append(current_dating)
                 dating.pk = None  # duplicate
                 dating.save()
                 new_find.datings.add(dating)