Skip to content

CCM-14974: Additional failure events in CSV reports#245

Merged
simonlabarere merged 28 commits intomainfrom
feature/CCM-14974-csv-reports-failure-events
Mar 31, 2026
Merged

CCM-14974: Additional failure events in CSV reports#245
simonlabarere merged 28 commits intomainfrom
feature/CCM-14974-csv-reports-failure-events

Conversation

@ScottFullerton-NHSE
Copy link
Copy Markdown
Contributor

@ScottFullerton-NHSE ScottFullerton-NHSE commented Mar 17, 2026

Description

Added 4 existing events to the failure report:

  • PDMResourceSubmissionRejected
  • PDMResourceRetriesExceeded
  • MessageRequestRejected
  • FileQuarantined

We also included the failure reasons and codes for these as part of the ticket. I spoke to Tom D and we agreed the best approach was to put the failure codes and reasons into a Glue Table and have the daily report query it against failure codes from the glue event record table to match a failure reason in the report.

I've also included a fix for the current trivy vulnerabilities - including pulling in one of dependabot's PRs.

Context

These events could lead to a failure, and we want to send comprehensive reports to trusts, so they understand why a request might have failed.

Type of changes

  • Refactoring (non-breaking change)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Bug fix (non-breaking change which fixes an issue)

Validation

CSV From the component tests:
https://820178564574-pu7sllom.eu-west-2.console.aws.amazon.com/s3/object/nhs-820178564574-eu-west-2-pr245-dl-reporting?region=eu-west-2&prefix=event-reports/report-generator-test-90436e79-3cf0-4d8e-a787-0adc86af73cf/completed_communications/completed_communications_2026-03-27.csv

completed_communications_2026-03-27.csv

Screenshot 2026-03-27 at 11 43 19

The core status reason should only be sent in the event that a failure reason isn't provided back from core (one should always be).

Checklist

  • I am familiar with the contributing guidelines
  • I have followed the code style of the project
  • I have added tests to cover my changes
  • I have updated the documentation accordingly
  • This PR is a result of pair or mob programming
  • If I have used the 'skip-trivy-package' label I have done so responsibly and in the knowledge that this is being fixed as part of a separate ticket/PR.

Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others privacy, we kindly ask you to NOT including PII (Personal Identifiable Information) / PID (Personal Identifiable Data) or any other sensitive data in this PR (Pull Request) and the codebase changes. We will remove any PR that do contain any sensitive information. We really appreciate your cooperation in this matter.

  • I confirm that neither PII/PID nor sensitive data are included in this PR and the codebase changes.

@ScottFullerton-NHSE ScottFullerton-NHSE requested review from a team as code owners March 17, 2026 10:37
@tdroza-nhs tdroza-nhs self-assigned this Mar 19, 2026
Copy link
Copy Markdown
Contributor

@simonlabarere simonlabarere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few comments, sorry!

Comment thread infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql Outdated
Comment thread infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql Outdated
Comment thread src/eventcatalog/package.json Outdated
Comment thread package.json Outdated
Comment thread .trivyignore Outdated
Comment thread .trivyignore Outdated
ScottFullerton-NHSE and others added 5 commits March 19, 2026 11:07
…-reports-failure-events

# Conflicts:
#	package-lock.json
#	src/eventcatalog/package-lock.json
#	src/eventcatalog/package.json
…tcatalog/h3-1.15.8' into feature/CCM-14974-csv-reports-failure-events
simonlabarere
simonlabarere previously approved these changes Mar 20, 2026
Copy link
Copy Markdown
Contributor

@tdroza-nhs tdroza-nhs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested changes have all been actioned.

@simonlabarere simonlabarere merged commit d97dccd into main Mar 31, 2026
34 checks passed
@simonlabarere simonlabarere deleted the feature/CCM-14974-csv-reports-failure-events branch March 31, 2026 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants