Merge branch 'main' into feature/CCM-12616_mesh_poll_retrieve

Author: lapenna-bjss

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

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

README.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,

docs/architecture/c4/notifhir/reporting/recorder/index.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/reportgenerator/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/reportscheduler/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/reportsender/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
 ```

docs/assets/aws-icons-mermaid.json

@@ -10,9 +10,11 @@ architecture-beta
     service meshDownloaded(aws:res-amazon-eventbridge-event)[MeshPollerTimerExpired Event]
     service pdmSaved(aws:res-amazon-eventbridge-event)[MESHInboxMessageReceived Event]
     service meshPollLambda(logos:aws-lambda)[MeshPoll] in meshPoller
+    service clientConfig(aws:res-aws-systems-manager-parameter-store)[Client Configuration] in meshPoller
     service mesh(server)[MESH]
 
     meshDownloaded:R -- L:meshPollLambda
-    meshPollLambda:T --> B:mesh
+    clientConfig:B --> T:meshPollLambda
+    meshPollLambda:B --> T:mesh
     meshPollLambda:R --> L:pdmSaved
 ```

docs/collections/_diagrams/c4code-core-notifier.md

@@ -6,8 +6,8 @@ title: c4code-mesh-statusreporter-generator
 
 ## Decisions
 
-1. ReportScheulder lambda publishes a `GenerateReport` event for each trust that has new report data in the previous 24 hours.
-2. The event metadata contains the trust ID so the ReportGenerator lambda knows which trust to generate a report for.
+1. ReportSchedulder lambda publishes a `GenerateReport` event for every known client
+2. The event data payload contains the `senderId` so the ReportGenerator lambda knows which trust to generate a report for.
 
 ```mermaid
 architecture-beta
@@ -16,7 +16,7 @@ architecture-beta
     service sqs(logos:aws-sqs)[ReportGenerator Queue] in reportGenerator
     service reportGeneratorLambda(logos:aws-lambda)[Report Generator] in reportGenerator
     service s3(logos:aws-s3)[Reports] in reportGenerator
-    service reportsdb(aws:arch-amazon-dynamodb)[Reports] in reportGenerator
+    service reportsdb(aws:arch-amazon-athena)[Reports] in reportGenerator
     service reportGeneratedEvent(aws:res-amazon-eventbridge-event)[ReportGenerated Event]
 
     generateReportEvent:R --> L:sqs