[SDCP-409] fix(search): Filters fail with Agenda ObjectId query

server/features/search_planning.feature

@@ -302,7 +302,7 @@ Feature: Planning Search
         ]}
         """
 
-    @auth @wip
+    @auth
     Scenario: Search by planning specific parameters
         When we get "/events_planning_search?repo=planning&only_future=false&agendas=sports,finance"
         Then we get list with 3 items
@@ -392,3 +392,32 @@ Feature: Planning Search
             {"_id": "planning_4"}
         ]}
         """
+
+    @auth
+    Scenario: Search using Agenda with ObjectId
+        When we post to "agenda"
+        """
+        [{
+            "name": "TestAgenda"
+        }]
+        """
+        Then we get OK response
+        When we post to "planning"
+        """
+        [{
+            "guid": "plan_with_agenda",
+            "headline": "test agenda",
+            "slugline": "slug_agenda",
+            "name": "name_agenda",
+            "planning_date": "2016-01-02T14:00:00+0000",
+            "agendas": ["#agenda._id#"]
+        }]
+        """
+        Then we get OK response
+        When we get "/events_planning_search?repo=planning&only_future=false&agendas=#agenda._id#"
+        Then we get list with 1 items
+        """
+        {"_items": [
+            {"_id": "plan_with_agenda"}
+        ]}
+        """

server/features/search_planning_filters.feature

@@ -0,0 +1,40 @@
+Feature: Planning Search Filters
+    @auth
+    Scenario: Search using Agenda with ObjectId
+        When we post to "agenda"
+        """
+        [{
+            "name": "TestAgenda"
+        }]
+        """
+        Then we get OK response
+        When we post to "planning"
+        """
+        [{
+            "guid": "plan_with_agenda",
+            "headline": "test agenda",
+            "slugline": "slug_agenda",
+            "name": "name_agenda",
+            "planning_date": "2016-01-02T14:00:00+0000",
+            "agendas": ["#agenda._id#"]
+        }]
+        """
+        Then we get OK response
+        When we post to "events_planning_filters"
+        """
+        [{
+            "name": "Test",
+            "item_type": "planning",
+            "params": {
+                "agendas": ["#agenda._id#"]
+            }
+        }]
+        """
+        Then we get OK response
+        When we get "/events_planning_search?repo=planning&only_future=false&filter_id=#events_planning_filters._id#"
+        Then we get list with 1 items
+        """
+        {"_items": [
+            {"_id": "plan_with_agenda"}
+        ]}
+        """

server/planning/search/queries/common.py

@@ -91,7 +91,10 @@ def str_to_date(value: Union[datetime, str]):
 
 
 def search_item_ids(params: Dict[str, Any], query: elastic.ElasticQuery):
-    ids = str_to_array(params.get('item_ids'))
+    ids = [
+        str(item_id)
+        for item_id in str_to_array(params.get('item_ids'))
+    ]
     if len(ids):
         query.must.append(
             elastic.terms(
@@ -287,6 +290,9 @@ def construct_search_query(
 
     if len(filter_params):
         query = elastic.ElasticQuery()
+
+        # Set `only_future` to False as `construct_query` with request params will add this if neccessary
+        filter_params['only_future'] = False
         filter_query = construct_query(filter_params, filters)
 
         remove_filter_params_from_query(filter_params, params)

server/planning/search/queries/events.py

@@ -54,7 +54,10 @@ def search_reference(params: Dict[str, Any], query: elastic.ElasticQuery):
 
 
 def search_source(params: Dict[str, Any], query: elastic.ElasticQuery):
-    sources = str_to_array(params.get('source'))
+    sources = [
+        str(source_id)
+        for source_id in str_to_array(params.get('source'))
+    ]
 
     if len(sources):
         query.must.append(

server/planning/search/queries/planning.py

@@ -28,7 +28,10 @@ def search_planning(_: Dict[str, Any], query: elastic.ElasticQuery):
 
 
 def search_agendas(params: Dict[str, Any], query: elastic.ElasticQuery):
-    agendas = str_to_array(params.get('agendas'))
+    agendas = [
+        str(agenda_id)
+        for agenda_id in str_to_array(params.get('agendas'))
+    ]
 
     if len(agendas):
         query.must.append(
@@ -134,7 +137,10 @@ def search_featured(params: Dict[str, Any], query: elastic.ElasticQuery):
 
 
 def search_by_events(params: Dict[str, Any], query: elastic.ElasticQuery):
-    event_ids = str_to_array(params.get('event_item'))
+    event_ids = [
+        str(event_id)
+        for event_id in str_to_array(params.get('event_item'))
+    ]
     num_ids = len(event_ids)
 
     if num_ids == 1: