CCM-10004: merge

Author: mark-r-bjss

.github/workflows/pr_closed.yaml

@@ -54,3 +54,63 @@ jobs:
       targetAccountGroup: "nhs-notify-template-management-dev"
       targetComponent: ${{ matrix.component }}
       terraformAction: "apply"
+
+  check-event-schemas-version-change:
+    name: Check for event schemas package version change
+    needs: check-merge-or-workflow-dispatch
+    if: needs.check-merge-or-workflow-dispatch.outputs.deploy == 'true'
+    outputs:
+      version_changed: ${{ steps.check-version.outputs.version_changed }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18.2'
+          registry-url: 'https://npm.pkg.github.com'
+
+      - name: check if local version differs from latest published version
+        id: check-version
+        run: |
+          published_version=$(npm view @nhsdigital/nhs-notify-event-schemas-template-management --json 2>/dev/null | jq -r '.["dist-tags"].latest')
+          local_version=$(cat packages/event-schemas/package.json | jq -r '.version')
+          if [[ $local_version = $published_version ]]; then
+            echo "Local version is the same as the latest published version - skipping publish"
+            echo "version_changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "Local version is different to the latest published version - publishing new version"
+            echo "version_changed=true" >> $GITHUB_OUTPUT
+          fi
+
+  publish-event-schemas:
+    name: Publish event schemas package to GitHub package registry
+    needs: check-event-schemas-version-change
+    if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.18.2'
+          registry-url: 'https://npm.pkg.github.com'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Publish to GitHub Packages
+        run: npm publish --workspace packages/event-schemas
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -35,6 +35,7 @@ acceptance-test-report
 # production
 /build
 dist
+*.tgz
 
 # misc
 .DS_Store

.vscode/settings.json

@@ -1,13 +1,14 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "eslint.codeActionsOnSave.mode": "problems",
+  "eslint.useFlatConfig": false,
   "markdownlint.config": {
     "MD013": false,
     "MD024": {
       "siblings_only": true
     },
     "MD033": false
-  },
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "eslint.codeActionsOnSave.mode": "problems"
+  }
 }

data-migration/user-transfer/package.json

@@ -12,7 +12,7 @@
     "@types/node": "^20.17.32",
     "jest": "^29.7.0",
     "jest-html-reporter": "^3.10.2",
-    "jest-mock-extended": "^4.0.0-beta1",
+    "jest-mock-extended": "^3.0.7",
     "typescript": "^5.8.2"
   },
   "main": "src/handler.ts",

frontend/package.json

@@ -20,7 +20,7 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-idle-timer": "^5.7.2",
-    "zod": "^4.0.5"
+    "zod": "^4.0.17"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",

infrastructure/terraform/modules/backend-api/pipes_pipe_template_table_events.tf

@@ -1,4 +1,6 @@
 resource "aws_pipes_pipe" "template_table_events" {
+  depends_on = [module.sqs_template_table_events_pipe_dlq]
+
   name               = "${local.csi}-template-table-events"
   role_arn           = aws_iam_role.pipe_template_table_events.arn
   source             = aws_dynamodb_table.templates.stream_arn

lambdas/authorizer/package.json

@@ -5,7 +5,7 @@
     "jwks-rsa": "^3.2.0",
     "jwt-decode": "^4.0.0",
     "nhs-notify-web-template-management-utils": "^0.0.1",
-    "zod": "^4.0.5"
+    "zod": "^4.0.17"
   },
   "devDependencies": {
     "@swc/core": "^1.11.13",

lambdas/backend-api/package.json

@@ -18,7 +18,7 @@
     "parse-multipart-data": "^1.5.0",
     "pdfjs-dist": "5.1.91",
     "winston": "^3.17.0",
-    "zod": "^4.0.5"
+    "zod": "^4.0.17"
   },
   "devDependencies": {
     "@swc/core": "^1.11.13",

lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts

@@ -1,3 +1,4 @@
+import { File } from 'node:buffer';
 import { randomUUID } from 'node:crypto';
 import { mock } from 'jest-mock-extended';
 import type {

lambdas/backend-api/src/__tests__/templates/domain/template-pdf.test.ts

@@ -10,7 +10,7 @@ test('has the given key attributes', () => {
       templateId: 'template-id',
       clientId: 'template-owner',
     },
-    Buffer.from('')
+    Uint8Array.from('')
   );
 
   expect(pdf.templateId).toBe('template-id');
@@ -26,7 +26,7 @@ test('parse with no custom personalisation', async () => {
       templateId: 'template-id',
       clientId: 'template-owner',
     },
-    file
+    new Uint8Array(file)
   );
   await pdf.parse();
 
@@ -76,7 +76,7 @@ test('parse with custom personalisation', async () => {
       templateId: 'template-id',
       clientId: 'template-owner',
     },
-    file
+    new Uint8Array(file)
   );
   await pdf.parse();