Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScottFullerton-NHSE wants to merge 13 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
01c3bfe
CCM-14974: Added 4 new events to the failure report
ScottFullerton-NHSE Mar 17, 2026
eaf48ac
CCM-14974: Trivy fix
ScottFullerton-NHSE Mar 17, 2026
52f3773
CCM-14974: Trivy fix
ScottFullerton-NHSE Mar 17, 2026
27f1f1c
CCM-14974: Fix non-null status
ScottFullerton-NHSE Mar 17, 2026
6b6e4a7
CCM-14974: Update sql
ScottFullerton-NHSE Mar 18, 2026
bf50c4d
CCM-14974: Trivy ignore
ScottFullerton-NHSE Mar 18, 2026
d27e0b9
CCM-14974: Update test to remove pdm check
ScottFullerton-NHSE Mar 18, 2026
7b0d390
Bump h3 from 1.15.5 to 1.15.8 in /src/eventcatalog
dependabot[bot] Mar 18, 2026
1936436
CCM-14974: Update package lock
ScottFullerton-NHSE Mar 19, 2026
6c8d3cc
Merge remote-tracking branch 'origin/main' into feature/CCM-14974-csv…
ScottFullerton-NHSE Mar 19, 2026
53cb1b9
CCM-14961: Fix trivy vulnerabilities
simonlabarere Mar 18, 2026
7bac1fb
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/src/even…
ScottFullerton-NHSE Mar 19, 2026
ffbc2ee
CCM-14974: Readd test and change it to message skipped
ScottFullerton-NHSE Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql
View file
Open in desktop
Copy link
Contributor

@tdroza-nhs tdroza-nhs Mar 19, 2026

Choose a reason for hiding this comment

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

I was expecting to see a failureCode/message being set for these new statuses. e.g. for the FileQuarantined event we'd have a failurecode/message that says something about a virus being detected.

I don't see that in the story though - would be good to clarify that with TomH to see if it's covered by another story or should be in this one

Copy link
Contributor Author

@ScottFullerton-NHSE ScottFullerton-NHSE Mar 20, 2026

Choose a reason for hiding this comment

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

Will catch up on Monday with Tom H to discuss this. We're happy for the ticket to progress in the time being until then.

Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ WITH vars AS (
e.time,
CASE
WHEN e.type LIKE '%.item.dequeued.%'
OR e.type LIKE '%.queue.digital.letter.read.%' THEN 'Digital'
WHEN e.type LIKE '%.print.letter.transitioned.%' THEN 'Print' ELSE NULL
OR e.type LIKE '%.queue.digital.letter.read.%'
OR e.type LIKE '%.pdm.resource.submission.rejected.%'
OR e.type LIKE '%.pdm.resource.retries.exceeded.%'
OR e.type LIKE '%.messages.request.rejected.%' THEN 'Digital'
WHEN e.type LIKE '%.print.letter.transitioned.%'
OR e.type LIKE '%.print.file.quarantined.%' THEN 'Print' ELSE NULL
END as communicationtype,
CASE
WHEN e.type LIKE '%.item.dequeued.%' THEN 'Unread'
WHEN e.type LIKE '%.queue.digital.letter.read.%' THEN 'Read'
WHEN e.type LIKE '%.pdm.resource.submission.rejected.%' THEN 'Failed'
WHEN e.type LIKE '%.pdm.resource.retries.exceeded.%' THEN 'Failed'
WHEN e.type LIKE '%.messages.request.rejected.%' THEN 'Failed'
WHEN e.type LIKE '%.print.file.quarantined.%' THEN 'Failed'
WHEN e.letterstatus = 'RETURNED' THEN 'Returned'
WHEN e.letterstatus = 'FAILED' THEN 'Failed'
WHEN e.letterstatus = 'DISPATCHED' THEN 'Dispatched'
Expand All @@ -31,11 +39,12 @@ WITH vars AS (
ORDER BY te.time DESC,
CASE
-- Digital Priority Order
WHEN te.communicationtype = 'Digital' AND te.status = 'Failed' THEN 3
WHEN te.status = 'Read' THEN 2
WHEN te.status = 'Unread' THEN 1
-- Print Priority Order
WHEN te.status = 'Returned' THEN 4
WHEN te.status = 'Failed' THEN 3
WHEN te.communicationtype = 'Print' AND te.status = 'Failed' THEN 3
WHEN te.status = 'Dispatched' THEN 2
WHEN te.status = 'Rejected' THEN 1 ELSE 0
END DESC
Expand All @@ -45,7 +54,8 @@ WITH vars AS (
te.communicationtype,
te.status
FROM "translated_events" AS te
where te.status IS NOT NULL
WHERE te.status IS NOT NULL
AND te.communicationtype IS NOT NULL
)
SELECT oe.messagereference as "Message Reference",
oe.time as "Time",
Expand Down
41 changes: 30 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading