Fix SonarCloud reports

Author: bouwew

plugwise/common.py

@@ -213,9 +213,7 @@ def _get_groups(self) -> None:
             group_type = group.find("type").text
             group_appliances = group.findall("appliances/appliance")
             for item in group_appliances:
-                # Check if members are not orphaned - stretch
-                if item.attrib["id"] in self.gw_entities:
-                    members.append(item.attrib["id"])
+                self._add_member(item)
 
             if group_type in GROUP_TYPES and members:
                 self.gw_entities[group_id] = {
@@ -229,12 +227,17 @@ def _get_groups(self) -> None:
 
         removed = list(set(self._existing_groups) - set(self._new_groups))
         if self._existing_groups and removed:
-            for group in removed:
-                self.gw_entities.pop(group)
+            for group_id in removed:
+                self.gw_entities.pop(group_id)
 
         self._existing_groups = self._new_groups
         self._new_groups = []
 
+    def _add_member(element: etree.Element, members: list[str]) -> None:
+        """Check and add member to list."""
+        if element.attrib["id"] in self.gw_entities:
+            members.append(item.attrib["id"])
+
     def _get_lock_state(
         self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False
     ) -> None:

plugwise/smile.py

@@ -109,11 +109,10 @@ def get_all_gateway_entities(self) -> None:
         Collect and add switching- and/or pump-group entities.
         Finally, collect the data and states for each entity.
         """
-        if self._get_appliances():
-            if self._is_thermostat:
-                self.therms_with_offset_func = (
-                    self._get_appliances_with_offset_functionality()
-                )
+        if self._get_appliances() and self._is_thermostat:
+            self.therms_with_offset_func = (
+                self._get_appliances_with_offset_functionality()
+            )
 
         self._scan_thermostats()