Fix todo's

Author: shweta-nhs

src/eligibility_signposting_api/audit_context.py

@@ -100,7 +100,7 @@ def append_audit_condition(
                         )
 
         if best_candidate and best_candidate.status and best_candidate.status.name == Status.actionable.name:
-            audit_redirect_rule = AuditRedirectRule(int(redirect_rule_details[0]), redirect_rule_details[1])
+            audit_redirect_rule = AuditRedirectRule(redirect_rule_details[0], redirect_rule_details[1])
 
         if suggested_actions is None:
             audit_actions = None
@@ -112,7 +112,7 @@ def append_audit_condition(
                         action_code=action.action_code,
                         action_type=action.action_type,
                         action_description=action.action_description,
-                        action_url=str(action.url_link),
+                        action_url=str(action.url_link) if action.url_link else None,
                         action_url_label=action.url_label,
                     )
                 )

src/eligibility_signposting_api/audit_models.py

@@ -47,14 +47,14 @@ class AuditFilterRule:
 
 @dataclass
 class AuditSuitabilityRule:
-    rule_priority: int | None = None
+    rule_priority: str | None = None
     rule_name: str | None = None
     rule_message: str | None = None
 
 
 @dataclass
 class AuditRedirectRule:
-    rule_priority: int | None = None
+    rule_priority: str | None = None
     rule_name: str | None = None
 
 

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

@@ -97,7 +97,7 @@ def get_the_best_cohort_memberships(
                 status=cc.status,
                 reasons=cc.reasons,
                 description=(cc.description or "").strip() if cc.description else "",
-                audit_rules=cc.audit_rules,  # TODO: remove this or fix it!
+                audit_rules=cc.audit_rules,
             )
             for cc in best_cohorts
         ]
@@ -182,7 +182,6 @@ def evaluate_eligibility(self, *, include_actions_flag: bool = True) -> eligibil
                 ) = max(iteration_results.items(), key=lambda item: item[1][1].status.value)
             else:
                 best_candidate = IterationResult(eligibility.Status.not_eligible, [], actions)
-                # TODO: Refactor?
                 best_campaign_id = None
                 best_campaign_version = None
                 best_active_iteration = None
@@ -209,7 +208,6 @@ def evaluate_eligibility(self, *, include_actions_flag: bool = True) -> eligibil
             actions: list[SuggestedAction] | None = []
 
             # add audit data
-            # TODO: Do we need to use deduplicated cohort results from build_condition_results instead of here?
             AuditContext.append_audit_condition(
                 condition_results[condition_name].actions,
                 condition_name,
@@ -267,7 +265,7 @@ def get_cohort_results(self, active_iteration: rules.Iteration) -> dict[str, Coh
                     Status.not_eligible,
                     [],
                     cohort.negative_description,
-                    [],  # TODO: remove this or fix it!
+                    [],
                 )
         return cohort_results
 
@@ -291,7 +289,7 @@ def build_condition_results(condition_results: dict[ConditionName, IterationResu
                     reasons=[reason for cohort in group for reason in cohort.reasons],
                     # get the first nonempty description
                     description=next((c.description for c in group if c.description), group[0].description),
-                    audit_rules=[],  # TODO: remove this or fix it!
+                    audit_rules=[],
                 )
                 for group_cohort_code, group in grouped_cohort_results.items()
                 if group

tests/integration/lambda/test_app_running_as_lambda.py

@@ -382,7 +382,7 @@ def test_given_person_has_unique_status_for_different_conditions_with_audit(  #
             "action_rule": {"rule_priority": 20, "rule_name": "In QE1"},
             "actions": [
                 {
-                    "internal_name": None,  # TODO: FIX!
+                    "internal_action_code": "defaultcomms",
                     "action_type": "defaultcomms",
                     "action_code": "action_code",
                     "action_description": None,