Rework _add_or_update_notifications()

Author: bouwew

plugwise/data.py

@@ -106,19 +106,18 @@ def _detect_low_batteries(self) -> list[str]:
     def _add_or_update_notifications(
         self, entity_id: str, entity: GwEntityData
     ) -> None:
-        """Helper-function adding or updating the Plugwise notifications."""
-        if (
-            entity_id == self._gateway_id
-            and (self._is_thermostat or self.smile.type == "power")
-        ) or (
-            "binary_sensors" in entity
-            and "plugwise_notification" in entity["binary_sensors"]
-        ):
-            entity["binary_sensors"]["plugwise_notification"] = bool(
-                self._notifications
-            )
-            entity["notifications"] = self._notifications
-            self._count += 2
+        """Helper-function adding or updating the Plugwise notifications to the gateway."""
+
+        if entity_id != self._gateway_id:
+            return  # pragma: no cover
+
+        if self._is_thermostat or self.smile.type == "power":
+            if "plugwise_notification" not in entity["binary_sensors"]:
+                entity["binary_sensors"].update(
+                    {"plugwise_notification": bool(self._notifications)}
+                )
+                entity.update({"notifications": self._notifications})
+                self._count += 2
 
     def _update_for_cooling(self, entity: GwEntityData) -> None:
         """Helper-function for adding/updating various cooling-related values."""