Skip to content

Commit baba66c

Browse files
committed
fixes on validatos and qeries
1 parent 00d75f7 commit baba66c

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

functions/categories/libs/queries.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,29 @@ def list_data(params):
99
ref = DB.collection(u'categories')
1010

1111
query = ref
12-
print("params", params)
12+
1313
if 'category' in params:
14-
query = query.where('category', '==', params['category'])
14+
category_array = json.loads(params['category'])
15+
query = query.where('category', 'in', category_array)
16+
1517
if 'technologies' in params:
1618
params_array = json.loads(params['technologies'])
1719
query = query.where('technologies', 'in', params_array)
1820

1921
documents = query.stream()
2022

2123
data = []
22-
for doc in documents:
24+
25+
if 'onlyname' in params:
26+
27+
for doc in documents:
28+
item = doc.to_dict()
29+
if 'category' in item:
30+
data.append(item['category'])
31+
32+
else:
33+
34+
for doc in documents:
2335
data.append(doc.to_dict())
2436

2537
return Result(result=data)

functions/categories/libs/validator.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ def __init__(self, params):
99
def validate(self):
1010
result = Result(status="ok", result="()")
1111

12-
if 'category' not in self.params:
13-
self.add_error("category", "missing category parameter")
12+
if 'onlyname' not in self.params:
13+
if 'category' not in self.params:
14+
self.add_error("category", "missing category parameter")
1415

1516
return Result(errors=self.errors, result=self.params)
1617

functions/cwvtech/libs/queries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def list_data(params):
1717
if 'geo' in params:
1818
query = query.where('geo', '==', params['geo'])
1919
if 'technology' in params:
20-
params_array = json.loads(params['app'])
20+
params_array = json.loads(params['technology'])
2121
query = query.where('technology', 'in', params_array)
2222
if 'rank' in params:
2323
query = query.where('rank', '==', params['rank'])

functions/lighthouse/libs/queries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def list_data(params):
1717
if 'geo' in params:
1818
query = query.where('geo', '==', params['geo'])
1919
if 'technology' in params:
20-
params_array = json.loads(params['app'])
20+
params_array = json.loads(params['technology'])
2121
query = query.where('technology', 'in', params_array)
2222
if 'rank' in params:
2323
query = query.where('rank', '==', params['rank'])

0 commit comments

Comments
 (0)