[NRL-1051] WIP some more renaming

Author: mattdean3-nhs

Makefile

@@ -66,7 +66,7 @@ build-layers: ./layer/*
 		./scripts/build-lambda-layer.sh $${layer} $(DIST_PATH); \
 	done
 
-build-api-packages: ./api/consumer/* ./api/producer/* ./api/mhds-recipient/*
+build-api-packages: ./api/consumer/* ./api/producer/*
 	@echo "Building API packages"
 	@mkdir -p $(DIST_PATH)
 	for api in $^; do \

…rocessTransaction/process_transaction.py …ransaction/process_transaction_bundle.pyapi/mhds-recipient/processTransaction/process_transaction.py renamed to api/producer/processTransaction/process_transaction_bundle.py api/mhds-recipient/processTransaction/process_transaction.py renamed to api/producer/processTransaction/process_transaction_bundle.py

@@ -284,8 +284,14 @@ def handler(
     Returns:
         Response: The response indicating the result of the operation.
     """
-    if not body.meta.profile[0].endswith(
-        "profiles.ihe.net/ITI/MHD/StructureDefinition/IHE.MHD.UnContained.Comprehensive.ProvideBundle"
+    # 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"
+        )
     ):
         return SpineErrorResponse.BAD_REQUEST(
             diagnostics="Only IHE.MHD.UnContained.Comprehensive.ProvideBundle profiles are supported",
@@ -299,13 +305,13 @@ def handler(
         )
 
     if body.entry is None:
-        return SpineErrorResponse.BAD_REQUEST(
-            diagnostics="The bundle must contain at least one entry", expression="entry"
+        # TODO - Log that there was not entry
+        return Response.from_resource(
+            resource=Bundle(resourceType="Bundle", type="transaction-response")
         )
 
     document_references: list[DocumentReference] = []
 
-    # TODO - Handle this better
     issues: list[BaseModel] = []
 
     for entry in body.entry:
@@ -320,6 +326,17 @@ def handler(
                 )
             )
 
+        if entry.request.method != "POST":
+            issues.append(
+                OperationOutcomeIssue(
+                    severity="error",
+                    code="exception",
+                    diagnostics="Only create using POST method is supported",
+                    expression=[ExpressionItem("entry.request.method")],
+                    details=SpineErrorConcept.from_code("BAD_REQUEST"),
+                )
+            )
+
         document_references.append(DocumentReference.model_validate(entry.resource))
 
     if issues:
@@ -335,4 +352,8 @@ def handler(
         except OperationOutcomeError as e:
             responses.append(e.response)
 
-    return NRLResponse.BUNDLE_CREATED(responses)
+    return Response.from_resource(
+        resource=Bundle(
+            resourceType="Bundle", type="transaction-response", entry=responses
+        )
+    )

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_mhdsProcessTransation       = "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--mhdsRecipient--processTransaction", 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"
   }
 
   kms_key_id                   = module.kms__cloudwatch.kms_arn

terraform/infrastructure/lambda.tf

@@ -384,12 +384,12 @@ module "producer__status" {
 
 module "mhdsReceiver__processTransactionBundle" {
   source                 = "./modules/lambda"
-  parent_path            = "api/mhds-recipient"
+  parent_path            = "api/producer"
   name                   = "processTransaction"
   region                 = local.region
   prefix                 = local.prefix
   layers                 = [module.nrlf.layer_arn, module.third_party.layer_arn, module.nrlf_permissions.layer_arn]
-  api_gateway_source_arn = ["arn:aws:execute-api:${local.region}:${local.aws_account_id}:${module.producer__gateway.api_gateway_id}/*/GET/_status"]
+  api_gateway_source_arn = ["arn:aws:execute-api:${local.region}:${local.aws_account_id}:${module.producer__gateway.api_gateway_id}/*/POST/"]
   kms_key_id             = module.kms__cloudwatch.kms_arn
   environment_variables = {
     PREFIX               = "${local.prefix}--"