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

Merge branch 'master' of https://github.com/Hatrix42/Flatisfy into Hatrix42-master

Browse Source
This commit is contained in:
Lucas Verney 2017-10-29 02:58:02 +01:00
commit 9c55904f59
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flatisfy/config.py
View File

@ -34,6 +34,7 @@ DEFAULT_CONFIG = {
"cost": (None, None), # (min, max) in currency unit "cost": (None, None), # (min, max) in currency unit
"rooms": (None, None), # (min, max) "rooms": (None, None), # (min, max)
"bedrooms": (None, None), # (min, max) "bedrooms": (None, None), # (min, max)
"minimum_pictures": None,
"time_to": {} # Dict mapping names to {"gps": [lat, lng], "time_to": {} # Dict mapping names to {"gps": [lat, lng],
# "time": (min, max) } # "time": (min, max) }
# Time is in seconds # Time is in seconds
@ -138,6 +139,10 @@ def validate_config(config, check_with_data):
assert isinstance(constraint["type"], str) assert isinstance(constraint["type"], str)
assert constraint["type"].upper() in ["RENT", "SALE", "SHARING"] assert constraint["type"].upper() in ["RENT", "SALE", "SHARING"]
assert "minimum_pictures" in constraint
assert isinstance(constraint["minimum_pictures"], int)
assert constraint["minimum_pictures"] >= 0
assert "house_types" in constraint assert "house_types" in constraint
assert constraint["house_types"] assert constraint["house_types"]
for house_type in constraint["house_types"]: for house_type in constraint["house_types"]:

6
flatisfy/filters/__init__.py
View File

@ -67,6 +67,12 @@ def refine_with_housing_criteria(flats_list, constraint):
field.capitalize(), flat["id"]) field.capitalize(), flat["id"])
is_ok[i] = is_ok[i] and is_within_interval is_ok[i] = is_ok[i] and is_within_interval
# Check number of pictures
print(constraint['minimum_pictures'], len(flat['photos']))
if not (constraint['minimum_pictures'] <= len(flat['photos'])):
is_ok[i] = False
return ( return (
[ [
flat flat