Improve _set_groupswitch_member_state() functions as suggested

Author: bouwew

plugwise/legacy/smile.py

@@ -301,18 +301,17 @@ async def _set_groupswitch_member_state(
         Return the current group-state when none of the switches has changed its state, the requested state otherwise.
         """
         current_state = self.gw_entities[appl_id]["switches"]["relay"]
+        end_states: list[bool] = []
         requested_state = state == STATE_ON
-        switched = 0
         for member in members:
             if not self.gw_entities[member]["switches"]["lock"]:
                 uri = f"{APPLIANCES};id={member}/relay"
                 await self.call_request(uri, method="put", data=data)
-                switched += 1
+    
+            end_states.append(self.gw_entities[member]["switches"].get("relay", False))
 
-        if switched > 0:
-            return requested_state
-
-        return current_state  # pragma: no cover
+        # Return True only if all members match the requested state
+        return all(end_states) if requested_state else not any(end_states)
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""

plugwise/smile.py

@@ -452,20 +452,20 @@ async def _set_groupswitch_member_state(
         Return the current group-state when none of the switches has changed its state, the requested state otherwise.
         """
         current_state = self.gw_entities[appl_id]["switches"]["relay"]
+        end_states: list[bool] = []
         requested_state = state == STATE_ON
-        switched = 0
         for member in members:
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'
             switch_id = self._domain_objects.find(locator).attrib["id"]
             uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}"
-            if not self.gw_entities[member]["switches"].get("lock"):
+            lock_blocked = self.gw_entities[member]["switches"].get("lock")
+            if lock_blocked is not None and not lock_blocked:
                 await self.call_request(uri, method="put", data=data)
-                switched += 1
 
-        if switched > 0:
-            return requested_state
+            end_states.append(self.gw_entities[member]["switches"].get("relay", False))
 
-        return current_state
+        # Return True only if all members match the requested state
+        return all(end_states) if requested_state else not any(end_states)
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""