Uses list[SuggestedAction] instead of SuggestedActions

Author: shweta-nhs

src/eligibility_signposting_api/audit_context.py

@@ -24,7 +24,7 @@
     ConditionName,
     IterationResult,
     Status,
-    SuggestedActions,
+    SuggestedAction,
 )
 from eligibility_signposting_api.model.rules import CampaignID, CampaignVersion, Iteration, RuleName, RulePriority
 from eligibility_signposting_api.services.audit_service import AuditService
@@ -61,7 +61,7 @@ def add_request_details(request: Request) -> None:
 
     @staticmethod
     def append_audit_condition(
-        suggested_actions: SuggestedActions | None,
+        suggested_actions: list[SuggestedAction] | None,
         condition_name: ConditionName,
         best_results: tuple[Iteration | None, IterationResult | None, dict[str, CohortGroupResult] | None],
         campaign_details: tuple[CampaignID | None, CampaignVersion | None],
@@ -104,14 +104,14 @@ def append_audit_condition(
 
         if suggested_actions is None:
             audit_actions = None
-        elif len(suggested_actions.actions) > 0:
-            for action in suggested_actions.actions:
+        elif len(suggested_actions) > 0:
+            for action in suggested_actions:
                 audit_actions.append(
                     AuditAction(
                         action_code=action.action_code,
                         action_type=action.action_type,
                         action_description=action.action_description,
-                        action_url=action.url_link,
+                        action_url=str(action.url_link),
                         action_url_label=action.url_label,
                     )
                 )

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

@@ -221,7 +221,9 @@ def evaluate_eligibility(self, *, include_actions_flag: bool = True) -> eligibil
         final_result = self.build_condition_results(condition_results)
         return eligibility.EligibilityStatus(conditions=final_result)
 
-    def handle_redirect_rules(self, best_active_iteration: Iteration) -> tuple[list[SuggestedAction] | None, RulePriority | None, RuleName | None]:
+    def handle_redirect_rules(
+        self, best_active_iteration: Iteration
+    ) -> tuple[list[SuggestedAction] | None, RulePriority | None, RuleName | None]:
         redirect_rules, action_mapper, default_comms = self.get_redirect_rules(best_active_iteration)
         priority_getter = attrgetter("priority")
         sorted_rules_by_priority = sorted(redirect_rules, key=priority_getter)

tests/unit/test_audit_context.py

@@ -5,6 +5,7 @@
 
 import pytest
 from flask import Flask, g, request
+from pydantic import HttpUrl
 
 from eligibility_signposting_api.audit_context import AuditContext
 from eligibility_signposting_api.audit_models import AuditEvent
@@ -21,7 +22,6 @@
     RulePriority,
     Status,
     SuggestedAction,
-    SuggestedActions,
     UrlLabel,
     UrlLink,
 )
@@ -81,23 +81,21 @@ def test_add_request_details_when_headers_are_empty_sets_audit_log_on_g(app):
 
 
 def test_append_audit_condition_adds_condition_to_audit_log_on_g(app):
-    suggested_actions: SuggestedActions | None
+    suggested_actions: list[SuggestedAction] | None
     condition_name: ConditionName
     best_results: tuple[Iteration, IterationResult, dict[str, CohortGroupResult]]
     campaign_details: tuple[CampaignID | None, CampaignVersion | None]
     redirect_rule_details: tuple[RulePriority | None, RuleName | None]
 
-    suggested_actions = SuggestedActions(
-        actions=[
-            SuggestedAction(
-                action_code=ActionCode("ActionCode1"),
-                action_type=ActionType("ActionType1"),
-                action_description=ActionDescription("ActionDescription1"),
-                url_link=UrlLink("https://www.example.com"),
-                url_label=UrlLabel("ActionLabel1"),
-            )
-        ]
-    )
+    suggested_actions = [
+        SuggestedAction(
+            action_code=ActionCode("ActionCode1"),
+            action_type=ActionType("ActionType1"),
+            action_description=ActionDescription("ActionDescription1"),
+            url_link=UrlLink(HttpUrl("https://example.com")),
+            url_label=UrlLabel("ActionLabel1"),
+        )
+    ]
 
     condition_name = ConditionName("Condition1")
     iteration = IterationFactory.build()

tests/unit/views/test_eligibility.py

@@ -615,6 +615,10 @@ def test_excludes_nulls_via_build_response(client: FlaskClient):
             "eligibility_signposting_api.views.eligibility.EligibilityService.get_eligibility_status",
             return_value=MagicMock(),  # No effect
         ),
+        patch(
+            "eligibility_signposting_api.views.eligibility.AuditService.audit",
+            return_value=MagicMock(),  # No effect
+        ),
         patch(
             "eligibility_signposting_api.views.eligibility.build_eligibility_response",
             return_value=mocked_response,
@@ -663,6 +667,10 @@ def test_build_response_include_values_that_are_not_null(client: FlaskClient):
             "eligibility_signposting_api.views.eligibility.EligibilityService.get_eligibility_status",
             return_value=MagicMock(),  # No effect
         ),
+        patch(
+            "eligibility_signposting_api.views.eligibility.AuditService.audit",
+            return_value=MagicMock(),  # No effect
+        ),
         patch(
             "eligibility_signposting_api.views.eligibility.build_eligibility_response",
             return_value=mocked_response,