fix plan regulation group assocation saving

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -230,7 +230,7 @@ def save_plan(plan_data: Plan) -> QgsFeature:
         for regulation_group in plan_data.general_regulations:
             plan_id = plan_feature["id"]
             regulation_group_feature = save_regulation_group(regulation_group, plan_id)
-            save_regulation_group_association(regulation_group_feature["id"], plan_id=plan_id)
+            save_regulation_group_association(regulation_group_feature["id"], PlanLayer.name, plan_id)
 
     return plan_feature
 
@@ -291,13 +291,11 @@ def save_regulation_group(regulation_group: RegulationGroup, plan_id: str | None
     return feature
 
 
-def save_regulation_group_association(
-    regulation_group_id: str, layer_name: str | None = None, feature_id: str | None = None, plan_id: str | None = None
-) -> QgsFeature:
-    feature = RegulationGroupAssociationLayer.feature_from(regulation_group_id, layer_name, feature_id, plan_id)
+def save_regulation_group_association(regulation_group_id: str, layer_name: str, feature_id: str) -> QgsFeature:
+    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="")
+    _save_feature(feature=feature, layer=layer, id_=None, edit_text="Kaavamääräysryhmän assosiaation lisäys")
 
     return feature
 

arho_feature_template/project/layers/plan_layers.py

@@ -161,33 +161,21 @@ class RegulationGroupAssociationLayer(AbstractPlanLayer):
         OtherPointLayer.name: "other_point_id",
         LandUseAreaLayer.name: "land_use_area_id",
         LineLayer.name: "line_id",
+        PlanLayer.name: "plan_id",
     }
 
     @classmethod
-    def feature_from(
-        cls,
-        regulation_group_id: str | None,
-        layer_name: str | None = None,
-        feature_id: str | None = None,
-        plan_id: str | None = None,
-    ) -> QgsFeature:
+    def feature_from(cls, regulation_group_id: str, layer_name: str, feature_id: str) -> QgsFeature:
         layer = cls.get_from_project()
 
         feature = QgsVectorLayerUtils.createFeature(layer)
         feature["plan_regulation_group_id"] = regulation_group_id
 
-        if layer_name:
-            if feature_id is None:
-                msg = "Plan feature ID must be provided to create association for regulation group and plan feature."
-                raise ValueError(msg)
-            attribute = cls.layer_name_to_attribute_map[layer_name]
-            feature[attribute] = feature_id
-
-        feature["plan_id"] = (
-            plan_id
-            if plan_id
-            else QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")
-        )
+        attribute = cls.layer_name_to_attribute_map.get(layer_name)
+        if not attribute:
+            msg = f"Unrecognized layer name given for saving regulation group association: {layer_name}"
+            raise ValueError(msg)
+        feature[attribute] = feature_id
 
         return feature