fix(test): fix backend test

PnX-SI · Dec 31, 2024 · 207d552 · 207d552
1 parent 3b0805b
commit 207d552
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/backend/geonature/core/gn_meta/models/aframework.py b/backend/geonature/core/gn_meta/models/aframework.py
@@ -312,15 +312,15 @@ def filter_by_params(cls, params={}, *, _ds_search=True, query=None):
 
         search = params.get("search")
         if search:
-
+            search = search.strip()
             # Where clauses to include other matching possibilities (id, uuid, date)
             where_clauses = []
             if search.isdigit():  # ID AF match
                 where_clauses.append(TAcquisitionFramework.id_acquisition_framework == int(search))
 
-            if len(search) > 5:  # UUID and date match
+            if len(search) >= MIN_LENGTH_UUID_OR_DATE_SEARCH_STRING:  # UUID and date match
                 where_clauses.append(
-                    sa.cast(TAcquisitionFramework.unique_acquisition_framework_id, sa.String).ilike(
+                    sa.cast(TAcquisitionFramework.unique_acquisition_framework_id, sa.String).like(
                         f"%{search}%"
                     )
                 )
@@ -362,14 +362,9 @@ def filter_by_params(cls, params={}, *, _ds_search=True, query=None):
                     TAcquisitionFramework.id_acquisition_framework,
                 )
             ).cte("matched_words_af_cte")
-
-            query = (
-                select(TAcquisitionFramework)
-                .where(
-                    matched_words_af_cte.c.id_acquisition_framework
-                    == TAcquisitionFramework.id_acquisition_framework
-                )
-                .order_by(matched_words_af_cte.c.match_count.desc())
-            )
+            query = query.where(
+                matched_words_af_cte.c.id_acquisition_framework
+                == TAcquisitionFramework.id_acquisition_framework
+            ).order_by(matched_words_af_cte.c.match_count.desc())
 
         return query
diff --git a/backend/geonature/core/gn_meta/models/commons.py b/backend/geonature/core/gn_meta/models/commons.py
@@ -11,6 +11,8 @@
 
 from geonature.utils.env import DB, db
 
+MIN_LENGTH_UUID_OR_DATE_SEARCH_STRING = 5
+
 
 class DateFilterSchema(ma.Schema):
     year = ma.fields.Integer()

diff --git a/backend/geonature/core/gn_meta/models/datasets.py b/backend/geonature/core/gn_meta/models/datasets.py
@@ -274,13 +274,13 @@ class DatasetFilterSchema(MetadataFilterSchema):
 
         search = params.get("search")
         if search:
-
+            search = search.strip()
             # Where clauses to include other matching possibilities (id, uuid)
             where_clauses = []
             if search.isdigit():  # ID AF match
                 where_clauses.append(cls.id_dataset == int(search))
 
-            if len(search) > 5:  # UUID match
+            if len(search) >= MIN_LENGTH_UUID_OR_DATE_SEARCH_STRING:  # UUID match
                 where_clauses.append(sa.cast(cls.unique_dataset_id, sa.String).ilike(f"%{search}%"))
 
             # if name search include acquisition framework

diff --git a/backend/geonature/tests/test_gn_meta.py b/backend/geonature/tests/test_gn_meta.py
@@ -3,6 +3,7 @@
 from io import StringIO
 from unittest.mock import patch
 
+
 import pytest
 from flask import url_for
 from geoalchemy2.shape import to_shape
@@ -824,7 +825,6 @@ def test_get_dataset_search(self, users, datasets, module):
     def test_get_dataset_search_uuid(self, users, datasets):
         ds = datasets["own_dataset"]
         set_logged_user(self.client, users["admin_user"])
-
         response = self.client.get(
             url_for("gn_meta.get_datasets"),
             json={"search": str(ds.unique_dataset_id)[:5]},