Change how inactive systems are detected (#383)

* Change how inactive systems are detected

* Another check

Author: bachya

simplipy/api.py

@@ -348,7 +348,7 @@ async def async_get_systems(self) -> dict[int, SystemV2 | SystemV3]:
         await self.async_update_subscription_data()
 
         for sid, subscription in self.subscription_data.items():
-            if not subscription["status"]["isActive"]:
+            if subscription["activated"] == 0 or not subscription["status"]["isActive"]:
                 LOGGER.info("Skipping inactive subscription: %s", sid)
                 continue
 
@@ -357,7 +357,7 @@ async def async_get_systems(self) -> dict[int, SystemV2 | SystemV3]:
                 continue
 
             system: SystemV2 | SystemV3
-            if (_ := subscription["location"]["system"]["version"]) == 2:
+            if subscription["location"]["system"]["version"] == 2:
                 system = SystemV2(self, sid)
             else:
                 system = SystemV3(self, sid)

tests/system/test_base.py

@@ -34,7 +34,7 @@ async def test_deactivated_system(
         authenticated_simplisafe_server: A authenticated API connection.
         subscriptions_response: An API response payload.
     """
-    subscriptions_response["subscriptions"][0]["status"]["isActive"] = False
+    subscriptions_response["subscriptions"][0]["activated"] = 0
 
     async with authenticated_simplisafe_server:
         authenticated_simplisafe_server.add(