Fix incorrect lock state (#252)

* Fix incorrect lock state

* Fix

* Linting

Author: bachya

simplipy/lock.py

@@ -15,7 +15,7 @@ class LockStates(Enum):
     unknown = 99
 
 
-SET_STATE_MAP = {LockStates.locked: "lock", LockStates.unlocked: "unlock"}
+STATE_MAP = {1: LockStates.locked, 2: LockStates.unlocked}
 
 
 class Lock(EntityV3):
@@ -74,28 +74,34 @@ def state(self) -> LockStates:
         if bool(self._system.entity_data[self._serial]["status"]["lockJamState"]):
             return LockStates.jammed
 
-        raw_state = self._system.entity_data[self._serial]["status"]["lockState"]
+        if self._system.entity_data[self._serial]["status"]["lockState"] == 1:
+            return LockStates.locked
 
-        try:
-            return LockStates(raw_state)
-        except ValueError:
-            LOGGER.error("Unknown raw lock state: %s", raw_state)
-            return LockStates.unknown
+        if self._system.entity_data[self._serial]["status"]["lockState"] == 2:
+            return LockStates.unlocked
 
-    async def _set_lock_state(self, state: LockStates) -> None:
-        """Set the lock state."""
+        LOGGER.error(
+            "Unknown raw lock state: %s",
+            self._system.entity_data[self._serial]["status"]["lockState"],
+        )
+        return LockStates.unknown
+
+    async def lock(self) -> None:
+        """Lock the lock."""
         await self._api.request(
             "post",
             f"doorlock/{self._system.system_id}/{self.serial}/state",
-            json={"state": SET_STATE_MAP[state]},
+            json={"state": "lock"},
         )
 
-        self._system.entity_data[self._serial]["status"]["lockState"] = state.value
-
-    async def lock(self) -> None:
-        """Lock the lock."""
-        await self._set_lock_state(LockStates.locked)
+        self._system.entity_data[self._serial]["status"]["lockState"] = 1
 
     async def unlock(self) -> None:
         """Unlock the lock."""
-        await self._set_lock_state(LockStates.unlocked)
+        await self._api.request(
+            "post",
+            f"doorlock/{self._system.system_id}/{self.serial}/state",
+            json={"state": "unlock"},
+        )
+
+        self._system.entity_data[self._serial]["status"]["lockState"] = 2

tests/system/test_v3.py

@@ -31,7 +31,9 @@
 
 
 @pytest.mark.parametrize(
-    "v3_subscriptions_response", ["subscriptions_alarm_state_response"], indirect=True,
+    "v3_subscriptions_response",
+    ["subscriptions_alarm_state_response"],
+    indirect=True,
 )
 async def test_alarm_state(v3_server):
     """Test handling of a triggered alarm."""
@@ -243,7 +245,8 @@ async def test_missing_events(v3_server):
 
 
 @pytest.mark.parametrize(
-    "subscriptions_fixture_filename", ["subscriptions_missing_system_response.json"],
+    "subscriptions_fixture_filename",
+    ["subscriptions_missing_system_response.json"],
 )
 async def test_missing_system_info_initial(caplog, v3_server):
     """Test that missing system data on system load is handled correctly."""
@@ -847,7 +850,10 @@ async def test_update_error(v3_server, v3_subscriptions_response, v3_settings_re
 
     async with aiohttp.ClientSession() as session:
         simplisafe = await get_api(
-            TEST_EMAIL, TEST_PASSWORD, session=session, client_id=TEST_CLIENT_ID,
+            TEST_EMAIL,
+            TEST_PASSWORD,
+            session=session,
+            client_id=TEST_CLIENT_ID,
         )
 
         systems = await simplisafe.get_systems()

tests/test_api.py

@@ -102,7 +102,10 @@ async def test_401_reauth_success(server, v2_subscriptions_response):
 
     async with aiohttp.ClientSession() as session:
         simplisafe = await get_api(
-            TEST_EMAIL, TEST_PASSWORD, session=session, client_id=TEST_CLIENT_ID,
+            TEST_EMAIL,
+            TEST_PASSWORD,
+            session=session,
+            client_id=TEST_CLIENT_ID,
         )
         assert simplisafe._client_id == TEST_CLIENT_ID
         await simplisafe.get_systems()
@@ -141,7 +144,10 @@ async def test_401_refresh_token_success(server, v2_subscriptions_response):
 
     async with aiohttp.ClientSession() as session:
         simplisafe = await get_api(
-            TEST_EMAIL, TEST_PASSWORD, session=session, client_id=TEST_CLIENT_ID,
+            TEST_EMAIL,
+            TEST_PASSWORD,
+            session=session,
+            client_id=TEST_CLIENT_ID,
         )
         assert simplisafe._client_id == TEST_CLIENT_ID
         await simplisafe.get_systems()
@@ -254,6 +260,9 @@ async def test_request_error_successful_retry(server, v2_subscriptions_response)
 
     async with aiohttp.ClientSession() as session:
         simplisafe = await get_api(
-            TEST_EMAIL, TEST_PASSWORD, session=session, client_id=TEST_CLIENT_ID,
+            TEST_EMAIL,
+            TEST_PASSWORD,
+            session=session,
+            client_id=TEST_CLIENT_ID,
         )
         await simplisafe.get_systems()