Merge branch 'main' into bugfix/eja-fixing-tagging-permissions

eddalmond1 · web-flow · commit 86402526ca33 · 2025-10-03T10:26:52.000+01:00
diff --git a/.github/workflows/cicd-2-publish.yaml b/.github/workflows/cicd-2-publish.yaml
@@ -9,6 +9,7 @@ on:
     branches:
       - main
       - hotfix/*
+  workflow_dispatch: {}
 
 concurrency:
   group: terraform-dev
diff --git a/infrastructure/stacks/_shared/locals.tf b/infrastructure/stacks/_shared/locals.tf
@@ -8,13 +8,32 @@ locals {
 
   # tflint-ignore: terraform_unused_declarations
   tags = {
-    TagVersion      = "1"
-    Programme       = "Vaccinations"
-    Project         = "EligibilitySignpostingAPI"
-    Environment     = var.environment
-    ServiceCategory = var.environment == "prod" ? "Bronze" : "N/A"
-    Tool            = "Terraform"
-    workspace       = lower(terraform.workspace)
+    # Billing and Identification (FinOps)
+    FinOpsTagVersion = "1"
+    Programme        = "Vaccinations"
+    Product          = "EligibilitySignpostingAPI"
+    Owner            = "edd.almond1@nhs.net" # REQUIRED - distribution list recommended
+    CostCentre       = "129117"              # REQUIRED - your cost centre code
+    Customer         = "NHS England"         # Optional but recommended
+
+    # Environment Information (SecOps)
+    data_classification = "5"             # REQUIRED - 1-5 based on Cloud Risk Model
+    DataType            = "PII"           # REQUIRED - adjust based on your data
+    Environment         = var.environment # REQUIRED - Development/Testing/Preproduction/Production
+    ProjectType         = "Production"    # REQUIRED - PoC/Pilot/Production
+    PublicFacing        = "Y"             # REQUIRED - Y/N for internet-facing
+
+    # Technical Operations (TechOps)
+    ServiceCategory = "Silver"   # REQUIRED - Bronze/Silver/Gold/Platinum
+    OnOffPattern    = "AlwaysOn" # REQUIRED - AlwaysOn/OfficeHours/MF86/MF95/MF77
+
+    # Application Information (DevOps)
+    ApplicationRole = "API"       # REQUIRED - Web/App/DB/WebServer/Firewall/LoadBalancer
+    Tool            = "Terraform" # Optional - None/Terraform/Packer/CloudFormation/ARM
+
+    # Custom/Internal
+    workspace = lower(terraform.workspace)
+    Stack     = local.stack_name
   }
 
   terraform_state_bucket_name = "eligibility-signposting-api-${var.environment}-tfstate"
diff --git a/infrastructure/stacks/api-layer/provider.tf b/infrastructure/stacks/api-layer/provider.tf
@@ -1,9 +1,17 @@
 provider "aws" {
   region = "eu-west-2"
+
+  default_tags {
+    tags = local.tags
+  }
 }
 
 # Used by ACM
 provider "aws" {
   alias  = "eu-west-2"
   region = "eu-west-2"
+
+  default_tags {
+    tags = local.tags
+  }
 }
diff --git a/infrastructure/stacks/iams-developer-roles/provider.tf b/infrastructure/stacks/iams-developer-roles/provider.tf
@@ -1,3 +1,7 @@
 provider "aws" {
   region = "eu-west-2"
+
+  default_tags {
+    tags = local.tags
+  }
 }
diff --git a/infrastructure/stacks/networking/provider.tf b/infrastructure/stacks/networking/provider.tf
@@ -1,3 +1,7 @@
 provider "aws" {
   region = "eu-west-2"
+
+  default_tags {
+    tags = local.tags
+  }
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,7 @@ localstack = "^4.8.1"
 pytest-docker = "^3.2.3"
 stamina = "^25.1.0"
 pytest-freezer = "^0.4.9"
-moto = "^5.1.9"
+moto = "^5.1.13"
 requests = "^2.32.5"
 jsonschema = "^4.25.1"
 behave = "^1.2.6"
diff --git a/src/eligibility_signposting_api/services/processors/rule_processor.py b/src/eligibility_signposting_api/services/processors/rule_processor.py
@@ -39,9 +39,13 @@ class RuleProcessor:
 
     def is_base_eligible(self, person: Person, cohort: IterationCohort) -> bool:
         if cohort.is_virtual_cohort:
-            for row in person.data:
-                if row.get("ATTRIBUTE_TYPE", "") == "COHORTS":
-                    row["COHORT_MEMBERSHIPS"].append({"COHORT_LABEL": cohort.cohort_label})
+            cohorts_data = next((row for row in person.data if row.get("ATTRIBUTE_TYPE") == "COHORTS"), None)
+
+            if cohorts_data is None:
+                cohorts_data = {"ATTRIBUTE_TYPE": "COHORTS", "COHORT_MEMBERSHIPS": []}
+                person.data.append(cohorts_data)
+
+            cohorts_data.setdefault("COHORT_MEMBERSHIPS", []).append({"COHORT_LABEL": cohort.cohort_label})
 
         person_cohorts = self.person_data_reader.get_person_cohorts(person)
 
diff --git a/tests/fixtures/builders/repos/person.py b/tests/fixtures/builders/repos/person.py
@@ -18,7 +18,7 @@ def person_rows_builder(  # noqa:PLR0913
     gender: Gender | None = ...,
     postcode: str | None = ...,
     cohorts: Sequence[str] | None = ...,
-    vaccines: Sequence[tuple[str, date]] | None = ...,
+    vaccines: dict[str, dict[str, str | None]] | None = ...,
     icb: str | None = ...,
     gp_practice: str | None = ...,
     pcn: str | None = ...,
@@ -36,8 +36,6 @@ def person_rows_builder(  # noqa:PLR0913
     date_of_birth = date_of_birth if date_of_birth is not ... else faker.date_of_birth(minimum_age=18, maximum_age=99)
     gender = gender if gender is not ... else choice(get_args(Gender))
     postcode = postcode if postcode is not ... else faker.postcode()
-    cohorts = cohorts if cohorts is not ... else ["cohort-a", "cohort-b"]
-    vaccines = vaccines if vaccines is not ... else [("RSV", faker.past_date("-5y")), ("COVID", faker.past_date("-5y"))]
     icb = icb if icb is not ... else faker.icb()
     gp_practice = gp_practice if gp_practice is not ... else faker.gp_practice()
     pcn = pcn if pcn is not ... else faker.pcn()
@@ -64,26 +62,28 @@ def person_rows_builder(  # noqa:PLR0913
             "MSOA": msoa,
             "LSOA": lsoa,
         },
-        {
-            "NHS_NUMBER": key,
-            "ATTRIBUTE_TYPE": "COHORTS",
-            "COHORT_MEMBERSHIPS": [
-                {"COHORT_LABEL": cohort, "DATE_JOINED": faker.past_date().strftime("%Y%m%d")} for cohort in cohorts
-            ],
-        },
     ]
-    rows.extend(
-        {
-            "NHS_NUMBER": key,
-            "ATTRIBUTE_TYPE": vaccine,
-            "LAST_SUCCESSFUL_DATE": (
-                last_successful_date.strftime("%Y%m%d") if last_successful_date else last_successful_date
-            ),
-            "OPTOUT": choice(["Y", "N"]),
-            "LAST_INVITE_DATE": faker.past_date("-5y").strftime("%Y%m%d"),
-        }
-        for vaccine, last_successful_date in vaccines
-    )
+
+    if cohorts is not ... and cohorts:
+        rows.append(
+            {
+                "NHS_NUMBER": key,
+                "ATTRIBUTE_TYPE": "COHORTS",
+                "COHORT_MEMBERSHIPS": [
+                    {"COHORT_LABEL": cohort, "DATE_JOINED": faker.past_date().strftime("%Y%m%d")} for cohort in cohorts
+                ],
+            }
+        )
+
+    if vaccines is not ... and vaccines:
+        rows.extend(
+            {
+                "NHS_NUMBER": key,
+                "ATTRIBUTE_TYPE": vaccine_name,
+                **details,
+            }
+            for vaccine_name, details in vaccines.items()
+        )
 
     shuffle(rows)
 
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -409,7 +409,7 @@ def person_with_all_data(person_table: Any, faker: Faker) -> Generator[eligibili
             gender="0",
             postcode="SW18",
             cohorts=["cohort_label1", "cohort_label2"],
-            vaccines=[("RSV", None)],
+            vaccines={"RSV": {"LAST_SUCCESSFUL_DATE": None}},
             icb="QE1",
             gp_practice="C81002",
             pcn="U78207",
diff --git a/tests/integration/repo/test_person_repo.py b/tests/integration/repo/test_person_repo.py
@@ -22,8 +22,6 @@ def test_person_found(person_table: Any, persisted_person: NHSNumber):
         contains_inanyorder(
             has_entries({"NHS_NUMBER": persisted_person, "ATTRIBUTE_TYPE": "PERSON"}),
             has_entries({"NHS_NUMBER": persisted_person, "ATTRIBUTE_TYPE": "COHORTS"}),
-            has_entries({"NHS_NUMBER": persisted_person, "ATTRIBUTE_TYPE": "COVID"}),
-            has_entries({"NHS_NUMBER": persisted_person, "ATTRIBUTE_TYPE": "RSV"}),
         ),
     )
 
diff --git a/tests/unit/services/calculators/test_eligibility_calculator.py b/tests/unit/services/calculators/test_eligibility_calculator.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
`1`	`1`	`provider "aws" {`
`2`	`2`	`region = "eu-west-2"`
	`3`	`+`
	`4`	`+ default_tags {`
	`5`	`+ tags = local.tags`
	`6`	`+ }`
`3`	`7`	`}`