beide Datensätze verbunden über die neu erstellte Spalte Tätigkeitsschlüssel und Ausgaben in Deutsch

src/taetigkeitsnachweis/matcher.py

@@ -48,22 +48,28 @@ def _name_keys(name: str) -> set[str]:
 def _disambiguate_by_project_key(
     candidates: list[MasterDataRecord],
     project_key: str,
-) -> MasterDataRecord | None:
+) -> tuple[MasterDataRecord | None, str]:
-    """Return the single candidate matching allocation project key via masterdata project_scope."""
+    """Return the single candidate matching allocation project key via masterdata taetigkeit.
-    parts = [
+
-        token.strip().casefold()
+    Returns a tuple of (matched_record, status) where status is one of:
-        for token in re.split(r"[/,;|]", project_key)
+    - "ok": exactly one match found
-        if token.strip()
+    - "no_match": no candidate has a matching taetigkeit
-    ]
+    - "multiple": more than one candidate matches
-    project_tokens = set(parts or [project_key.strip().casefold()])
+    """
+    normalized_key = project_key.strip().casefold()
 
     matched = []
     for candidate in candidates:
-        candidate_scope = (candidate.project_scope or "PS").strip().casefold()
+        candidate_taetigkeit = (candidate.taetigkeit or "").strip().casefold()
-        if candidate_scope in project_tokens:
+        if candidate_taetigkeit == normalized_key:
             matched.append(candidate)
 
-    return matched[0] if len(matched) == 1 else None
+    if len(matched) == 1:
+        return matched[0], "ok"
+    elif len(matched) == 0:
+        return None, "no_match"
+    else:
+        return None, "multiple"
 
 
 def match_assignments(
@@ -103,10 +109,11 @@ def match_assignments(
                 ValidationIssue(
                     code="MISSING_MASTERDATA",
                     message=(
-                        f"No master-data match for employee '{allocation.employee_name}' "
+                        f"In der Stellenbeschreibung ist kein Datensatz für "
-                        f"(project '{allocation.project_key}')."
+                        f"'{allocation.employee_name}' hinterlegt "
+                        f"(Projekt '{allocation.project_key}'). Keine Förderung möglich."
                     ),
-                    severity="error",
+                    severity="info",
                     context=allocation.employee_name,
                 )
             )
@@ -116,17 +123,32 @@ def match_assignments(
         if len(candidates) == 1:
             selected = candidates[0]
         else:
-            # Multiple candidates: disambiguate by explicit project scope column.
+            # Multiple candidates: disambiguate by Tätigkeitsschlüssel.
-            selected = _disambiguate_by_project_key(candidates, allocation.project_key)
+            selected, match_status = _disambiguate_by_project_key(candidates, allocation.project_key)
-            if selected is None:
+            if match_status == "no_match":
+                issues.append(
+                    ValidationIssue(
+                        code="NO_MATCHING_TAETIGKEIT",
+                        message=(
+                            f"No Tätigkeitsschlüssel '{allocation.project_key}' found in "
+                            f"master-data for '{allocation.employee_name}'. "
+                            f"Available: {[c.taetigkeit for c in candidates]}. "
+                            f"Keine Förderung möglich."
+                        ),
+                        severity="warning",
+                        context=allocation.employee_name,
+                    )
+                )
+                continue
+            elif selected is None:
                 issues.append(
                     ValidationIssue(
                         code="AMBIGUOUS_MASTERDATA",
                         message=(
                             f"Ambiguous master-data for '{allocation.employee_name}' / "
                             f"'{allocation.project_key}': {len(candidates)} rows, "
-                            f"none or multiple match project_scope. "
+                            f"multiple match taetigkeit. "
-                            f"project_scope values: {[c.project_scope for c in candidates]}"
+                            f"taetigkeit values: {[c.taetigkeit for c in candidates]}"
                         ),
                         severity="error",
                         context=allocation.employee_name,