phyks
/
flatisfy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a StopIteration error in web API

This commit is contained in:
Lucas Verney 2017-06-19 12:01:55 +02:00
parent b187a106e4
commit c4f6a80b0c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flatisfy/web/routes/api.py
View File

@ -51,7 +51,9 @@ def flats_v1(config, db):
] ]
for flat in flats: for flat in flats:
if flat["flatisfy_postal_code"]: try:
assert flat["flatisfy_postal_code"]
postal_code_data = next( postal_code_data = next(
x x
for x in postal_codes.get(flat["flatisfy_constraint"], for x in postal_codes.get(flat["flatisfy_constraint"],
@ -63,7 +65,7 @@ def flats_v1(config, db):
"name": postal_code_data.name, "name": postal_code_data.name,
"gps": (postal_code_data.lat, postal_code_data.lng) "gps": (postal_code_data.lat, postal_code_data.lng)
} }
else: except (AssertionError, StopIteration):
flat["flatisfy_postal_code"] = {} flat["flatisfy_postal_code"] = {}
return { return {
@ -115,7 +117,9 @@ def flat_v1(flat_id, config, db):
flat = flat.json_api_repr() flat = flat.json_api_repr()
if flat["flatisfy_postal_code"]: try:
assert flat["flatisfy_postal_code"]
postal_code_data = next( postal_code_data = next(
x x
for x in postal_codes for x in postal_codes
@ -126,7 +130,7 @@ def flat_v1(flat_id, config, db):
"name": postal_code_data.name, "name": postal_code_data.name,
"gps": (postal_code_data.lat, postal_code_data.lng) "gps": (postal_code_data.lat, postal_code_data.lng)
} }
else: except (AssertionError, StopIteration):
flat["flatisfy_postal_code"] = {} flat["flatisfy_postal_code"] = {}
return { return {
@ -267,7 +271,9 @@ def search_v1(db, config):
] ]
for flat in flats: for flat in flats:
if flat["flatisfy_postal_code"]: try:
assert flat["flatisfy_postal_code"]
postal_code_data = next( postal_code_data = next(
x x
for x in postal_codes.get(flat["flatisfy_constraint"], for x in postal_codes.get(flat["flatisfy_constraint"],
@ -276,10 +282,10 @@ def search_v1(db, config):
) )
flat["flatisfy_postal_code"] = { flat["flatisfy_postal_code"] = {
"postal_code": flat["flatisfy_postal_code"], "postal_code": flat["flatisfy_postal_code"],
"name": postal_code_data["name"], "name": postal_code_data.name,
"gps": (postal_code_data["lat"], postal_code_data["lng"]) "gps": (postal_code_data.lat, postal_code_data.lng)
} }
else: except (AssertionError, StopIteration):
flat["flatisfy_postal_code"] = {} flat["flatisfy_postal_code"] = {}
return { return {