✨ criteria search: adapt searches for relative search (dates and numbers)

1 files changed, 84 insertions, 110 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 7a8715f1b..79faecb0d 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1241,25 +1241,35 @@ class Find(
     }
 
     DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
-        "treatments__file__end_date__lte",
-        "treatments__end_date__lte",
-        "base_finds__discovery_date__lte",
-        "base_finds__discovery_date__gte",
-        "base_finds__discovery_date_taq__lte",
-        "base_finds__discovery_date_taq__gte",
-        "check_date__lte",
-        "check_date__gte",
-        "appraisal_date__lte",
-        "appraisal_date__gte",
-        "museum_entry_date__lte",
-        "museum_entry_date__gte",
-        "museum_entry_date_end__lte",
-        "museum_entry_date_end__gte",
+        "treatments__file__end_date",
+        "treatments__end_date",
+        "base_finds__discovery_date",
+        "base_finds__discovery_date_taq",
+        "check_date",
+        "appraisal_date",
+        "museum_entry_date",
+        "museum_entry_date_end",
         "museum_allocation_date",
-        "museum_allocation_date__lte",
-        "museum_allocation_date__gte",
     ]
-    NUMBER_FIELDS = ["base_finds__context_record__operation__year"]
+    NUMBER_FIELDS = [
+        "base_finds__context_record__operation__year",
+        "base_finds__context_record__operation__operation_code",
+        "insurance_value",
+        "estimated_value",
+        "length",
+        "width",
+        "height",
+        "thickness",
+        "diameter",
+        "circumference",
+        "volume",
+        "weight",
+        "clutter_long_side",
+        "clutter_short_side",
+        "clutter_height",
+        "estimated_value",
+        "insurance_value",
+    ] + GeographicSubTownItem.NUMBER_FIELDS
     BASE_REQUEST = {"downstream_treatment__isnull": True}
     EXTRA_REQUEST_KEYS = {
         "all_base_finds__context_record": "base_finds__context_record__context_record_tree_parent__cr_parent_id",
@@ -1432,12 +1442,12 @@ class Find(
         ),
         "loan": SearchAltName(pgettext_lazy("key for text search", "loan"), query_loan),
         "treatments_file_end_date": SearchAltName(
-            pgettext_lazy("key for text search", "treatment-file-end-date-before"),
-            "treatments__file__end_date__lte",
+            pgettext_lazy("key for text search", "treatment-file-end-date"),
+            "treatments__file__end_date",
         ),
         "treatments_end_date": SearchAltName(
-            pgettext_lazy("key for text search", "treatment-end-date-before"),
-            "treatments__end_date__lte",
+            pgettext_lazy("key for text search", "treatment-end-date"),
+            "treatments__end_date",
         ),
         "previous_id": SearchAltName(
             pgettext_lazy("key for text search", "previous-id"), "previous_id__iexact"
@@ -1466,21 +1476,13 @@ class Find(
         "mark": SearchAltName(
             pgettext_lazy("key for text search", "mark"), "mark__iexact"
         ),
-        "base_finds__discovery_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-before"),
-            "base_finds__discovery_date__lte",
-        ),
-        "base_finds__discovery_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-after"),
-            "base_finds__discovery_date__gte",
+        "base_finds__discovery_date": SearchAltName(
+            pgettext_lazy("key for text search", "discovery-date"),
+            "base_finds__discovery_date",
         ),
