CCM-12875: Merging main

Author: ScottFullerton-NHSE

.coverage

@@ -164,8 +164,7 @@ jobs:
       APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
   publish-stage: # Recommended maximum execution time is 10 minutes
     name: "Publish stage"
-    needs: [metadata, acceptance-stage] #PUT THIS BACK WHEN ACCEPTANCE STAGE IS ENABLED
-    #needs: [metadata, build-stage] BYPASSING ACCEPTANCE STAGE
+    needs: [metadata, build-stage]
     uses: ./.github/workflows/stage-5-publish.yaml
     if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
     with:

.github/workflows/cicd-1-pull-request.yaml

@@ -57,7 +57,7 @@ jobs:
           npm ci
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          npm run generate-dependencies
           git diff --exit-code
   test-unit:
     name: "Unit tests"
@@ -71,7 +71,7 @@ jobs:
           npm ci
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          npm run generate-dependencies
       - name: "Run unit test suite"
         run: |
           make test-unit
@@ -104,7 +104,7 @@ jobs:
           npm ci
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          npm run generate-dependencies
       - name: "Run linting"
         run: |
           make test-lint
@@ -120,7 +120,7 @@ jobs:
           npm ci
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          npm run generate-dependencies
       - name: "Run typecheck"
         run: |
           make test-typecheck

.github/workflows/stage-2-test.yaml

@@ -44,40 +44,3 @@ jobs:
         uses: ./.github/actions/build-docs
         with:
           version: "${{ inputs.version }}"
-
-
-
-  # artefact-1:
-  #   name: "Artefact 1"
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 3
-  #   steps:
-  #     - name: "Checkout code"
-  #       uses: actions/checkout@v5
-  #     - name: "Build artefact 1"
-  #       run: |
-  #         echo "Building artefact 1 ..."
-  #     - name: "Check artefact 1"
-  #       run: |
-  #         echo "Checking artefact 1 ..."
-  #     - name: "Upload artefact 1"
-  #       run: |
-  #         echo "Uploading artefact 1 ..."
-  #         # Use either action/cache or action/upload-artifact
-  # artefact-n:
-  #   name: "Artefact n"
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 3
-  #   steps:
-  #     - name: "Checkout code"
-  #       uses: actions/checkout@v5
-  #     - name: "Build artefact n"
-  #       run: |
-  #         echo "Building artefact n ..."
-  #     - name: "Check artefact n"
-  #       run: |
-  #         echo "Checking artefact n ..."
-  #     - name: "Upload artefact n"
-  #       run: |
-  #         echo "Uploading artefact n ..."
-  #         # Use either action/cache or action/upload-artifact

.github/workflows/stage-3-build.yaml

@@ -12,6 +12,9 @@ quick-start: config clean build serve-docs # Quick start target to setup, build
 dependencies: # Install dependencies needed to build and test the project @Pipeline
 	# TODO: Implement installation of your project dependencies
 
+generate: # Generate any autogenerated output @Pipeline
+	npm run generate-dependencies
+
 build: # Build the project artefact @Pipeline
 	$(MAKE) -C docs build
 
@@ -30,12 +33,14 @@ clean:: # Clean-up project resources (main) @Operations
 	$(MAKE) -C src/eventcatalogasyncapiimporter clean
 	$(MAKE) -C src/eventcatalogasyncapiimporter clean-output
 	rm -f .version
-	# TODO: Implement project resources clean-up step
+	npm run clean
 
 config:: _install-dependencies version # Configure development environment (main) @Configuration
 	$(MAKE) -C docs install
 	$(MAKE) -C src/cloudevents install
 	$(MAKE) -C src/eventcatalogasyncapiimporter install
+	npm install
+	$(MAKE) generate
 
 serve-docs:
 	$(MAKE) -C docs s
@@ -50,5 +55,5 @@ ${VERBOSE}.SILENT: \
 	build \
 	clean \
 	config \
-	dependencies \
+	generate \
 	deploy \

Makefile

@@ -33,7 +33,7 @@ Clone the repository
 ```shell
 git clone https://github.com/NHSDigital/nhs-notify-digital-letters.git
 cd nhs-notify-digital-letters
-code protject.code-workspace
+code project.code-workspace
 ```
 
 Reopen with container
@@ -76,6 +76,10 @@ Installation and configuration of the toolchain dependencies
 make config
 ```
 
+Note that the `make config` command will also build the flattened event schemas and auto-generate a Typescript
+type and JS validator code for each event. See the [typescript-schema-generator](src/typescript-schema-generator/)
+package for more details.
+
 ## Usage
 
 ### Testing

README.md

@@ -43,7 +43,6 @@ build: clean build-schemas copy-schema-docs copy-schema-yaml-docs copy-schemas b
 
 build-ci: build-schemas-ci copy-schema-docs copy-schema-yaml-docs copy-schemas build-eventcatalog build-docs show-build-output
 
-
 build-eventcatalog:
 	$(MAKE) build-eventcatalog-prereq
 	make -C $(EVENT_CAT_ROOT_DIR) build BASE_URL=$(EVENT_CAT_URL)

docs/Makefile

@@ -0,0 +1,14 @@
+---
+
+title: MESH Acknowledger
+parent:  MESH Services
+nav_order: 4
+has_children: true
+last_modified_date: 2024-10-28
+owner: Tom D'Roza
+author: Tom D'Roza
+diagrams: [c4code-mesh-acknowledger]
+events-raised: [mesh-inbox-message-acknowledged]
+events-consumed: [mesh-inbox-message-downloaded]
+c4type: code
+---

docs/architecture/c4/notifhir/mesh/acknowledger/index.md

@@ -0,0 +1,15 @@
+---
+
+title: Send letter to print
+parent:  Print Supplier Services
+nav_order: 9
+has_children: false
+is_not_draft: false
+last_modified_date: 2025-12-04
+owner: Ross Buggins
+author: Tom D'Roza
+diagrams: []
+events-raised: [external-supplier-api-letter-prepared]
+events-consumed: [queue-item-dequeued]
+c4type: code
+---

docs/architecture/c4/notifhir/printer/sendtoprint/index.md

@@ -8,7 +8,7 @@ is_not_draft: false
 last_modified_date: 2025-10-24
 owner: Tom D'Roza
 author: Tom D'Roza
-diagrams: [c4code-tracker-listener, c4component-nhsapp-callback, sequence-nhsapp-callback]
+diagrams: [c4code-mesh-statusreporter-recorder, sequence-nhsapp-callback]
 events-raised: []
 events-consumed: [
     mesh-inbox-message-downloaded,