ownerrez-wrapper 0.1.0__tar.gz → 0.2.0__tar.gz

{ownerrez_wrapper-0.1.0/ownerrez_wrapper.egg-info → ownerrez_wrapper-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ownerrez-wrapper
-Version: 0.1.0
+Version: 0.2.0
 Summary: A Python wrapper for the OwnerRez API
 Home-page: https://github.com/gmoorevt/ownerrez-wrapper
 Author: Geody Moore

{ownerrez_wrapper-0.1.0 → ownerrez_wrapper-0.2.0}/ownerrez_wrapper/__init__.py

@@ -8,8 +8,9 @@ A Python wrapper for the OwnerRez API.
 from .api import API
 from .cli import main as cli
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 __author__ = "Geody Moore"
-__email__ = "geody.moore@gmail.com"
+__author_email__ = "geody.moore@gmail.com"
+__description__ = "A Python wrapper for the OwnerRez API"
 
 __all__ = ["API", "cli"]

{ownerrez_wrapper-0.1.0 → ownerrez_wrapper-0.2.0}/ownerrez_wrapper/api.py

@@ -48,9 +48,14 @@ class API(object):
         params = {'since_utc': since_utc, 'property_id': property_id}
         booking_list = restAdapt.get(endpoint='bookings', ep_params=params)
         
-        for booking in booking_list.data['items']:
-            booking = Booking(**booking)
-            results.append(booking)
+        if isinstance(booking_list.data, list):
+            for booking in booking_list.data:
+                booking = Booking(**booking)
+                results.append(booking)
+        elif isinstance(booking_list.data, dict) and 'items' in booking_list.data:
+            for booking in booking_list.data['items']:
+                booking = Booking(**booking)
+                results.append(booking)
         return results
     
     def getbooking(self, booking_id: int) -> Booking:
@@ -76,9 +81,11 @@ class API(object):
         today = datetime.today()
         bookings = self.getbookings(property_id=property_id, since_utc=today)
         for booking in bookings:
+            if booking.is_block:
+                continue
             # Convert string dates to datetime if they aren't already
             arrival = booking.arrival if isinstance(booking.arrival, datetime) else datetime.strptime(booking.arrival, "%Y-%m-%d")
             departure = booking.departure if isinstance(booking.departure, datetime) else datetime.strptime(booking.departure, "%Y-%m-%d")
-            if arrival <= today and departure >= today:
+            if arrival <= today and departure >= today and booking.status == "active":
                 return True
         return False

{ownerrez_wrapper-0.1.0 → ownerrez_wrapper-0.2.0/ownerrez_wrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ownerrez-wrapper
-Version: 0.1.0
+Version: 0.2.0
 Summary: A Python wrapper for the OwnerRez API
 Home-page: https://github.com/gmoorevt/ownerrez-wrapper
 Author: Geody Moore

{ownerrez_wrapper-0.1.0 → ownerrez_wrapper-0.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="ownerrez-wrapper",
-    version="0.1.0",
+    version="0.2.0",
     author="Geody Moore",
     author_email="geody.moore@gmail.com",
     description="A Python wrapper for the OwnerRez API",

{ownerrez_wrapper-0.1.0 → ownerrez_wrapper-0.2.0}/tests/test_api.py

@@ -110,6 +110,10 @@ def test_isunitbooked(api, mock_booking_response, monkeypatch):
     def mock_get(*args, **kwargs):
         return Result(status=200, message="OK", data=mock_booking_response)
     
+    # Update mock response to include status and is_block fields
+    mock_booking_response['items'][0]['status'] = 'active'
+    mock_booking_response['items'][0]['is_block'] = False
+    
     monkeypatch.setattr("ownerrez_wrapper.restAdapter.RestAdapter.get", mock_get)
     is_booked = api.isunitbooked(property_id=1)
     assert is_booked is True
@@ -119,6 +123,10 @@ def test_isunitbooked_not_booked(api, mock_booking_response, monkeypatch):
     def mock_get(*args, **kwargs):
         return Result(status=200, message="OK", data=mock_booking_response)
     
+    # Update mock response to include status and is_block fields
+    mock_booking_response['items'][0]['status'] = 'active'
+    mock_booking_response['items'][0]['is_block'] = False
+    
     monkeypatch.setattr("ownerrez_wrapper.restAdapter.RestAdapter.get", mock_get)
     is_booked = api.isunitbooked(property_id=1)
     assert is_booked is False