🐛 fix many date and numeric searches (refs #5928)

1 files changed, 12 insertions, 44 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 5f8c30701..68c988517 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1241,7 +1241,7 @@ class Find(
     }
 
     DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
-        "treatments__file__end_date",
+        "basket__treatment_files__end_date",
         "treatments__end_date",
         "base_finds__discovery_date",
         "base_finds__discovery_date_taq",
@@ -1264,11 +1264,16 @@ class Find(
         "circumference",
         "volume",
         "weight",
+        "find_number",
+        "min_number_of_individuals",
+        "datings__start_date",
+        "datings__end_date",
         "clutter_long_side",
         "clutter_short_side",
         "clutter_height",
-        "estimated_value",
-        "insurance_value",
+        "museum_inventory_entry_year",
+        "museum_inventory_quantity",
+        "museum_observed_quantity",
     ] + GeographicSubTownItem.NUMBER_FIELDS
     BASE_REQUEST = {"downstream_treatment__isnull": True}
     EXTRA_REQUEST_KEYS = {
@@ -1443,7 +1448,7 @@ 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"),
-            "treatments__file__end_date",
+            "basket__treatment_files__end_date",
         ),
         "treatments_end_date": SearchAltName(
             pgettext_lazy("key for text search", "treatment-end-date"),
@@ -1531,43 +1536,6 @@ class Find(
             pgettext_lazy("key for text search", "conservatory-comment"),
             "conservatory_comment__iexact",
         ),
-        "length__lower": SearchAltName(
-            pgettext_lazy("key for text search", "length-lower"), "length__lte"
-        ),
-        "width__lower": SearchAltName(
-            pgettext_lazy("key for text search", "width-lower"), "width__lte"
-        ),
-        "height__lower": SearchAltName(
-            pgettext_lazy("key for text search", "height-lower"), "height__lte"
-        ),
-        "thickness__lower": SearchAltName(
-            pgettext_lazy("key for text search", "thickness-lower"), "thickness__lte"
-        ),
-        "diameter__lower": SearchAltName(
-            pgettext_lazy("key for text search", "diameter-lower"), "diameter__lte"
-        ),
-        "circumference__lower": SearchAltName(
-            pgettext_lazy("key for text search", "circumference-lower"),
-            "circumference__lte",
-        ),
-        "volume__lower": SearchAltName(
-            pgettext_lazy("key for text search", "volume-lower"), "volume__lte"
-        ),
-        "weight__lower": SearchAltName(
-            pgettext_lazy("key for text search", "weight-lower"), "weight__lte"
-        ),
-        "clutter_long_side__lower": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-long-side-lower"),
-            "clutter_long_side__lte",
-        ),
-        "clutter_short_side__lower": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-short-side-lower"),
-            "clutter_short_side__lte",
-        ),
-        "clutter_height__lower": SearchAltName(
-            pgettext_lazy("key for text search", "clutter-height-lower"),
-            "clutter_height__lte",
-        ),
         "length": SearchAltName(
             pgettext_lazy("key for text search", "length"), "length"
         ),
@@ -1702,7 +1670,7 @@ class Find(
             pgettext_lazy("key for text search", "museum-custodian-institution"),
             "museum_custodian_institution__name__iexact",
             related_name="museum_custodian_institution"
-    ),
+        ),
         "museum_depositor_inventory_number": SearchAltName(
             pgettext_lazy("key for text search", "museum-depositor-inventory-number"),
             "museum_depositor_inventory_number__iexact"
@@ -1782,11 +1750,11 @@ class Find(
         ),
         "museum_inventory_quantity": SearchAltName(
             pgettext_lazy("key for text search", "museum-inventory-quantity"),
-            "museum_inventory_quantity__iexact"
+            "museum_inventory_quantity"
         ),
         "museum_observed_quantity": SearchAltName(
             pgettext_lazy("key for text search", "museum-observed-quantity"),
-            "museum_observed_quantity__iexact"
+            "museum_observed_quantity"
         ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)