Merge branch 'main' into aea-0000-updated-related-apis

Author: tstephen-nhs

.github/workflows/run_regression_tests.yml

@@ -59,11 +59,11 @@ jobs:
         run: |
           if [[ "$TARGET_ENVIRONMENT" != "prod" && "$TARGET_ENVIRONMENT" != "ref" ]]; then
             # this should be the tag of the tests you want to run
-            REGRESSION_TEST_REPO_TAG=v3.11.0
+            REGRESSION_TEST_REPO_TAG=v3.10.9
 
             # this should be the tag of the regression test workflow you want to run
             # This will normally be the same as REGRESSION_TEST_REPO_TAG
-            REGRESSION_TEST_WORKFLOW_TAG=v3.11.0
+            REGRESSION_TEST_WORKFLOW_TAG=v3.10.9
 
             curl https://raw.githubusercontent.com/NHSDigital/electronic-prescription-service-api-regression-tests/refs/tags/${REGRESSION_TEST_WORKFLOW_TAG}/scripts/run_regression_tests.py -o run_regression_tests.py
             poetry install

SAMtemplates/tables/main.yaml

@@ -184,8 +184,6 @@ Resources:
               - TerminalStatus
               - LastModified
               - Status
-                # TODO: Remove this when we deprecate post dated prescriptions.
-              - PostDatedLastModifiedSetAt
             ProjectionType: INCLUDE
           ProvisionedThroughput: !If
             - EnableDynamoDBAutoScalingCondition
@@ -222,6 +220,27 @@ Resources:
             - ReadCapacityUnits: 1
               WriteCapacityUnits: !Ref MinWritePrescriptionStatusUpdatesCapacity
             - !Ref "AWS::NoValue"
+        - IndexName: PharmacyODSCodePrescriptionIDIndexIncPostDated
+          KeySchema:
+            - AttributeName: PharmacyODSCode
+              KeyType: HASH
+            - AttributeName: PrescriptionID
+              KeyType: RANGE
+          Projection:
+            NonKeyAttributes:
+              - PatientNHSNumber
+              - LineItemID
+              - TerminalStatus
+              - LastModified
+              - Status
+              # TODO: Remove this when we deprecate post dated prescriptions.
+              - PostDatedLastModifiedSetAt
+            ProjectionType: INCLUDE
+          ProvisionedThroughput: !If
+            - EnableDynamoDBAutoScalingCondition
+            - ReadCapacityUnits: 1
+              WriteCapacityUnits: !Ref MinWritePrescriptionStatusUpdatesCapacity
+            - !Ref "AWS::NoValue"
       Tags:
         - Key: "EPS-Tablename"
           Value: "PrescriptionStatusUpdates"
@@ -337,6 +356,56 @@ Resources:
         PredefinedMetricSpecification:
           PredefinedMetricType: DynamoDBReadCapacityUtilization
 
+  PharmacyIndexIncPostDatedScalingWriteTarget:
+    Type: AWS::ApplicationAutoScaling::ScalableTarget
+    Condition: EnableDynamoDBAutoScalingCondition
+    Properties:
+      MinCapacity: !Ref MinWritePrescriptionStatusUpdatesCapacity
+      MaxCapacity: !Ref MaxWritePrescriptionStatusUpdatesCapacity
+      ResourceId: !Sub table/${PrescriptionStatusUpdatesTable}/index/PharmacyODSCodePrescriptionIDIndexIncPostDated
+      RoleARN: !GetAtt DynamoDbScalingRole.Arn
+      ScalableDimension: "dynamodb:index:WriteCapacityUnits"
+      ServiceNamespace: dynamodb
+
+  PharmacyIndexIncPostDatedScalingWritePolicy:
+    Type: AWS::ApplicationAutoScaling::ScalingPolicy
+    Condition: EnableDynamoDBAutoScalingCondition
+    Properties:
+      PolicyName: PharmacyIndexIncPostDatedWriteScalingPolicy
+      PolicyType: TargetTrackingScaling
+      ScalingTargetId: !Ref PharmacyIndexIncPostDatedScalingWriteTarget
+      TargetTrackingScalingPolicyConfiguration:
+        TargetValue: 50
+        ScaleInCooldown: 600
+        ScaleOutCooldown: 0
+        PredefinedMetricSpecification:
+          PredefinedMetricType: DynamoDBWriteCapacityUtilization
+
+  PharmacyIndexIncPostDatedScalingReadTarget:
+    Type: AWS::ApplicationAutoScaling::ScalableTarget
+    Condition: EnableDynamoDBAutoScalingCondition
+    Properties:
+      MaxCapacity: 100
+      MinCapacity: 1
+      ResourceId: !Sub table/${PrescriptionStatusUpdatesTable}/index/PharmacyODSCodePrescriptionIDIndexIncPostDated
+      RoleARN: !GetAtt DynamoDbScalingRole.Arn
+      ScalableDimension: "dynamodb:index:ReadCapacityUnits"
+      ServiceNamespace: dynamodb
+
+  PharmacyIndexIncPostDatedScalingReadPolicy:
+    Type: AWS::ApplicationAutoScaling::ScalingPolicy
+    Condition: EnableDynamoDBAutoScalingCondition
+    Properties:
+      PolicyName: PharmacyIndexIncPostDatedReadScalingPolicy
+      PolicyType: TargetTrackingScaling
+      ScalingTargetId: !Ref PharmacyIndexIncPostDatedScalingReadTarget
+      TargetTrackingScalingPolicyConfiguration:
+        TargetValue: 70
+        ScaleInCooldown: 600
+        ScaleOutCooldown: 10
+        PredefinedMetricSpecification:
+          PredefinedMetricType: DynamoDBReadCapacityUtilization
+
   NHSNumberIndexScalingWriteTarget:
     Type: AWS::ApplicationAutoScaling::ScalableTarget
     Condition: EnableDynamoDBAutoScalingCondition

packages/gsul/src/dynamoDBclient.ts

@@ -50,7 +50,8 @@ export async function getItemsUpdatesForPrescription(
 export function createQueryCommandInput(odsCode: string, prescriptionID: string): QueryCommandInput {
   return {
     TableName: tableName,
-    IndexName: "PharmacyODSCodePrescriptionIDIndex",
+    // TODO: revert to PharmacyODSCodePrescriptionIDIndex once post-dated no longer required
+    IndexName: "PharmacyODSCodePrescriptionIDIndexIncPostDated",
     KeyConditionExpression: "PrescriptionID = :inputPrescriptionID AND PharmacyODSCode = :inputPharmacyODSCode",
     ExpressionAttributeValues: {
       ":inputPharmacyODSCode": odsCode.toUpperCase(),

packages/gsul/tests/testRunDynamoDBQueries.test.ts

@@ -48,7 +48,7 @@ describe("testing dynamoDBClient", () => {
 
     const expected = {
       TableName: undefined,
-      IndexName: "PharmacyODSCodePrescriptionIDIndex",
+      IndexName: "PharmacyODSCodePrescriptionIDIndexIncPostDated",
       KeyConditionExpression: "PrescriptionID = :inputPrescriptionID AND PharmacyODSCode = :inputPharmacyODSCode",
       ExpressionAttributeValues: {
         ":inputPharmacyODSCode": "ODSCODE",