Update: [AEA-3830] - Request content validation (#80)

## Summary - Routine Change - ✨ New Feature ### Details Validation for request content. DynamoDB transaction rather than individual writes. --------- Co-authored-by: Anthony Brown <[email protected]>
NHSDigital · Apr 15, 2024 · 6c8a4c8 · 6c8a4c8
1 parent c86374c
commit 6c8a4c8
Show file tree

Hide file tree

Showing 39 changed files with 1,855 additions and 707 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -122,6 +122,7 @@ jobs:
       TRUSTSTORE_FILE: psu-truststore.pem
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
+      LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
       CREATE_INT_RELEASE_NOTES: true
       CREATE_PROD_RELEASE_NOTES: true
@@ -144,6 +145,7 @@ jobs:
       TRUSTSTORE_FILE: psu-truststore.pem
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
+      LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
     secrets:
       CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.REF_CLOUD_FORMATION_DEPLOY_ROLE }}
@@ -160,6 +162,7 @@ jobs:
       TRUSTSTORE_FILE: psu-truststore.pem
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
+      LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
     secrets:
       CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }}
@@ -176,6 +179,7 @@ jobs:
       TRUSTSTORE_FILE: psu-truststore.pem
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
+      LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
       CREATE_INT_RELEASE_NOTES: true
       CREATE_INT_RC_RELEASE_NOTES: true
@@ -198,6 +202,7 @@ jobs:
 #      TRUSTSTORE_FILE: psu-truststore.pem
 #      VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
 #      COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
+#      LOG_LEVEL: INFO
 #      LOG_RETENTION_DAYS: 731
 #      MARK_JIRA_RELEASED: true
 #      CREATE_PROD_RELEASE_NOTES: true

diff --git a/SAMtemplates/tables/main.yaml b/SAMtemplates/tables/main.yaml
@@ -1,4 +1,4 @@
-AWSTemplateFormatVersion: '2010-09-09'
+AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
 Description: |
   PSU DynamoDB tables and related resources
@@ -14,7 +14,7 @@ Resources:
     Properties:
       TableName: !Sub ${StackName}-PrescriptionStatusUpdates
       AttributeDefinitions:
-        - AttributeName: RequestID
+        - AttributeName: TaskID
           AttributeType: S
         - AttributeName: PrescriptionID
           AttributeType: S
@@ -23,87 +23,41 @@ Resources:
         - AttributeName: PharmacyODSCode
           AttributeType: S
       KeySchema:
-        - AttributeName: RequestID
-          KeyType: HASH
         - AttributeName: PrescriptionID
+          KeyType: HASH
+        - AttributeName: TaskID
           KeyType: RANGE
       ProvisionedThroughput:
-        ReadCapacityUnits: '5'
-        WriteCapacityUnits: '5'
+        ReadCapacityUnits: "5"
+        WriteCapacityUnits: "5"
       GlobalSecondaryIndexes:
-        - IndexName: RequestIDIndex
+        - IndexName: PharmacyODSCodePrescriptionIDIndex
           KeySchema:
-            - AttributeName: RequestID
+            - AttributeName: PharmacyODSCode
               KeyType: HASH
             - AttributeName: PrescriptionID
               KeyType: RANGE
           Projection:
             NonKeyAttributes:
               - PatientNHSNumber
-              - PharmacyODSCode
-              - TaskID
               - LineItemID
               - TerminalStatus
-              - RequestMessage
+              - LastModified
+              - Status
             ProjectionType: INCLUDE
           ProvisionedThroughput:
-            ReadCapacityUnits: '5'
-            WriteCapacityUnits: '5'
-        - IndexName: PrescriptionIDIndex
-          KeySchema:
-            - AttributeName: PrescriptionID
-              KeyType: HASH
-            - AttributeName: PatientNHSNumber
-              KeyType: RANGE
-          Projection:
-            NonKeyAttributes:
-              - PharmacyODSCode
-              - TaskID
-              - LineItemID
-              - TerminalStatus
-              - RequestID
-              - RequestMessage
-            ProjectionType: INCLUDE
-          ProvisionedThroughput:
-            ReadCapacityUnits: '5'
-            WriteCapacityUnits: '5'
+            ReadCapacityUnits: "5"
+            WriteCapacityUnits: "5"
         - IndexName: PatientNHSNumberIndex
           KeySchema:
             - AttributeName: PatientNHSNumber
               KeyType: HASH
