Support use of duplicate rest filters keys. So URL's like:

   issues?title=foo&title=bar

will find titles with the words foo and bar but not just foo and not
just bar. Url like:

   issues?status=open,resolved&status=closed

will find any issue with open, closed or resolved status.

Original code would only use the last title or status filter erasing
the earlier one.

Author: rouilj

roundup/rest.py

@@ -681,7 +681,10 @@ def get_collection(self, class_name, input):
                 ):
                     continue
                 if isinstance (prop, (hyperdb.Link, hyperdb.Multilink)):
-                    vals = []
+                    if key in filter_props:
+                        vals = filter_props[key]
+                    else:
+                        vals = []
                     linkcls = self.db.getclass (prop.classname)
                     for p in value.split(","):
                         if prop.try_id_parsing and p.isdigit():
@@ -690,7 +693,13 @@ def get_collection(self, class_name, input):
                             vals.append(linkcls.lookup(p))
                     filter_props[key] = vals
                 else:
-                    filter_props[key] = value
+                    if key in filter_props:
+                        if isinstance(filter_props[key], list):
+                            filter_props[key].append(value)
+                        else:
+                            filter_props[key]=[filter_props[key],value]
+                    else:
+                        filter_props[key] = value
         if not filter_props:
             obj_list = class_obj.list()
         else:

test/rest_common.py

@@ -458,17 +458,17 @@ def testFilter(self):
             priority=self.db.priority.lookup('normal')
         )
         issue_open_norm = self.db.issue.create(
-            title='foo2',
+            title='foo2 normal',
             status=self.db.status.lookup('open'),
             priority=self.db.priority.lookup('normal')
         )
         issue_closed_norm = self.db.issue.create(
-            title='foo3',
+            title='foo3 closed normal',
             status=self.db.status.lookup('closed'),
             priority=self.db.priority.lookup('normal')
         )
         issue_closed_crit = self.db.issue.create(
-            title='foo4',
+            title='foo4 closed',
             status=self.db.status.lookup('closed'),
             priority=self.db.priority.lookup('critical')
         )
@@ -529,6 +529,98 @@ def testFilter(self):
         self.assertNotIn(get_obj(base_path, issue_open_norm),
                          results['data']['collection'])
 
+        # Retrieve all issue status=closed and priority=normal,critical
+        # using duplicate priority key's.
+        form = cgi.FieldStorage()
+        form.list = [
+            cgi.MiniFieldStorage('status', 'closed'),
+            cgi.MiniFieldStorage('priority', 'normal'),
+            cgi.MiniFieldStorage('priority', 'critical')
+        ]
+        results = self.server.get_collection('issue', form)
+        self.assertEqual(self.dummy_client.response_code, 200)
+        self.assertIn(get_obj(base_path, issue_closed_crit),
+                      results['data']['collection'])
+        self.assertIn(get_obj(base_path, issue_closed_norm),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_crit),
+                         results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_norm),
+                         results['data']['collection'])
+
+        # Retrieve all issues with title containing
+        # closed, normal and 3 using duplicate title filterkeys
+        form = cgi.FieldStorage()
+        form.list = [
+            cgi.MiniFieldStorage('title', 'closed'),
+            cgi.MiniFieldStorage('title', 'normal'),
+            cgi.MiniFieldStorage('title', '3')
+        ]
+        results = self.server.get_collection('issue', form)
+        self.assertEqual(self.dummy_client.response_code, 200)
+        self.assertNotIn(get_obj(base_path, issue_closed_crit),
+                      results['data']['collection'])
+        self.assertIn(get_obj(base_path, issue_closed_norm),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_crit),
+                         results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_norm),
+                         results['data']['collection'])
+        self.assertEqual(len(results['data']['collection']), 1)
+
+        # Retrieve all issues (no hits) with title containing
+        # closed, normal and foo3 in this order using title filter
+        form = cgi.FieldStorage()
+        form.list = [
+            cgi.MiniFieldStorage('title', 'closed normal foo3')
+        ]
+        results = self.server.get_collection('issue', form)
+        self.assertEqual(self.dummy_client.response_code, 200)
+        self.assertNotIn(get_obj(base_path, issue_closed_crit),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_closed_norm),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_crit),
+                         results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_norm),
+                         results['data']['collection'])
+        self.assertEqual(len(results['data']['collection']), 0)
+
+        # Retrieve all issues with title containing
+        # foo3, closed and normal in this order using title filter
+        form = cgi.FieldStorage()
+        form.list = [
+            cgi.MiniFieldStorage('title', 'foo3 closed normal')
+        ]
+        results = self.server.get_collection('issue', form)
+        self.assertEqual(self.dummy_client.response_code, 200)
+        self.assertNotIn(get_obj(base_path, issue_closed_crit),
+                      results['data']['collection'])
+        self.assertIn(get_obj(base_path, issue_closed_norm),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_crit),
+                         results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_norm),
+                         results['data']['collection'])
+        self.assertEqual(len(results['data']['collection']), 1)
+
+        # Retrieve all issues with word closed in title
+        form = cgi.FieldStorage()
+        form.list = [
+            cgi.MiniFieldStorage('title', 'closed'),
+        ]
+        results = self.server.get_collection('issue', form)
+        self.assertEqual(self.dummy_client.response_code, 200)
+        self.assertIn(get_obj(base_path, issue_closed_crit),
+                      results['data']['collection'])
+        self.assertIn(get_obj(base_path, issue_closed_norm),
+                      results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_crit),
+                         results['data']['collection'])
+        self.assertNotIn(get_obj(base_path, issue_open_norm),
+                         results['data']['collection'])
+        self.assertEqual(len(results['data']['collection']), 2)
+
     def testPagination(self):
         """
         Test pagination. page_size is required and is an integer