Merge pull request #47 from dknowles2/legacy

Fix some bugs with the legacy API

Author: dknowles2

pydrawise/legacy/__init__.py

@@ -9,7 +9,7 @@
 
 from ..exceptions import NotInitializedError, UnknownError
 
-_BASE_URL = "https://app.hydrawise.com/api/v1"
+_BASE_URL = "https://api.hydrawise.com/api/v1"
 _TIMEOUT = 10  # seconds
 
 
@@ -105,6 +105,8 @@ def suspend_zone(self, days: int, zone: int | None = None) -> dict:
         if days > 0:
             params["custom"] = time.time() + (days * 24 * 60 * 60)
             params["period_id"] = 999
+        else:
+            params["period_id"] = 0
 
         if zone is None:
             params["action"] = "suspendall"
@@ -131,5 +133,7 @@ def run_zone(self, minutes: int, zone: int | None = None) -> dict:
         if minutes > 0:
             params["custom"] = time.time() + (minutes * 60)
             params["period_id"] = 999
+        else:
+            params["period_id"] = 0
 
         return self._get("setzone.php", **params)

tests/test_legacy.py

@@ -333,12 +333,12 @@ def test_update(mock_request, customer_details, status_schedule):
     mock_request.assert_has_calls(
         [
             mock.call(
-                "https://app.hydrawise.com/api/v1/customerdetails.php",
+                "https://api.hydrawise.com/api/v1/customerdetails.php",
                 params={"api_key": API_KEY, "type": "controllers"},
                 timeout=10,
             ),
             mock.call(
-                "https://app.hydrawise.com/api/v1/statusschedule.php",
+                "https://api.hydrawise.com/api/v1/statusschedule.php",
                 params={"api_key": API_KEY},
                 timeout=10,
             ),
@@ -399,7 +399,7 @@ def test_suspend_zone(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.suspend_zone(1, 1) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "suspend",
@@ -411,6 +411,27 @@ def test_suspend_zone(mock_request, success_status):
         )
 
 
+def test_suspend_zone_unsuspend(mock_request, success_status):
+    client = legacy.LegacyHydrawise(API_KEY)
+    mock_request.reset_mock(return_value=True, side_effect=True)
+
+    mock_request.return_value.status_code = 200
+    mock_request.return_value.json.return_value = success_status
+
+    with freeze_time("1970-01-01 00:00:00") as t:
+        assert client.suspend_zone(0, 1) == success_status
+        mock_request.assert_called_once_with(
+            "https://api.hydrawise.com/api/v1/setzone.php",
+            params={
+                "api_key": API_KEY,
+                "action": "suspend",
+                "period_id": 0,
+                "relay_id": 428639,
+            },
+            timeout=10,
+        )
+
+
 def test_suspend_zone_all(mock_request, success_status):
     client = legacy.LegacyHydrawise(API_KEY)
     mock_request.reset_mock(return_value=True, side_effect=True)
@@ -421,7 +442,7 @@ def test_suspend_zone_all(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.suspend_zone(1) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "suspendall",
@@ -442,7 +463,7 @@ def test_run_zone(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.run_zone(1, 1) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "run",
@@ -464,7 +485,7 @@ def test_run_zone_all(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.run_zone(1) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "runall",
@@ -485,10 +506,11 @@ def test_run_zone_stop(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.run_zone(0, 1) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "stop",
+                "period_id": 0,
                 "relay_id": 428639,
             },
             timeout=10,
@@ -505,10 +527,11 @@ def test_run_zone_stop_all(mock_request, success_status):
     with freeze_time("1970-01-01 00:00:00") as t:
         assert client.run_zone(0) == success_status
         mock_request.assert_called_once_with(
-            "https://app.hydrawise.com/api/v1/setzone.php",
+            "https://api.hydrawise.com/api/v1/setzone.php",
             params={
                 "api_key": API_KEY,
                 "action": "stopall",
+                "period_id": 0,
             },
             timeout=10,
         )