[NRL-1051] Add transaction API to APIGW. Fix TF response state issue

Author: mattdean3-nhs

api/producer/processTransaction/process_transaction_bundle.py

@@ -265,16 +265,26 @@ def create_document_reference(
     return NRLResponse.RESOURCE_CREATED(resource_id=result.resource.id)
 
 
+def _convert_document_reference(
+    document_reference: DocumentReference, requested_profile: str
+) -> DocumentReference:
+    """
+    Convert the DocumentReference to the requested profile
+    """
+    # TODO - Implement conversion logic from MHDS profile to NRLF FHIR profile
+    return document_reference
+
+
 @request_handler(body=Bundle)
 def handler(
     metadata: ConnectionMetadata,
     repository: DocumentPointerRepository,
     body: Bundle,
 ) -> Response:
     """
-    Handles an MHDS transaction bundle request.
+    Handles an FHIR transaction bundle request.
 
-    Currently limited to register requests only.
+    Currently limited to create requests only and only supports either the MHDS profile or the NRLF profile.
 
     Args:
         metadata (ConnectionMetadata): The connection metadata.
@@ -285,17 +295,17 @@ def handler(
         Response: The response indicating the result of the operation.
     """
     # TODO - Add logging
-    # TODO - Add profile for NRLF too
-    if (
-        body.meta
-        and body.meta.profile
-        and not body.meta.profile[0].endswith(
-            "profiles.ihe.net/ITI/MHD/StructureDefinition/IHE.MHD.UnContained.Comprehensive.ProvideBundle"
-        )
+    requested_profile = (
+        body.meta.profile[0].root if body.meta and body.meta.profile else None
+    )
+
+    # TODO - Add profile for NRLF too (assume NRLF profile if not provided)
+    if requested_profile and not requested_profile.endswith(
+        "profiles.ihe.net/ITI/MHD/StructureDefinition/IHE.MHD.UnContained.Comprehensive.ProvideBundle"
     ):
         return SpineErrorResponse.BAD_REQUEST(
             diagnostics="Only IHE.MHD.UnContained.Comprehensive.ProvideBundle profiles are supported",
-            expression="meta.profile",
+            expression="meta.profile[0]",
         )
 
     if body.type != "transaction":
@@ -305,7 +315,7 @@ def handler(
         )
 
     if body.entry is None:
-        # TODO - Log that there was not entry
+        # TODO - Log that there was no entry
         return Response.from_resource(
             resource=Bundle(resourceType="Bundle", type="transaction-response")
         )
@@ -345,6 +355,11 @@ def handler(
     responses: list[Response] = []
     for document_reference in document_references:
         try:
+            if requested_profile:
+                document_reference = _convert_document_reference(
+                    document_reference, requested_profile
+                )
+
             create_response = create_document_reference(
                 metadata, repository, document_reference
             )

api/producer/swagger.yaml

@@ -237,6 +237,33 @@ servers:
     description: Production environment.
 tags:
 paths:
+  /:
+    post:
+      tags:
+      summary: Process a FHIR transaction
+      operationId: processTransaction
+      responses:
+        "200":
+          description: Transaction successful response
+          $ref: "#/components/responses/Success"
+          content:
+            application/fhir+json:
+              example: {} # TODO - Add example response for processTransaction
+      requestBody:
+        $ref: "#/components/schemas/Bundle"
+      parameters: {}
+      x-amazon-apigateway-integration:
+        type: aws_proxy
+        httpMethod: POST
+        uri: ${method_processTransaction}
+        responses:
+          default:
+            statusCode: "200"
+        passthroughBehavior: when_no_match
+        contentHandling: CONVERT_TO_TEXT
+      description: |
+        TODO - Add description for processTransaction
+
   /DocumentReference:
     post:
       tags:

terraform/infrastructure/api_gateway.tf

@@ -34,7 +34,7 @@ module "producer__gateway" {
     method_upsertDocumentReference     = "arn:aws:apigateway:eu-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-2:${local.aws_account_id}:function:${substr("${local.prefix}--api--producer--upsertDocumentReference", 0, 64)}/invocations"
     method_deleteDocumentReference     = "arn:aws:apigateway:eu-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-2:${local.aws_account_id}:function:${substr("${local.prefix}--api--producer--deleteDocumentReference", 0, 64)}/invocations"
     method_status                      = "arn:aws:apigateway:eu-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-2:${local.aws_account_id}:function:${substr("${local.prefix}--api--producer--status", 0, 64)}/invocations"
-    method_processTransation           = "arn:aws:apigateway:eu-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-2:${local.aws_account_id}:function:${substr("${local.prefix}--api--producer--processTransaction", 0, 64)}/invocations"
+    method_processTransaction          = "arn:aws:apigateway:eu-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-2:${local.aws_account_id}:function:${substr("${local.prefix}--api--producer--processTransaction", 0, 64)}/invocations"
   }
 
   kms_key_id                   = module.kms__cloudwatch.kms_arn

terraform/infrastructure/modules/api_gateway/api_gateway.tf

@@ -113,6 +113,8 @@ resource "aws_api_gateway_method_settings" "api_gateway_method_settings" {
 resource "aws_api_gateway_gateway_response" "api_access_denied" {
   rest_api_id   = aws_api_gateway_rest_api.api_gateway_rest_api.id
   response_type = "ACCESS_DENIED"
+  status_code   = "403"
+
   response_templates = {
     "application/json" = jsonencode({
       resourceType : "OperationOutcome",