fix but where we were not explicitly specifying property types

Author: kevin1024

README.md

@@ -96,6 +96,9 @@ logging.getLogger().setLevel(logging.INFO)
 
 # Changelog
 
+* 2.0.3: It turns out that Evernet assumes you only want 'RESI' properties if you don't explicitly specify, so let's do so.
+* 2.0.2: Fixed a bug where items were not being filtered on in the `get_all_active_listings` method
+* 2.0.1: Fixed a bug where status wasn't being filtered correctly
 * 2.0.0: Add ability to filter by area and city, changed some method signatures so this is backwards-incompatible.
 * 1.0.1: Fix bug where the new property types weren't getting passed along
 * 1.0.0: Add support for different property types

evernetpy/criteria.py

@@ -1,27 +1,43 @@
 import itertools
 
+ALL_PROPERTY_TYPES = [
+    "BUSO",
+    "COMI",
+    "COND",
+    "FARM",
+    "MANU",
+    "MULT",
+    "RENT",
+    "RESI",
+    "TSHR",
+    "VACL",
+]
+
+
 def iterate_criteria(begin_date, end_date, property_types=None, areas=None, cities=None, status=None):
+    """
+    NOTE: If you don't pass criteria to Evernet, it will assume you only want residential properties.
+    That's why I will iterate through all availabe types unless you pass me a list of types you want
+    explicitly.
+    """
     base_criteria = {
         'MLS': 'nwmls',
         'BeginDate': begin_date,
         'EndDate': end_date,
     }
-    if not cities and not areas and not property_types and not status:
-        yield base_criteria
-    else:
-        areas = areas or [None]
-        cities = cities or [None]
-        property_types = property_types or [None]
-        status = status or [None]
-        for property_type, area, city, status in itertools.product(property_types, areas, cities, status):
-            criteria = {}
-            if area:
-                criteria['Area'] = area
-            if city:
-                criteria['City'] = city
-            if status:
-                criteria['Status'] = status
-            if property_type:
-                criteria['PropertyType'] = property_type
-            criteria.update(base_criteria)
-            yield criteria
+    areas = areas or [None]
+    cities = cities or [None]
+    property_types = property_types or ALL_PROPERTY_TYPES
+    status = status or [None]
+    for property_type, area, city, status in itertools.product(property_types, areas, cities, status):
+        criteria = {}
+        if area:
+            criteria['Area'] = area
+        if city:
+            criteria['City'] = city
+        if status:
+            criteria['Status'] = status
+        if property_type:
+            criteria['PropertyType'] = property_type
+        criteria.update(base_criteria)
+        yield criteria

setup.py

@@ -19,7 +19,7 @@ def run_tests(self):
         sys.exit(errno)
 
 setup(name='evernetpy',
-      version='2.0.2',
+      version='2.0.3',
       description="A Python library for interacting with the EverNet listing service",
       author='Kevin McCarthy',
       author_email='[email protected]',

tests/unit/test_criteria.py

@@ -2,16 +2,32 @@
 
 def test_iterate_criteria_basic():
     output = [x for x in iterate_criteria('foo','bar')]
-    print output
-    assert output == [
-        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar'}
-    ]
+    assert sorted(output) == sorted([
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'BUSO'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'COMI'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'COND'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'FARM'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'MANU'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'MULT'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'RENT'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'RESI'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'TSHR'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'VACL'},
+    ])
 
 def test_iterate_criteria_status():
     output = [x for x in iterate_criteria('foo','bar', status=['A'])]
-    print output
     assert output == [
-        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'Status': 'A'}
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'BUSO', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'COMI', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'COND', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'FARM', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'MANU', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'MULT', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'RENT', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'RESI', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'TSHR', 'Status': 'A'},
+        {'MLS': 'nwmls', 'BeginDate': 'foo', 'EndDate': 'bar', 'PropertyType': 'VACL', 'Status': 'A'},
     ]
 
 def test_iterate_criteria_empty_areas():