Save/fix

Author: bouwew

fixtures/adam_plus_anna_new/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "056ee145a816487eaa69243c3280f8bf": {
       "available": true,
       "binary_sensors": {

fixtures/anna_v4/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "01b85360fdd243d0aaad4d6ac2a5ba7e": {
       "active_preset": "home",
       "available_schedules": [

fixtures/legacy_anna/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "0000aaaa0000aaaa0000aaaa0000aa00": {
       "dev_class": "gateway",
       "firmware": "1.8.22",

fixtures/p1v4_442_single/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "a455b61e52394b2db5081ce025a430f3": {
       "binary_sensors": {
         "plugwise_notification": false

fixtures/smile_p1_v2/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "938696c4bcdb4b8a9a595cb38ed43913": {
       "dev_class": "smartmeter",
       "location": "938696c4bcdb4b8a9a595cb38ed43913",

fixtures/stretch_v31/all_data.json

@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "entities": {
     "0000aaaa0000aaaa0000aaaa0000aa00": {
       "dev_class": "gateway",
       "firmware": "3.1.11",

plugwise/helper.py

@@ -547,6 +547,8 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
         if self._is_thermostat and self.smile(ANNA):
             self._update_anna_cooling(entity_id, data)
 
+        self._cleanup_data(data)
+
         return data
 
     def _power_data_from_location(self, loc_id: str) -> GwEntityData:
@@ -796,8 +798,6 @@ def _update_anna_cooling(self, entity_id: str, data: GwEntityData) -> None:
         elif self._cooling_present and "cooling_state" in data["binary_sensors"]:
             self._update_loria_cooling(data)
 
-        self._cleanup_data(data)
-
     def _update_elga_cooling(self, data: GwEntityData) -> None:
         """# Anna+Elga: base cooling_state on the elga-status-code."""
         if data["thermostat_supports_cooling"]:

tests/test_anna.py

@@ -30,7 +30,7 @@ async def test_connect_anna_v4(self):
         await self.device_test(smile, "2020-04-05 00:00:01", testdata)
         assert smile.gateway_id == "0466eae8520144c78afb29628384edeb"
         assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
-        assert self.device_items == 58
+        assert self.entity_items == 58
         assert not self.notifications
 
         assert not self.cooling_present

tests/test_legacy_anna.py

@@ -30,7 +30,7 @@ async def test_connect_legacy_anna(self):
 
         await self.device_test(smile, "2020-03-22 00:00:01", testdata)
         assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
-        assert self.device_items == 41
+        assert self.entity_items == 41
 
         result = await self.tinker_legacy_thermostat(smile, schedule_on=False)
         assert result

tests/test_legacy_p1.py

@@ -29,7 +29,7 @@ async def test_connect_smile_p1_v2(self):
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
         assert smile.gateway_id == "aaaa0000aaaa0000aaaa0000aaaa00aa"
-        assert self.device_items == 26
+        assert self.entity_items == 26
 
         await smile.close_connection()
         await self.disconnect(server, client)