PR#381: Fix wrong syntax when querying for release_categories. - freshmaker

freshmaker

#381 Fix wrong syntax when querying for release_categories.

Merged 5 years ago by jkaluza. Opened 5 years ago by jkaluza.

jkaluza/freshmaker rel-categories into master

Fix wrong syntax when querying for release_categories.

Jan Kaluza • 5 years ago

e60be83

freshmaker/lightblue.py

file modified

+5 -3

		`@@ -693,9 +693,11 @@`

		`if release_categories: # Check if release_categories is None or empty`
		`request["query"]["$and"].append({`
		`- "field": "release_categories.*",`
		`- "op": "$in",`
		`- "rvalue": release_categories,`
		`+ "$or": [{`
		`+ "field": "release_categories.*",`
		`+ "op": "=",`
		`+ "rvalue": category`
		`+ } for category in release_categories]`
		`})`

		`return request`

tests/test_lightblue.py

file modified

+4 -3

		`@@ -923,9 +923,10 @@`
		`"rvalue": True`
		`},`
		`{`
		`- "field": "release_categories.*",`
		`- "op": "$in",`
		`- "rvalue": ("Generally Available", "Tech Preview", "Beta"),`
		`+ "$or": [`
		`+ {"field": "release_categories.*", "rvalue": "Generally Available", "op": "="},`
		`+ {"field": "release_categories.*", "rvalue": "Tech Preview", "op": "="},`
		`+ {"field": "release_categories.*", "rvalue": "Beta", "op": "="}]`
		`},`
		`]`
		`},`

jkaluza commented 5 years ago

The Lightblue allows $in, but the syntax we used in previous PR was wrong and we actually use $or instead of $in everywhere, so keep it consistent.

We could start using $in in the future, but we should do that on all places.