modified the api response - need refractoring later

Author: Karthikeyannhs

src/eligibility_signposting_api/model/eligibility.py

@@ -4,10 +4,9 @@
 from datetime import date
 from enum import Enum, StrEnum, auto
 from functools import total_ordering
-from typing import TYPE_CHECKING, NewType, Self
+from typing import NewType, Self
 
-if TYPE_CHECKING:
-    from eligibility_signposting_api.model import rules
+from eligibility_signposting_api.model.rules import IterationCohort
 
 NHSNumber = NewType("NHSNumber", str)
 DateOfBirth = NewType("DateOfBirth", date)
@@ -75,7 +74,7 @@ class Condition:
 
 @dataclass
 class CohortStatus:
-    cohort: rules.IterationCohort
+    cohort: IterationCohort
     status: Status
     reasons: list[Reason]
 

src/eligibility_signposting_api/views/eligibility.py

@@ -66,7 +66,8 @@ def build_eligibility_response(
                         rule_code=eligibility.RuleCode(reason.rule_name),  # pyright: ignore[reportCallIssue]
                         rule_text=eligibility.RuleText(reason.rule_result),  # pyright: ignore[reportCallIssue]
                     )
-                    for reason in condition.reasons
+                    for cohort_result in condition.cohort_results
+                    for reason in cohort_result.reasons
                 ],  # pyright: ignore[reportCallIssue]
                 actions=[],
             )

tests/unit/views/test_eligibility.py

@@ -1,7 +1,6 @@
 import logging
 from http import HTTPStatus
 
-import pytest
 from brunns.matchers.data import json_matching as is_json_that
 from brunns.matchers.werkzeug import is_werkzeug_response as is_response
 from flask import Flask
@@ -40,7 +39,6 @@ def get_eligibility_status(self, _: NHSNumber | None = None) -> EligibilityStatu
         raise ValueError
 
 
-@pytest.mark.skip(reason="Skipping this test for now, the api response has to be corrected")
 def test_nhs_number_given(app: Flask, client: FlaskClient):
     # Given
     with get_app_container(app).override.service(EligibilityService, new=FakeEligibilityService()):