app, client and rank parameters added

Author: maceto

functions/report/libs/queries.py

@@ -1,4 +1,5 @@
 import os
+import json
 from google.cloud import firestore
 from .result import Result 
 
@@ -8,16 +9,23 @@ def list_data(params):
   ref = DB.collection(u'reports')
 
   query = ref
-
+  print("params", params)
   if 'start' in params:
     query = query.where('date', '>=', params['start'])
   if 'end' in params:
-    query = query.where('date', '<', params['end'])
+    query = query.where('date', '<=', params['end'])
   if 'category' in params:
     query = query.where('category', '==', params['category'])
   if 'geo' in params:
     query = query.where('geo', '==', params['geo'])
-  
+  if 'app' in params:
+    params_array = json.loads(params['app'])
+    query = query.where('app', 'in', params_array)
+  if 'client' in params:
+    query = query.where('client', '==', params['client'])
+  if 'rank' in params:
+    query = query.where('rank', '==', params['rank'])
+
   documents = query.stream()
 
   data = {}