refactor existing assocation check, add comments to HierarchicalCodeComboBox

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -493,9 +493,9 @@ def save_regulation_group_as_config(regulation_group: RegulationGroup):
 
 
 def save_regulation_group_association(regulation_group_id: str, layer_name: str, feature_id: str):
-    feature = RegulationGroupAssociationLayer.feature_from(regulation_group_id, layer_name, feature_id)
-    if not feature:
+    if RegulationGroupAssociationLayer.association_exists(regulation_group_id, layer_name, feature_id):
         return
+    feature = RegulationGroupAssociationLayer.feature_from(regulation_group_id, layer_name, feature_id)
     layer = RegulationGroupAssociationLayer.get_from_project()
 
     _save_feature(feature=feature, layer=layer, id_=None, edit_text="Kaavamääräysryhmän assosiaation lisäys")

arho_feature_template/gui/components/code_combobox.py

@@ -48,7 +48,7 @@ def set_value(self, value: str | None) -> None:
         if index != -1:
             self.setCurrentIndex(index)
         else:
-            self.setCurrentIndex(0)  # Set NULL if not found
+            self.setCurrentIndex(0)  # Set selection to NULL if item with `value` was not found
 
 
 class HierarchicalCodeComboBox(QComboBox):
@@ -102,29 +102,39 @@ def value(self) -> str:
         item = self.tree_widget.selectedItems()[0]
         return item.data(0, Qt.UserRole)
 
-    def set_value(self, value: str | None) -> None:
-        # NOTE: Does not work fully currently
+    def _find_item_recursive(self, item: QTreeWidgetItem, value: str) -> QTreeWidgetItem:
+        """Recursively try to find item with given value and return the item if found."""
+        # Found item, return it
+        if item.data(0, Qt.UserRole) == value:
+            return item
+
+        # Loop children
+        for i in range(item.childCount()):
+            found_item = self._find_item_recursive(item.child(i), value)
+            if found_item:
+                return found_item
 
-        def find_item_recursive(item: QTreeWidgetItem, value: str) -> QTreeWidgetItem:
-            if item.data(0, Qt.UserRole) == value:
-                return item
-            for i in range(item.childCount()):
-                found_item = find_item_recursive(item.child(i), value)
-                if found_item:
-                    return found_item
-            return None
+        return None
 
+    def set_value(self, value: str | None) -> None:
+        # Set selection to NULL if `value` is None
         if value is None:
-            self.setCurrentIndex(0)
+            self.setCurrentIndex(self.null_index)
             return
 
+        # Loop top level tree items
         for i in range(self.count()):
-            found_item = find_item_recursive(self.tree_widget.topLevelItem(i), value)
+            # Handle child items recursively
+            found_item = self._find_item_recursive(self.tree_widget.topLevelItem(i), value)
+
+            # If matching item was found, set it as selected. Because of the hybrid TreeWidget + ComboBox
+            # nature of the widget, value setting is unintuitive and tricky
             if found_item:
+                self.tree_widget.setCurrentItem(found_item)
                 idx = self.tree_widget.indexFromItem(found_item)
                 self.setRootModelIndex(idx.parent())
                 self.setCurrentIndex(idx.row())
                 self.setRootModelIndex(self.null_index.parent())
                 return
 
-        self.setCurrentIndex(0)  # Set combobox index to NULL
+        self.setCurrentIndex(self.null_index)  # Set selection to NULL if item with `value` was not found

arho_feature_template/project/layers/plan_layers.py

@@ -235,14 +235,6 @@ def feature_from(cls, regulation_group_id: str, layer_name: str, feature_id: str
         layer = cls.get_from_project()
         attribute = cls.layer_name_to_attribute_map.get(layer_name)
 
-        # Check if association exists to avoid duplicate assocations
-        for feature in cls.get_features_by_attribute_value("plan_regulation_group_id", regulation_group_id):
-            if feature[attribute] == feature_id:
-                return None
-        # for feature in layer.getFeatures():
-        #     if feature["plan_regulation_group_id"] == regulation_group_id and feature[attribute] == feature_id:
-        #         return None
-
         feature = QgsVectorLayerUtils.createFeature(layer)
         feature["plan_regulation_group_id"] = regulation_group_id
 
@@ -253,6 +245,14 @@ def feature_from(cls, regulation_group_id: str, layer_name: str, feature_id: str
 
         return feature
 
+    @classmethod
+    def association_exists(cls, regulation_group_id: str, layer_name: str, feature_id: str):
+        attribute = cls.layer_name_to_attribute_map.get(layer_name)
+        for feature in cls.get_features_by_attribute_value("plan_regulation_group_id", regulation_group_id):
+            if feature[attribute] == feature_id:
+                return True
+        return False
+
     @classmethod
     def get_associations_for_feature(cls, feature_id: str, layer_name: str) -> Generator[QgsFeature]:
         attribute = cls.layer_name_to_attribute_map.get(layer_name)