-            - AttributeName: PrescriptionID
-              KeyType: RANGE
-          Projection:
-            NonKeyAttributes:
-              - PharmacyODSCode
-              - TaskID
-              - LineItemID
-              - TerminalStatus
-              - RequestID
-              - RequestMessage
-            ProjectionType: INCLUDE
-          ProvisionedThroughput:
-            ReadCapacityUnits: '5'
-            WriteCapacityUnits: '5'
-        - IndexName: PharmacyODSCodeIndex
-          KeySchema:
-            - AttributeName: PharmacyODSCode
-              KeyType: HASH
-            - AttributeName: PrescriptionID
-              KeyType: RANGE
           Projection:
-            NonKeyAttributes:
-              - PatientNHSNumber
-              - TaskID
-              - LineItemID
-              - TerminalStatus
-              - RequestID
-              - RequestMessage
-            ProjectionType: INCLUDE
+            ProjectionType: KEYS_ONLY
           ProvisionedThroughput:
-            ReadCapacityUnits: '5'
-            WriteCapacityUnits: '5'
-  
+            ReadCapacityUnits: "5"
+            WriteCapacityUnits: "5"
+
   PrescriptionStatusUpdatesResources:
     Type: AWS::Serverless::Application
     Properties:
@@ -117,7 +71,7 @@ Outputs:
   PrescriptionStatusUpdatesTableName:
     Description: PrescriptionStatusUpdates table name
     Value: !Ref PrescriptionStatusUpdatesTable
-  
+
   PrescriptionStatusUpdatesTableArn:
     Description: PrescriptionStatusUpdates table arn
     Value: !GetAtt PrescriptionStatusUpdatesTable.Arn
