optimized filters

Author: max-ostapenko

Diff for: functions/categories/libs/queries.py

@@ -1,41 +1,34 @@
 import os
 from google.cloud import firestore
-from google.cloud.firestore_v1.base_query import FieldFilter
+from google.cloud.firestore_v1.base_query import FieldFilter, Or
 from .result import Result
 from .utils import convert_to_array
 
-DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
-TABLE = 'categories'
+DB = firestore.Client(
+    project=os.environ.get("PROJECT"), database=os.environ.get("DATABASE")
+)
 
 def list_data(params):
-  ref = DB.collection(TABLE)
+    ref = DB.collection("categories")
 
-  query = ref.order_by('category', direction=firestore.Query.ASCENDING)
+    query = ref.order_by("category", "asc")
 
-  data = []
+    if "category" in params:
+        category_array = convert_to_array(params["category"])
+        filter_array = []
+        for category in category_array:
+            filter_array.append(FieldFilter("category", "==", category))
+        query = query.where(filter=Or(filters=filter_array))
 
-  if 'onlyname' in params:
     documents = query.stream()
-
-    for doc in documents:
-      item = doc.to_dict()
-      if 'category' in item:
-        data.append(item['category'])
-
-  else:
-
-    if 'category' in params:
-      category_array = convert_to_array(params['category'])
-
-      for category in category_array:
-        results = query.where(filter=FieldFilter("category", "==", category)).stream()
-        for doc in results:
-          data.append(doc.to_dict())
+    data = []
+    
+    if "onlyname" in params:
+        for doc in documents:
+            data.append(doc.get("category"))
 
     else:
-      documents = query.stream()
-
-      for doc in documents:
-        data.append(doc.to_dict())
+        for doc in documents:
+            data.append(doc.to_dict())
 
-  return Result(result=data)
+    return Result(result=data)

Diff for: functions/technologies/libs/queries.py

@@ -7,54 +7,44 @@
 from .utils import convert_to_array
 from .presenters import Presenters
 
-DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
+DB = firestore.Client(
+    project=os.environ.get("PROJECT"), database=os.environ.get("DATABASE")
+)
 
 def list_data(params):
-  onlyname = False
-  ref = DB.collection('technologies')
-
-  query = ref
-
-  if 'technology' in params:
-    arfilters = []
-    params_array = convert_to_array(params['technology'])
-    for tech in params_array:
-      arfilters.append(FieldFilter('technology', '==', tech))
-
-    or_filter = Or(filters=arfilters)
-
-    query = query.where(filter=or_filter)
-
-  if 'category' in params:
-    params_array = convert_to_array(params['category'])
-    query = query.where(filter=FieldFilter('category_obj', 'array_contains_any', params_array))
-
-  if 'client' in params:
-    query = query.where(filter=FieldFilter('client', '==', params['client']))
-
-  if 'onlyname' in params:
-    onlyname = True
-
-  if 'sort' not in params:
-    query = query.order_by('technology', direction=firestore.Query.ASCENDING)
-  else:
-    if params['sort'] == 'origins':
-      query = query.order_by('origins', direction=firestore.Query.DESCENDING)
-
-
-  documents = query.stream()
-
-  data = []
-  if onlyname and 'client' not in params:
-    appended_technologies = set()
-    for doc in documents:
-      technology = doc.get('technology')
-      if technology not in appended_technologies:
-        appended_technologies.add(technology)
-        data.append(technology)
-
-  else:
-    for doc in documents:
-      data.append(Presenters.technology(doc.to_dict()))
-
-  return Result(result=data)
+    ref = DB.collection("technologies")
+
+    query = ref.order_by("technology", 'asc')
+
+    if "technology" in params:
+        arfilters = []
+        params_array = convert_to_array(params["technology"])
+        for tech in params_array:
+            arfilters.append(FieldFilter("technology", "==", tech))
+        query = query.where(filter=Or(filters=arfilters))
+
+    if "category" in params:
+        params_array = convert_to_array(params["category"])
+        query = query.where(
+            filter=FieldFilter("category_obj", "array_contains_any", params_array)
+        )
+
+    if "client" in params:
+        query = query.where(filter=FieldFilter("client", "==", params["client"]))
+
+    documents = query.stream()
+    data = []
+    
+    if "onlyname" in params and "client" not in params:
+        appended_tech = set()
+        for doc in documents:
+            tech = doc.get("technology")
+            if tech not in appended_tech:
+                appended_tech.add(tech)
+                data.append(tech)
+
+    else:
+        for doc in documents:
+            data.append(Presenters.technology(doc.to_dict()))
+
+    return Result(result=data)