Merge remote-tracking branch 'origin/main' into feature/eja-eli-173-create-postman-collection-automagically

Author: eddalmond1

.gitignore

@@ -44,4 +44,5 @@ sandbox/specification/*
 /lines-of-code-report*
 /specification/postman
 /sandbox/specification/*
+/integration-test-results.xml
 /specification/tmp/*

Makefile

@@ -3,6 +3,8 @@
 # ==============================================================================
 include scripts/init.mk
 
+MAKE_DIR := $(abspath $(shell pwd))
+
 #Installs dependencies using poetry.
 install-python:
 	poetry install
@@ -39,13 +41,15 @@ publish: clean
 #Files to loop over in release
 _dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests"
 
-
 # Example CI/CD targets are: dependencies, build, publish, deploy, clean, etc.
 
 dependencies: # Install dependencies needed to build and test the project @Pipeline
 	scripts/dependencies.sh
 
-build: # Build lambda in dist
+.PHONY: build
+build: dist/lambda.zip # Build lambda.zip in dist/
+
+dist/lambda.zip: $(MAKE_DIR)/pyproject.toml $(MAKE_DIR)/poetry.lock $(shell find src -type f)
 	poetry build-lambda -vv
 
 deploy: # Deploy the project artefact to the target environment @Pipeline

README.md

@@ -72,10 +72,10 @@ The following software packages, or their equivalents, are expected to be instal
 
 | Variable                | Default                 | Description                                                                                                                                                            |
 |-------------------------|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `DYNAMODB_ENDPOINT`     | `http://localhost:4566` | Endpoint for the app to access DynamoDB                                                                                                                                |
-| `AWS_REGION`            | `eu-west-1`             | AWS Region                                                                                                                                                             |
-| `AWS_ACCESS_KEY`        | `dummy_key`             | AWS Access Key                                                                                                                                                         |
+| `AWS_ACCESS_KEY_ID`     | `dummy_key`             | AWS Access Key                                                                                                                                                         |
+| `AWS_DEFAULT_REGION`    | `eu-west-1`             | AWS Region                                                                                                                                                             |
 | `AWS_SECRET_ACCESS_KEY` | `dummy_secret`          | AWS Secret Access Key                                                                                                                                                  |
+| `DYNAMODB_ENDPOINT`     | `http://localhost:4566` | Endpoint for the app to access DynamoDB                                                                                                                                |
 | `LOG_LEVEL`             | `WARNING`               | Logging level. Must be one of `DEBUG`, `INFO`, `WARNING`, `ERROR` or `CRITICAL` as per [Logging Levels](https://docs.python.org/3/library/logging.html#logging-levels) |
 
 ## Usage

poetry.lock

@@ -42,7 +42,7 @@ gitpython = "^3.1.44"
 pytest = "^8.3.4"
 pytest-asyncio = "^0.25.3"
 pytest-cov = "^6.0.0"
-#pytest-nhsd-apim = "^3.3.2"
+pytest-nhsd-apim = "^5.0.0"
 aiohttp = "^3.11.12"
 awscli = "^1.37.24"
 awscli-local = "^0.22.0"
@@ -82,6 +82,8 @@ log_cli = true
 log_cli_level = "DEBUG"
 log_format = "%(asctime)s %(levelname)s %(message)s"
 log_date_format = "%Y-%m-%d %H:%M:%S"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.run]
 relative_files = true

pyproject.toml

@@ -10,7 +10,7 @@
 from eligibility_signposting_api import repos, services
 from eligibility_signposting_api.config import config, init_logging
 from eligibility_signposting_api.error_handler import handle_exception
-from eligibility_signposting_api.views import eligibility, hello
+from eligibility_signposting_api.views import eligibility_blueprint
 
 init_logging()
 logger = logging.getLogger(__name__)
@@ -24,7 +24,9 @@ def main() -> None:  # pragma: no cover
 
 def lambda_handler(event: LambdaEvent, context: LambdaContext) -> dict[str, Any]:  # pragma: no cover
     """Run the Flask app as an AWS Lambda."""
-    handler = Mangum(WsgiToAsgi(create_app()))
+    app = create_app()
+    app.debug = config()["log_level"] == logging.DEBUG
+    handler = Mangum(WsgiToAsgi(app), lifespan="off")
     return handler(event, context)
 
 
@@ -33,15 +35,14 @@ def create_app() -> Flask:
     logger.info("app created")
 
     # Register views & error handler
-    app.register_blueprint(eligibility, url_prefix="/eligibility")
-    app.register_blueprint(hello, url_prefix="/hello")
+    app.register_blueprint(eligibility_blueprint, url_prefix="/eligibility")
     app.register_error_handler(Exception, handle_exception)
 
     # Set up dependency injection using wireup
-    container = wireup.create_sync_container(service_modules=[services, repos], parameters={**config(), **app.config})
+    container = wireup.create_sync_container(service_modules=[services, repos], parameters={**app.config, **config()})
     wireup.integration.flask.setup(container, app)
 
-    logger.info("app ready")
+    logger.info("app ready", extra={"config": {**app.config, **config()}})
     return app
 
 

src/eligibility_signposting_api/app.py

@@ -1,5 +1,6 @@
 import logging
 import os
+from collections.abc import Sequence
 from functools import lru_cache
 from typing import Any, NewType
 
@@ -16,17 +17,22 @@
 @lru_cache
 def config() -> dict[str, Any]:
     return {
+        "aws_access_key_id": AwsAccessKey(os.getenv("AWS_ACCESS_KEY_ID", "dummy_key")),
+        "aws_default_region": AwsRegion(os.getenv("AWS_DEFAULT_REGION", "eu-west-1")),
         "dynamodb_endpoint": URL(os.getenv("DYNAMODB_ENDPOINT", "http://localhost:4566")),
-        "aws_region": AwsRegion(os.getenv("AWS_REGION", "eu-west-1")),
-        "aws_access_key_id": AwsAccessKey(os.getenv("AWS_ACCESS_KEY", "dummy_key")),
         "aws_secret_access_key": AwsSecretAccessKey(os.getenv("AWS_SECRET_ACCESS_KEY", "dummy_secret")),
         "log_level": LOG_LEVEL,
     }
 
 
-def init_logging() -> None:
+def init_logging(quieten: Sequence[str] = ("asyncio", "botocore", "boto3", "mangum", "urllib3")) -> None:
     log_format = "%(asctime)s %(levelname)-8s %(name)s %(module)s.py:%(funcName)s():%(lineno)d %(message)s"
     formatter = JsonFormatter(log_format)
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)
-    logging.basicConfig(level=LOG_LEVEL, format=log_format, handlers=[handler])
+    logging.root.handlers = []  # Clear any existing handlers
+    logging.root.setLevel(LOG_LEVEL)  # Set log level
+    logging.root.addHandler(handler)  # Add handler
+
+    for q in quieten:
+        logging.getLogger(q).setLevel(logging.WARNING)

src/eligibility_signposting_api/config.py

@@ -1,3 +1,12 @@
+from datetime import date
 from typing import NewType
 
+from pydantic import BaseModel
+
 NHSNumber = NewType("NHSNumber", str)
+DateOfBirth = NewType("DateOfBirth", date)
+Postcode = NewType("Postcode", str)
+
+
+class Eligibility(BaseModel):
+    processed_suggestions: list[dict]

src/eligibility_signposting_api/model/eligibility.py

@@ -1,4 +1,4 @@
+from .eligibility_repo import EligibilityRepo
 from .exceptions import NotFoundError
-from .person_repo import PersonRepo
 
-__all__ = ["NotFoundError", "PersonRepo"]
+__all__ = ["EligibilityRepo", "NotFoundError"]