diff --git a/jest.default.config.ts b/jest.default.config.ts
@@ -25,7 +25,7 @@ const jestConfig: JestConfigWithTsJest = {
   collectCoverage: true,
   coverageDirectory: "coverage",
   coverageProvider: "v8",
-  testMatch: ["**/tests/*.test.ts"],
+  testMatch: ["**/tests/**/*.test.ts"],
   testEnvironment: "node",
   extensionsToTreatAsEsm: [".ts"],
   verbose: true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/specification/eps-prescription-status-update-api.yaml b/packages/specification/eps-prescription-status-update-api.yaml
@@ -254,7 +254,7 @@ components:
             properties:
               fullUrl:
                 type: string
-                example: http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46
+                example: urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46
               resource:
                 $ref: "#/components/schemas/UpdatePrescriptionStatusTask"
               request:

diff --git a/packages/specification/examples/error-ods-code.json b/packages/specification/examples/error-ods-code.json
@@ -1,10 +1,10 @@
 {
-    "resourceType": "OperationOutcome",
-    "issue": [
-        {
-            "severity": "error",
-            "code": "value",
-            "diagnostic": "ODS code already in use"
-        }
-    ]
+  "resourceType": "OperationOutcome",
+  "issue": [
+    {
+      "severity": "error",
+      "code": "value",
+      "diagnostic": "ODS code already in use"
+    }
+  ]
 }
diff --git a/packages/specification/examples/request-collected.json b/packages/specification/examples/request-collected.json
@@ -3,7 +3,7 @@
   "type": "transaction",
   "entry": [
     {
-      "fullUrl": "http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+      "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46",
       "resource": {
         "resourceType": "Task",
         "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46",
@@ -37,7 +37,7 @@
             "value": "9449304130"
           }
         },
-        "lastModified": "2024-01-30T12:01:24Z",
+        "lastModified": "2023-09-11T10:11:12Z",
         "owner": {
           "identifier": {
             "system": "https://fhir.nhs.uk/Id/ods-organization-code",

diff --git a/packages/specification/examples/request-dispatched.json b/packages/specification/examples/request-dispatched.json
@@ -3,7 +3,7 @@
   "type": "transaction",
   "entry": [
     {
-      "fullUrl": "http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+      "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46",
       "resource": {
         "resourceType": "Task",
         "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46",
@@ -37,7 +37,7 @@
             "value": "9449304130"
           }
         },
-        "lastModified": "2024-01-30T12:01:24Z",
+        "lastModified": "2023-09-11T10:11:12Z",
         "owner": {
           "identifier": {
             "system": "https://fhir.nhs.uk/Id/ods-organization-code",

diff --git a/packages/specification/examples/request-erd-dispatched.json b/packages/specification/examples/request-erd-dispatched.json
@@ -3,7 +3,7 @@
     "type": "transaction",
     "entry": [
       {
-        "fullUrl": "http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+        "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46",
         "resource": {
           "resourceType": "Task",
           "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46",
@@ -60,4 +60,4 @@
       }
     ]
   }
-
+
diff --git a/packages/specification/examples/request-missing-fields.json b/packages/specification/examples/request-missing-fields.json
@@ -3,10 +3,17 @@
   "type": "transaction",
   "entry": [
     {
-      "fullUrl": "http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+      "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46",
       "resource": {
         "resourceType": "Task",
-        "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+        "basedOn": [
+          {
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/prescription-order-number",
+              "value": "07A66F-A83008-1EEEA0"
+            }
+          }
+        ],
         "status": "in-progress",
         "businessStatus": {
           "coding": [
@@ -24,13 +31,13 @@
             "value": "6989b7bd-8db6-428c-a593-4022e3044c00"
           }
         },
-        "lastModified": "2024-01-30T12:01:24Z",
-        "owner": {
+        "for": {
           "identifier": {
-            "system": "https://fhir.nhs.uk/Id/ods-organization-code",
-            "value": "C9Z1O"
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "9449304130"
           }
-        }
+        },
+        "lastModified": "2023-09-11T10:11:12Z"
       },
       "request": {
         "method": "POST",

diff --git a/packages/specification/examples/request-multiple-items.json b/packages/specification/examples/request-multiple-items.json
@@ -3,15 +3,15 @@
   "type": "transaction",
   "entry": [
     {
-      "fullUrl": "http://example.org/fhir/Task/4d70678c-81e4-4ff4-8c67-17596fd0aa46",
+      "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46",
       "resource": {
         "resourceType": "Task",
         "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46",
         "basedOn": [
           {
             "identifier": {
               "system": "https://fhir.nhs.uk/Id/prescription-order-number",
-              "value": "3F8A06-A83008-3E85AX"
+              "value": "07A66F-A83008-1EEEA0"
             }
           }
         ],
@@ -20,7 +20,7 @@
           "coding": [
             {
               "system": "https://fhir.nhs.uk/CodeSystem/task-businessStatus-nppt",
-              "code": "Ready to collect"
+              "code": "Dispatched"
             }
           ]
         },
@@ -37,7 +37,7 @@
             "value": "9449304130"
           }
         },
-        "lastModified": "2024-01-30T12:01:24Z",
+        "lastModified": "2023-09-11T10:11:12Z",
         "owner": {
           "identifier": {
             "system": "https://fhir.nhs.uk/Id/ods-organization-code",
@@ -51,10 +51,10 @@
       }
     },
     {
-      "fullUrl": "http://example.org/fhir/Task/346d2bfe-7dc0-451b-ad0d-da81833c08da",
+      "fullUrl": "urn:uuid:0ae4daf3-f24b-479d-b8fa-b69e2d873b60",
       "resource": {
         "resourceType": "Task",
-        "id": "346d2bfe-7dc0-451b-ad0d-da81833c08da",
+        "id": "0ae4daf3-f24b-479d-b8fa-b69e2d873b60",
         "basedOn": [
           {
             "identifier": {
@@ -85,7 +85,7 @@
             "value": "9449304130"
           }
         },
-        "lastModified": "2024-01-30T12:01:24Z",
+        "lastModified": "2023-09-11T10:11:12Z",
         "owner": {
           "identifier": {
             "system": "https://fhir.nhs.uk/Id/ods-organization-code",