feature/mx-1719_wrap_up_confluence (#323)

# PR Context - wrap up according to ticket comments --------- Signed-off-by: erichesse <[email protected]> Co-authored-by: Nicolas Drebenstedt <[email protected]>
robert-koch-institut · Feb 4, 2025 · 6dc978a · 6dc978a
1 parent 3d765cc
commit 6dc978a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - update mex-common to version 0.48.0
 - simplify load function to wrap the Sink.load methods
+- wrap up: confluence-vvt
 
 ### Deprecated
 

diff --git a/mex/extractors/confluence_vvt/transform.py b/mex/extractors/confluence_vvt/transform.py
@@ -6,6 +6,7 @@
 from mex.common.models import ExtractedActivity, ExtractedPrimarySource
 from mex.common.types import (
     ActivityType,
+    Link,
     MergedOrganizationalUnitIdentifier,
     MergedPersonIdentifier,
     Text,
@@ -60,19 +61,32 @@ def transform_confluence_vvt_page_to_extracted_activity(
         for contact in get_contact_from_page(page, confluence_vvt_activity_mapping)
         for merged_id in merged_ids_by_query_string[contact]
     ]
+    documentation = [
+        Link(
+            url=f"{settings.confluence_vvt.url}/pages/viewpage.action?pageId={page.id}",
+            title=confluence_vvt_activity_mapping.documentation[0]
+            .mappingRules[0]
+            .setValues[0]
+            .title,
+        )
+    ]
     involved_person_merged_ids = [
         merged_id
         for author in get_involved_persons_from_page(
             page, confluence_vvt_activity_mapping
         )
         for merged_id in merged_ids_by_query_string[author]
     ]
+    responsible_unit_strings = get_responsible_unit_from_page(
+        page, confluence_vvt_activity_mapping
+    )
+    for unit in responsible_unit_strings:
+        if "ZV" in unit:  # stopgap: MX-1786
+            return None
     responsible_unit_merged_ids = list(
         {
             unit_id
-            for oe in get_responsible_unit_from_page(
-                page, confluence_vvt_activity_mapping
-            )
+            for oe in responsible_unit_strings
             if (unit_id := unit_merged_ids_by_synonym.get(oe))
         }
     )
@@ -99,7 +113,7 @@ def transform_confluence_vvt_page_to_extracted_activity(
         contact=contact_merged_ids
         or involved_person_merged_ids
         or responsible_unit_merged_ids,
-        documentation=f"{settings.confluence_vvt.url}/pages/viewpage.action?pageId={page.id}",
+        documentation=documentation,
         identifierInPrimarySource=identifier_in_primary_source,
         involvedPerson=involved_person_merged_ids,
         involvedUnit=involved_unit_merged_ids,

diff --git a/tests/confluence_vvt/test_transform.py b/tests/confluence_vvt/test_transform.py
@@ -98,4 +98,4 @@ def test_transform_confluence_vvt_page_to_extracted_activities(
         unit_merged_ids_by_synonym,
     )
 
-    assert len(extracted_activities) >= 63
+    assert len(extracted_activities) >= 50