Merge pull request #15 from HTTPArchive/development

New prod version
HTTPArchive · Nov 28, 2023 · ce134ea · ce134ea
2 parents c429f8b + be3d94f
commit ce134ea
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 23 deletions.
diff --git a/functions/adoption/libs/queries.py b/functions/adoption/libs/queries.py
@@ -4,13 +4,13 @@
 from .result import Result 
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
   ref = DB.collection(u'adoption')
 
   query = ref
-  print("params", params)
+
   if 'start' in params:
     query = query.where('date', '>=', params['start'])
   if 'end' in params:

diff --git a/functions/adoption/libs/utils.py b/functions/adoption/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -13,5 +14,6 @@ def convert_to_hashes(arr):
     return hashes_arr
 
 def convert_to_array(data_string):
-    list = data_string.split(',')
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
     return list
diff --git a/functions/categories/libs/queries.py b/functions/categories/libs/queries.py
@@ -4,7 +4,7 @@
 from .result import Result 
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
   ref = DB.collection(u'categories')

diff --git a/functions/categories/libs/utils.py b/functions/categories/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -13,5 +14,6 @@ def convert_to_hashes(arr):
     return hashes_arr
 
 def convert_to_array(data_string):
-    list = data_string.split(',')
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
     return list
diff --git a/functions/cwvtech/libs/queries.py b/functions/cwvtech/libs/queries.py
@@ -2,24 +2,27 @@
 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'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
   ref = DB.collection(u'core_web_vitals')
 
   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:
-    if params['geo'] != 'ALL':
-      query = query.where('geo', '==', params['geo'])
+    query = query.where('geo', '==', params['geo'])
+
   if 'technology' in params:
-    query = query.where('technology', '==', params['technology'])
+    params_array = convert_to_array(params['technology'])
+    query = query.where('technology', 'in', params_array)
+
   if 'rank' in params:
     query = query.where('rank', '==', params['rank'])
 

diff --git a/functions/cwvtech/libs/utils.py b/functions/cwvtech/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -11,3 +12,8 @@ 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):
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
+    return list
diff --git a/functions/lighthouse/libs/queries.py b/functions/lighthouse/libs/queries.py
@@ -4,7 +4,7 @@
 from .result import Result 
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
 
@@ -19,9 +19,7 @@ def list_data(params):
     if 'end' in params:
       query = query.where('date', '<=', params['end'])
 
-    if params['geo'] != 'ALL':
-      query = query.where('geo', '==', params['geo'])
-
+    query = query.where('geo', '==', params['geo'])
     query = query.where('rank', '==', params['rank'])
     query = query.where('technology', '==', technology)
 

diff --git a/functions/lighthouse/libs/utils.py b/functions/lighthouse/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -13,5 +14,6 @@ def convert_to_hashes(arr):
     return hashes_arr
 
 def convert_to_array(data_string):
-    list = data_string.split(',')
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
     return list
diff --git a/functions/page-weight/libs/queries.py b/functions/page-weight/libs/queries.py
@@ -4,7 +4,7 @@
 from .result import Result 
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
   ref = DB.collection(u'page_weight')
@@ -17,9 +17,11 @@ def list_data(params):
     query = query.where('date', '<=', params['end'])
   if 'geo' in params:
     query = query.where('geo', '==', params['geo'])
+
   if 'technology' in params:
     params_array = convert_to_array(params['technology'])
     query = query.where('technology', 'in', params_array)
+
   if 'rank' in params:
     query = query.where('rank', '==', params['rank'])
 

diff --git a/functions/page-weight/libs/utils.py b/functions/page-weight/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -13,5 +14,6 @@ def convert_to_hashes(arr):
     return hashes_arr
 
 def convert_to_array(data_string):
-    list = data_string.split(',')
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
     return list
diff --git a/functions/technologies/libs/queries.py b/functions/technologies/libs/queries.py
@@ -4,21 +4,19 @@
 from .result import Result 
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'))
+DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
   ref = DB.collection(u'technologies')
 
   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:
-    if params['geo'] != 'ALL':
-      query = query.where('geo', '==', params['geo'])
+    query = query.where('geo', '==', params['geo'])
   if 'technology' in params:
     params_array = convert_to_array(params['technology'])
     query = query.where('technology', 'in', params_array)

diff --git a/functions/technologies/libs/utils.py b/functions/technologies/libs/utils.py
@@ -1,4 +1,5 @@
 import json
+from urllib.parse import unquote
 
 def output(result, headers={}):
   status = 200 if result.success() else 400
@@ -13,5 +14,6 @@ def convert_to_hashes(arr):
     return hashes_arr
 
 def convert_to_array(data_string):
-    list = data_string.split(',')
+    decoded_data = unquote(data_string)
+    list = decoded_data.split(',')
     return list