Merge pull request #2220 from shuhaib-aot/bugfix/Search-remove-empty-…

…space Removed empty space from for search
AOT-Technologies · Sep 5, 2024 · 17563ce · 17563ce
2 parents d6eb878 + 9f24291
commit 17563ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/forms-flow-api/src/formsflow_api/models/form_process_mapper.py b/forms-flow-api/src/formsflow_api/models/form_process_mapper.py
@@ -223,15 +223,16 @@ def find_all_forms(
         is_active=None,
         form_type=None,
         search=None,
+        **filters,
     ):  # pylint: disable=too-many-arguments
         """Fetch all active and inactive forms which are not deleted."""
         # Get latest row for each form_id group
         filtered_form_query = cls.get_latest_form_mapper_ids()
         filtered_form_ids = [
             data.id for data in filtered_form_query if data.parent_form_id in form_ids
         ]
-
-        query = cls.query.filter(
+        query = cls.filter_conditions(**filters)
+        query = query.filter(
             and_(FormProcessMapper.deleted.is_(False)),
             FormProcessMapper.id.in_(filtered_form_ids),
         )
@@ -276,14 +277,16 @@ def find_all_active_by_formid(
         sort_order=None,
         search=None,
         form_ids=None,
+        **filters,
     ):  # pylint: disable=too-many-arguments
         """Fetch all active form process mappers by authorized forms."""
         # Get latest row for each form_id group
         filtered_form_query = cls.get_latest_form_mapper_ids()
         filtered_form_ids = [
             data.id for data in filtered_form_query if data.parent_form_id in form_ids
         ]
-        query = cls.query.filter(
+        query = cls.filter_conditions(**filters)
+        query = query.filter(
             FormProcessMapper.id.in_(filtered_form_ids),
         )
         query = cls.add_search_filter(query=query, search=search)

diff --git a/forms-flow-api/src/formsflow_api/resources/form_process_mapper.py b/forms-flow-api/src/formsflow_api/resources/form_process_mapper.py
@@ -286,7 +286,7 @@ def get():  # pylint: disable=too-many-locals
             form_type = form_type.split(",")
         if search:
             search = search.replace("%", r"\%").replace("_", r"\_")
-            search = search.split(" ")
+            search = [key for key in search.split(" ") if key.strip()]
 
         (
             form_process_mapper_schema,