technologies added params and onlyname

Author: maceto

functions/technologies/libs/presenters.py

@@ -0,0 +1,12 @@
+
+class Presenters:
+  @staticmethod
+  def technology(item):
+    return {
+      'client': item['client'],
+      'similar_technologies': item['similar_technologies'],
+      'description': item['description'],
+      'origins': item['origins'],
+      'technology': item['technology'],
+      'category': item['category']
+    }

functions/technologies/libs/queries.py

@@ -1,35 +1,47 @@
 import os
 import json
 from google.cloud import firestore
+from google.cloud.firestore_v1.base_query import FieldFilter, Or
+
 from .result import Result 
 from .utils import convert_to_array
+from .presenters import Presenters
+
 
 DB = firestore.Client(project=os.environ.get('PROJECT'), database=os.environ.get('DATABASE'))
 
 def list_data(params):
+  onlyname = False
   ref = DB.collection(u'technologies')
 
   query = ref
 
-  if 'start' in params:
-    query = query.where('date', '>=', params['start'])
-  if 'end' in params:
-    query = query.where('date', '<=', params['end'])
-  if 'geo' in params:
-    query = query.where('geo', '==', params['geo'])
   if 'technology' in params:
+    arfilters = []
     params_array = convert_to_array(params['technology'])
-    query = query.where('technology', 'in', params_array)
-  if 'rank' in params:
-    query = query.where('rank', '==', params['rank'])
+    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('category', 'in', params_array)
+    query = query.where(filter=FieldFilter('category_obj', 'array_contains_any', params_array))
+
+  if 'onlyname' in params:
+    onlyname = True
 
   documents = query.stream()
 
   data = []
   for doc in documents:
-      data.append(doc.to_dict())
+      item = doc.to_dict()
+      if onlyname:
+        data.append(item['technology'])
+      else:
+        data.append(Presenters.technology(doc.to_dict()))
 
   return Result(result=data)

functions/technologies/libs/validator.py

@@ -9,8 +9,8 @@ def __init__(self, params):
   def validate(self):
     result = Result(status="ok", result="()")
 
-    if 'technology' not in self.params:
-      self.add_error("technology", "missing technology parameter")
+    # if 'technology' not in self.params:
+    #   self.add_error("technology", "missing technology parameter")
 
     return Result(errors=self.errors, result=self.params)