Merge pull request #36 from sopu/aggregationTweaks

Adds 'count' as an argument in aggregations API

Author: sudheesh001

loklak.py

@@ -215,7 +215,7 @@ def suggest(self, query=None, count=None, order=None, orderby=None,since=None, u
             return json.dumps(return_to_user)
 
     def aggregations(self, query=None, since=None, until=None,
-                     fields=None, limit=None):
+                     fields=None, limit=6, count=0):
         """Gives the aggregations of the application"""
         aggregations_application = 'api/search.json'
         url_to_give = self.baseUrl+aggregations_application
@@ -224,6 +224,7 @@ def aggregations(self, query=None, since=None, until=None,
         self.until = until
         self.fields = fields
         self.limit = limit
+        self.count = count
         if query:
             params = {}
             params['query'] = self.query
@@ -232,16 +233,12 @@ def aggregations(self, query=None, since=None, until=None,
             if until:
                 params['query'] = params['query']+' until:'+self.until
             if fields:
-                field_string = ''
-                for i in self.fields:
-                    field_string += i + ','
-                params['fields'] = field_string
-            if limit:
-                params['limit'] = self.limit
-            if limit is None:
-                limit = 6
-                params['limit'] = self.limit
-            params['count'] = 0
+                if isinstance(fields, list):
+                    params['fields'] = ','.join(self.fields)
+                else:
+                    params['fields'] = self.fields
+
+            params['count'] = self.count
             params['source'] = 'cache'
             return_to_user = requests.get(url_to_give, params=params)
             if return_to_user.status_code == 200:

test.py

@@ -14,15 +14,15 @@ def test_status(self):
         """test status"""
         result = self.loklak.status()
 
-        self.assertTrue('index_sizes' in result)
+        self.assertTrue('index' in result)
         result_properties = [
             'messages', 'mps', 'users', 'queries',
             'accounts', 'user', 'followers', 'following'
         ]
         for prop in result_properties:
             self.assertTrue(
-                prop in result['index_sizes'],
-                msg='{} not found in index_sizes'.format(prop)
+                prop in result['index'],
+                msg='{} not found in index'.format(prop)
             )
 
     def test_hello(self):