-        "base_finds__discovery_date_taq__before": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-taq-before"),
-            "base_finds__discovery_date_taq__lte",
-        ),
-        "base_finds__discovery_date_taq__after": SearchAltName(
-            pgettext_lazy("key for text search", "discovery-date-taq-after"),
-            "base_finds__discovery_date_taq__gte",
+        "base_finds__discovery_date_taq": SearchAltName(
+            pgettext_lazy("key for text search", "discovery-date-taq"),
+            "base_finds__discovery_date_taq",
         ),
         "is_complete": SearchAltName(
             pgettext_lazy("key for text search", "is-complete"), "is_complete"
@@ -1566,42 +1568,42 @@ class Find(
             pgettext_lazy("key for text search", "clutter-height-lower"),
             "clutter_height__lte",
         ),
-        "length__higher": SearchAltName(
-            pgettext_lazy("key for text search", "length-higher"), "length__gte"
+        "length": SearchAltName(
+            pgettext_lazy("key for text search", "length"), "length"
         ),
-        "width__higher": SearchAltName(
-            pgettext_lazy("key for text search", "width-higher"), "width__gte"
+        "width": SearchAltName(
+            pgettext_lazy("key for text search", "width"), "width"
         ),
-        "height__higher": SearchAltName(
-            pgettext_lazy("key for text search", "height-higher"), "height__gte"
+        "height": SearchAltName(
+            pgettext_lazy("key for text search", "height"), "height"
         ),
-        "thickness__higher": SearchAltName(
-            pgettext_lazy("key for text search", "thickness-higher"), "thickness__gte"
+        "thickness": SearchAltName(
+            pgettext_lazy("key for text search", "thickness"), "thickness"
         ),
-        "diameter__higher": SearchAltName(
-            pgettext_lazy("key for text search", "diameter-higher"), "diameter__gte"
+        "diameter": SearchAltName(
+            pgettext_lazy("key for text search", "diameter"), "diameter"
         ),
-        "circumference__higher": SearchAltName(
-            pgettext_lazy("key for text search", "circumference-higher"),
-            "circumference__gte",
+        "circumference": SearchAltName(
+            pgettext_lazy("key for text search", "circumference"),
+            "circumference",
         ),
-        "volume__higher": SearchAltName(
-            pgettext_lazy("key for text search", "volume-higher"), "volume__gte"
+        "volume": SearchAltName(
+            pgettext_lazy("key for text search", "volume"), "volume"
         ),
-        "weight__higher": SearchAltName(
-            pgettext_lazy("key for text search", "weight-higher"), "weight__gte"
+        "weight": SearchAltName(
+            pgettext_lazy("key for text search", "weight"), "weight"
         ),
-        "clutter_long_side__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-long-side-higher"),
-            "clutter_long_side__gte",
+        "clutter_long_side": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-long-side"),
+            "clutter_long_side",
         ),
-        "clutter_short_side__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-short-side-higher"),
-            "clutter_short_side__gte",
+        "clutter_short_side": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-short-side"),
+            "clutter_short_side",
         ),
-        "clutter_height__higher": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-height-higher"),
-            "clutter_height__gte",
+        "clutter_height": SearchAltName(
+            pgettext_lazy("key for text search", "clutter-height"),
+            "clutter_height",
         ),
         "dimensions_comment": SearchAltName(
             pgettext_lazy("key for text search", "dimensions-comment"),
@@ -1611,11 +1613,8 @@ class Find(
             pgettext_lazy("key for text search", "topographic-localisation"),
             "base_finds__topographic_localisation__iexact",
         ),
-        "check_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "check-date-before"), "check_date__lte"
-        ),
-        "check_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "check-date-after"), "check_date__gte"
+        "check_date": SearchAltName(
+            pgettext_lazy("key for text search", "check-date"), "check_date"
         ),
         "alterations": SearchAltName(
             pgettext_lazy("key for text search", "alterations"),
@@ -1629,29 +1628,17 @@ class Find(
             pgettext_lazy("key for text search", "treatment-emergency"),
             "treatment_emergency__label__iexact",
         ),
-        "estimated_value__higher": SearchAltName(
-            pgettext_lazy("key for text search", "estimated-value-higher"),
-            "estimated_value__gte",
-        ),
-        "estimated_value__lower": SearchAltName(
-            pgettext_lazy("key for text search", "estimated-value-lower"),
-            "estimated_value__lte",
+        "estimated_value": SearchAltName(
+            pgettext_lazy("key for text search", "estimated-value"),
+            "estimated_value",
         ),
-        "insurance_value__higher": SearchAltName(
-            pgettext_lazy("key for text search", "insurance-value-higher"),
-            "insurance_value__gte",
+        "insurance_value": SearchAltName(
+            pgettext_lazy("key for text search", "insurance-value"),
+            "insurance_value",
         ),
-        "insurance_value__lower": SearchAltName(
-            pgettext_lazy("key for text search", "insurance-value-lower"),
-            "insurance_value__lte",
-        ),
-        "appraisal_date__before": SearchAltName(
-            pgettext_lazy("key for text search", "appraisal-date-before"),
-            "appraisal_date__lte",
-        ),
-        "appraisal_date__after": SearchAltName(
-            pgettext_lazy("key for text search", "appraisal-date-after"),
-            "appraisal_date__gte",
+        "appraisal_date": SearchAltName(
+            pgettext_lazy("key for text search", "appraisal-date"),
+            "appraisal_date",
         ),
         "cultural_attributions": SearchAltName(
             pgettext_lazy("key for text search", "cultural-attribution"),
@@ -1728,21 +1715,13 @@ class Find(
             pgettext_lazy("key for text search", "museum-entry-mode-comment"),
             "museum_entry_mode_comment__iexact"
         ),
-        "museum_entry_date_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-before"),
-            "museum_entry_date__lte"
-        ),
-        "museum_entry_date_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-after"),
-            "museum_entry_date__gte"
+        "museum_entry_date": SearchAltName(
+            pgettext_lazy("key for text search", "museum-entry-date"),
+            "museum_entry_date"
         ),
-        "museum_entry_date_end_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-end-before"),
-            "museum_entry_date_end__lte"
-        ),
-        "museum_entry_date_end_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-entry-date-end-after"),
-            "museum_entry_date_end__gte"
+        "museum_entry_date_end": SearchAltName(
+            pgettext_lazy("key for text search", "museum-entry-date-end"),
+            "museum_entry_date_end"
         ),
         "museum_entry_date_comment": SearchAltName(
             pgettext_lazy("key for text search", "museum-entry-date-comment"),
@@ -1797,13 +1776,9 @@ class Find(
             "museum_original_repro__label__iexact",
             related_name="museum_original_repro"
     ),
-        "museum_allocation_date_before": SearchAltName(
-            pgettext_lazy("key for text search", "museum-allocation-date-before"),
-            "museum_allocation_date__lte"
-        ),
-        "museum_allocation_date_after": SearchAltName(
-            pgettext_lazy("key for text search", "museum-allocation-date-after"),
-            "museum_allocation_date__gte"
+        "museum_allocation_date": SearchAltName(
+            pgettext_lazy("key for text search", "museum-allocation-date"),
+            "museum_allocation_date"
         ),
         "museum_purchase_price": SearchAltName(
             pgettext_lazy("key for text search", "museum-purchase-price"),
@@ -2825,8 +2800,7 @@ class Find(
         return self.non_modif_treatments(15)
 
     def associated_treatment_files(self):
-        from archaeological_finds.models_treatments import TreatmentFile
-
+        TreatmentFile = apps.get_model("archaeological_finds", "TreatmentFile")
         return TreatmentFile.objects.filter(
             associated_basket__items__pk=self.pk
         ).order_by("reception_date", "creation_date", "end_date")