Merge branch 'main' into feature/CCM-13146_handle-ttl-component-tests

Author: Ian-Hodges

.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

@@ -12,7 +12,7 @@ cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:
 973c8a1feb76f3cd8743ce27b14e4acc4252240c:src/TESTING_PLAN.md:ipv4:2507
 cc74128e4207833109339e96f3aaebf3cd40dd65:src/TESTING_PLAN.md:ipv4:2507
 791619daf5af4806da7266fa301c0e82145b6de8:src/TESTING_PLAN.md:ipv4:2507
-f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/validate-private-key.test.ts:private-key:7
-f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:23
-f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:30
-f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:46
+d1c0a37078cbed4fbedae044e5cbafac71717af0:utils/utils/src/__tests__/key-generation/validate-private-key.test.ts:private-key:7
+d1c0a37078cbed4fbedae044e5cbafac71717af0:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:23
+d1c0a37078cbed4fbedae044e5cbafac71717af0:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:30
+d1c0a37078cbed4fbedae044e5cbafac71717af0:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:46

.gitleaksignore

@@ -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,

README.md

@@ -8,8 +8,8 @@ is_not_draft: false
 last_modified_date: 2025-10-28
 owner: Ross Buggins
 author: Tom D'Roza
-diagrams: [c c4code-mesh-statusreporter-generator]
-events-raised: [reporting-daily-report-generated]
-events-consumed: [reporting-daily-report-timer-expired]
+diagrams: [c4code-mesh-statusreporter-generator]
+events-raised: [reporting-report-generated]
+events-consumed: [reporting-generate-report]
 c4type: code
 ---

docs/architecture/c4/notifhir/reporting/recorder/index.md

@@ -9,7 +9,7 @@ last_modified_date: 2025-10-28
 owner: Ross Buggins
 author: Tom D'Roza
 diagrams: [c4code-mesh-statusreporter-scheduler]
-events-raised: [reporting-daily-report-timer-expired]
+events-raised: [reporting-generate-report]
 events-consumed: []
 c4type: code
 ---

docs/architecture/c4/notifhir/reporting/reportgenerator/index.md

@@ -0,0 +1,15 @@
+---
+
+title: Report Sender
+parent: Reporting
+nav_order: 4
+has_children: true
+is_not_draft: false
+last_modified_date: 2025-11-26
+owner: Ross Buggins
+author: Tom D'Roza
+diagrams: [c4code-mesh-statusreporter-sender]
+events-raised: [reporting-report-sent]
+events-consumed: [reporting-report-generated]
+c4type: code
+---

docs/architecture/c4/notifhir/reporting/reportscheduler/index.md

@@ -9,16 +9,20 @@ architecture-beta
     group coreNotifier(cloud)[CoreNotifier]
     service meshDownloaded(aws:res-amazon-eventbridge-event)[PDMResourceAvailable Event]
     service sqs(logos:aws-sqs)[CoreNotifier Queue] in coreNotifier
+    service clientConfig(aws:res-aws-systems-manager-parameter-store)[Client Configuration] in coreNotifier
     service coreNotified(aws:res-amazon-eventbridge-event)[MessageRequestSubmitted Event]
-    service coreFailed(aws:res-amazon-eventbridge-event)[MessageRequestFailed Event]
+    service coreFailed(aws:res-amazon-eventbridge-event)[MessageRequestRejected Event]
+    service coreSkipped(aws:res-amazon-eventbridge-event)[MessageRequestSkipped Event]
     service notifier(logos:aws-lambda)[CoreNotifier] in coreNotifier
     service notify(server)[NHS Notify Core]
     junction j1
 
     meshDownloaded:R --> L:sqs
     sqs:R -->  L:notifier
+    clientConfig:B --> T:notifier
     notifier:B --> T:notify
-    notifier:R --> L:j1
-    j1:R -- L:coreNotified
+    notifier:R -- L:j1
+    j1:T --> L:coreNotified
+    j1:R -- L:coreSkipped
     j1:B --> L:coreFailed
 ```