Allow for multiple terms in facet_filter

monolith/client/__init__.py

@@ -116,16 +116,13 @@ def __call__(self, field, start, end, interval=DAY, strict_range=False,
             }
         }
 
-        if len(terms) > 0:
-            term = {}
-
-            for key, value in terms.items():
-                term[key] = value
+        if terms:
 
             range_ = query['facets']['histo1']['facet_filter']['range']
-            filter_ = {'and': [{'term': term},
-                               {'range': range_}]}
-            query['facets']['histo1']['facet_filter'] = filter_
+
+            query['facets']['histo1']['facet_filter'] = {
+                'and': ([{'term': {k: v}} for k, v in terms.items()] +
+                        [{'range': range_}])}
 
         with self.statsd.timer('elasticsearch-query'):
             res = self.session.post(self.es, data=json.dumps(query))

monolith/client/tests/test_client.py

@@ -28,6 +28,7 @@ def setUp(self):
                 'date': '2012-%.2d-01' % j,
                 'downloads_count': j,
                 'add_on': str(j % 2),
+                'is_something': True,
             })
         self.es_client.refresh()
         self.server.wait()
@@ -76,6 +77,13 @@ def test_monthly(self):
                             interval='month', add_on='2'))
         self.assertNotEqual(hits, hits2)
 
+    def test_multiple_terms(self):
+        client = self._make_one()
+        hits = list(client('downloads_count', start, '2012-05-01',
+                           interval='month', add_on=1, is_something=True))
+        self.assertEqual(len(hits), 5)
+        self.assertEqual(len([h for h in hits if h['count']]), 2)
+
     def test_global_daily_strict(self):
         client = self._make_one()
         hits = list(client('downloads_count', start, end, strict_range=True))