(ELI-623) adding logging and auditng to lambda and api gateway

Author: TOEL2

src/eligibility_signposting_api/audit/audit_context.py

@@ -48,6 +48,7 @@ def add_request_details(request: Request) -> None:
                     x_correlation_id=request.headers.get("X-Correlation-ID"),
                     nhsd_end_user_organisation_ods=request.headers.get("NHSD-End-User-Organisation-ODS"),
                     nhsd_application_id=request.headers.get("nhsd-application-id"),
+                    nhse_product_id=request.headers.get("nhse-product-id"),
                 )
             ),
             query_params=(

src/eligibility_signposting_api/audit/audit_models.py

@@ -17,6 +17,7 @@ class RequestAuditHeader(CamelCaseBaseModel):
     x_correlation_id: str | None = None
     nhsd_end_user_organisation_ods: str | None = None
     nhsd_application_id: str | None = None
+    nhse_product_id: str | None = None
 
 
 class RequestAuditQueryParams(CamelCaseBaseModel):

src/eligibility_signposting_api/logging/logs_helper.py

@@ -20,6 +20,8 @@ def wrapper(event: LambdaEvent, context: LambdaContext) -> dict[str, Any] | None
                     "x_request_id": headers.get("X-Request-ID"),
                     "x_correlation_id": headers.get("X-Correlation-ID"),
                     "gateway_request_id": gateway_request_id,
+                    "nhse_product_id": headers.get("nhse-product-id"),
+                    "nhsd_application_id": headers.get("nhsd-application-id"),
                 },
             )
             return func(event, context)

tests/integration/lambda/test_app_running_as_lambda.py

@@ -231,6 +231,7 @@ def test_given_nhs_number_in_path_matches_with_nhs_number_in_headers_and_check_i
         "xCorrelationId": "x_correlation_id",
         "nhsdEndUserOrganisationOds": "nhsd_end_user_organisation_ods",
         "nhsdApplicationId": "nhsd-application-id",
+        "nhseProductId": consumer_id,
     }
     expected_query_params = {"category": None, "conditions": None, "includeActions": "Y"}
 
@@ -478,6 +479,7 @@ def test_given_person_has_unique_status_for_different_conditions_with_audit(  #
         "xCorrelationId": "x_correlation_id",
         "nhsdEndUserOrganisationOds": "nhsd_end_user_organisation_ods",
         "nhsdApplicationId": "nhsd-application-id",
+        "nhseProductId": consumer_id,
     }
     expected_query_params = {"category": "VACCINATIONS", "conditions": "COVID,FLU,RSV", "includeActions": "Y"}