qieries changes on lighthouse function

Author: maceto

functions/lighthouse/libs/queries.py

@@ -2,30 +2,30 @@
 import json
 from google.cloud import firestore
 from .result import Result 
+from .utils import convert_to_array
 
 DB = firestore.Client(project=os.environ.get('PROJECT'))
 
 def list_data(params):
-  ref = DB.collection(u'lighthouse')
-
-  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'])
-  if 'geo' in params:
+
+  technology_array = convert_to_array(params['technology'])
+  data = []
+
+  for technology in technology_array:
+    query = DB.collection(u'lighthouse')
+
+    if 'start' in params:
+      query = query.where('date', '>=', params['start'])
+    if 'end' in params:
+      query = query.where('date', '<=', params['end'])
+
     query = query.where('geo', '==', params['geo'])
-  if 'technology' in params:
-    params_array = json.loads(params['technology'])
-    query = query.where('technology', 'in', params_array)
-  if 'rank' in params:
     query = query.where('rank', '==', params['rank'])
+    query = query.where('technology', '==', technology)
 
-  documents = query.stream()
+    documents = query.stream()
 
-  data = []
-  for doc in documents:
-      data.append(doc.to_dict())
+    for doc in documents:
+        data.append(doc.to_dict())
 
   return Result(result=data)

functions/lighthouse/libs/utils.py

@@ -11,3 +11,7 @@ def convert_to_hashes(arr):
         hash_dict = {inner_arr[0]: inner_arr[1]}
         hashes_arr.append(hash_dict)
     return hashes_arr
+
+def convert_to_array(data_string):
+    list = data_string.split(',')
+    return list