fix: Link role for includes

DSD-DBS · Aug 22, 2024 · 35d4b56 · 35d4b56
2 parents 42825f5 + 05bb2d1
commit 35d4b56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/capella2polarion/converters/link_converter.py b/capella2polarion/converters/link_converter.py
@@ -225,13 +225,13 @@ def create_grouped_link_fields(
                     key = link.secondary_work_item_id
                     back_links.setdefault(key, []).append(link)
 
+            role_id = self._remove_prefix(role)
             config: converter_config.LinkConfig | None = None
             for link_config in data.type_config.links:
-                if link_config.polarion_role == role:
+                if link_config.polarion_role == role_id:
                     config = link_config
                     break
 
-            role_id = self._remove_prefix(role)
             self._create_link_fields(
                 work_item, role_id, grouped_links, config=config
             )

diff --git a/tests/test_elements.py b/tests/test_elements.py
@@ -1219,8 +1219,11 @@ def test_maintain_grouped_links_attributes_with_role_prefix(
         assert "attribute" in dummy_work_items["uuid1"].additional_attributes
 
     @staticmethod
+    @pytest.mark.parametrize("role_prefix", ["", "_C2P"])
     def test_grouped_links_attributes_with_includes(
-        base_object: BaseObjectContainer, model: capellambse.MelodyModel
+        base_object: BaseObjectContainer,
+        model: capellambse.MelodyModel,
+        role_prefix: str,
     ):
         fnc = model.by_uuid(TEST_SYS_FNC)
         ex = model.by_uuid(TEST_SYS_FNC_EX)
@@ -1257,6 +1260,7 @@ def test_grouped_links_attributes_with_includes(
         converter = model_converter.ModelConverter(
             base_object.c2pcli.capella_model,
             base_object.c2pcli.polarion_params.project_id,
+            role_prefix=role_prefix,
         )
         converter.converter_session = base_object.mc.converter_session
         work_items = converter.generate_work_items(
@@ -1274,6 +1278,7 @@ def test_grouped_links_attributes_with_includes(
             base_object.mc.converter_session,
             base_object.pw.polarion_params.project_id,
             base_object.c2pcli.capella_model,
+            role_prefix=role_prefix,
         )
         backlinks: dict[str, list[polarion_api.WorkItemLink]] = {}
         work_item = (