Merge branch 'main' into chore/eja-eli-366-address-ruff-issues-with-version-bump

Author: eddalmond1

poetry.lock

@@ -29,7 +29,7 @@ asgiref = "^3.11.0"
 eval-type-backport = "^0.2.2"
 mangum = "^0.19.0"
 wireup = "^2.1.0"
-python-json-logger = "^3.3.0"
+python-json-logger = "^4.0.0"
 python-dateutil = "^2.9.0"
 pyhamcrest = "^2.1.0"
 boto3 = "^1.40.57"
@@ -43,7 +43,7 @@ jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
 gitpython = "^3.1.45"
 pytest = "^8.4.2"
-pytest-asyncio = "^1.2.0"
+pytest-asyncio = "^1.3.0"
 pytest-cov = "^7.0.0"
 pytest-nhsd-apim = "^5.0.14"
 aiohttp = "^3.12.15"
@@ -62,7 +62,7 @@ jsonschema = "^4.25.1"
 behave = "^1.3.3"
 python-dotenv = "^1.2.1"
 openapi-spec-validator = "^0.7.2"
-pip-licenses = "^5.0.0"
+pip-licenses = "^5.5.0"
 
 
 [tool.poetry-plugin-lambda-build]

pyproject.toml

@@ -30,9 +30,9 @@ def wrapper(event: LambdaEvent, context: LambdaContext) -> dict[str, Any] | None
 
 
 class EnrichedJsonFormatter(JsonFormatter):
-    def add_fields(self, log_record: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]) -> None:
-        log_record["request_id"] = request_id_context_var.get() or "-"
-        super().add_fields(log_record, record, message_dict)
+    def add_fields(self, log_data: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]) -> None:
+        log_data["request_id"] = request_id_context_var.get() or "-"
+        super().add_fields(log_data, record, message_dict)
 
 
 def init_logging(quieten: Sequence[str] = ("asyncio", "botocore", "boto3", "mangum", "urllib3")) -> None:

src/eligibility_signposting_api/logging/logs_manager.py

@@ -824,7 +824,7 @@ def inactive_iteration_config(s3_client: BaseClient, rules_bucket: BucketName) -
         )
 
         campaign.start_date = StartDate(datetime.date(2025, 1, 1))
-        campaign.end_date = EndDate(datetime.date(2026, 1, 1))
+        campaign.end_date = EndDate(datetime.date(2027, 1, 1))
         campaign.iterations[0].iteration_date = data[1]
 
         campaign_data = {"CampaignConfig": campaign.model_dump(by_alias=True)}