eli-439 Missing token substitution when attribute null in other target record for same patient (#321)

* eli-439 WIP test for defect

* Added test and extra check for vacc att type.

* eli-439 formatting

* eli-439 revised tests

* ELI-439: Fixes sonar warnings

* ELI-439: Fixes lint

---------

Co-authored-by: Shweta <[email protected]>

Author: ayeshalshukri1-nhs

src/eligibility_signposting_api/services/processors/token_parser.py

@@ -60,7 +60,7 @@ def parse(token: str) -> ParsedToken:
 
         format_str = format_match.group(1) if format_match else None
 
-        last_part = re.sub(r":DATE\(.*?\)", "", token_name, flags=re.IGNORECASE)
+        last_part = re.sub(r":DATE\([^)]*\)", "", token_name, flags=re.IGNORECASE)
 
         if len(token_parts) == TokenParser.MIN_TOKEN_PARTS:
             name = last_part.upper()

src/eligibility_signposting_api/services/processors/token_processor.py

@@ -1,17 +1,14 @@
 import re
 from dataclasses import Field, fields, is_dataclass
 from datetime import UTC, datetime
-from typing import Any, Never, TypeVar
+from typing import Any, Never
 
 from wireup import service
 
 from eligibility_signposting_api.config.contants import ALLOWED_CONDITIONS
 from eligibility_signposting_api.model.person import Person
 from eligibility_signposting_api.services.processors.token_parser import ParsedToken, TokenParser
 
-T = TypeVar("T")
-
-
 TARGET_ATTRIBUTE_LEVEL = "TARGET"
 PERSON_ATTRIBUTE_LEVEL = "PERSON"
 ALLOWED_TARGET_ATTRIBUTES = {
@@ -30,7 +27,7 @@
 @service
 class TokenProcessor:
     @staticmethod
-    def find_and_replace_tokens(person: Person, data_class: T) -> T:
+    def find_and_replace_tokens[T](person: Person, data_class: T) -> T:
         if not is_dataclass(data_class):
             return data_class
         for class_field in fields(data_class):
@@ -95,8 +92,9 @@ def replace_token(text: str, person: Person) -> str:
                 for attribute in person.data:
                     is_person_attribute = attribute.get("ATTRIBUTE_TYPE") == PERSON_ATTRIBUTE_LEVEL
                     is_allowed_target = parsed_token.attribute_name.upper() in ALLOWED_CONDITIONS.__args__
+                    is_correct_target = parsed_token.attribute_name.upper() == attribute.get("ATTRIBUTE_TYPE")
 
-                    if (is_allowed_target or is_person_attribute) and key_to_find in attribute:
+                    if ((is_allowed_target and is_correct_target) or is_person_attribute) and key_to_find in attribute:
                         found_attribute = attribute
                         key_to_replace = key_to_find
                         break
@@ -120,7 +118,7 @@ def handle_token_not_found(parsed_token: ParsedToken, token: str) -> Never:
         raise ValueError(message)
 
     @staticmethod
-    def apply_formatting(attribute: dict[str, T], attribute_value: str, date_format: str | None) -> str:
+    def apply_formatting[T](attribute: dict[str, T], attribute_value: str, date_format: str | None) -> str:
         try:
             attribute_data = attribute.get(attribute_value)
             if (date_format or date_format == "") and attribute_data:

tests/unit/services/processors/test_token_processor.py

@@ -223,6 +223,42 @@ def test_valid_token_but_missing_attribute_data_to_replace(self):
         assert actual.status_text == expected.status_text
         assert actual.condition_name == expected.condition_name
 
+    def test_valid_token_but_missing_attribute_in_multiple_vacc_data_to_replace(self):
+        person = Person(
+            [
+                {"ATTRIBUTE_TYPE": "PERSON", "AGE": "30", "POSTCODE": None},
+                {"ATTRIBUTE_TYPE": "RSV", "CONDITION_NAME": "RSV", "LAST_SUCCESSFUL_DATE": None},
+                {"ATTRIBUTE_TYPE": "FAKEVACCS", "CONDITION_NAME": "FAKEVACCS", "LAST_SUCCESSFUL_DATE": None},
+                {"ATTRIBUTE_TYPE": "COVID", "CONDITION_NAME": "COVID", "LAST_SUCCESSFUL_DATE": "20250101"},
+                {"ATTRIBUTE_TYPE": "FLU", "CONDITION_NAME": "FLU", "LAST_SUCCESSFUL_DATE": "20260101"},
+            ]
+        )
+
+        condition = Condition(
+            condition_name=ConditionName(
+                "You had your COVID vaccine on [[TARGET.COVID.LAST_SUCCESSFUL_DATE:DATE(%d %B %Y)]]"
+            ),
+            status=Status.actionable,
+            status_text=StatusText("status"),
+            cohort_results=[],
+            suitability_rules=[],
+            actions=[],
+        )
+
+        expected = Condition(
+            condition_name=ConditionName("You had your COVID vaccine on 01 January 2025"),
+            status=Status.actionable,
+            status_text=StatusText("status"),
+            cohort_results=[],
+            suitability_rules=[],
+            actions=[],
+        )
+
+        actual = TokenProcessor.find_and_replace_tokens(person, condition)
+
+        assert actual.status_text == expected.status_text
+        assert actual.condition_name == expected.condition_name
+
     def test_simple_string_with_multiple_tokens(self):
         person = Person(
             [