diff --git a/infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql b/infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql index a7bf69641..d9ccb57de 100644 --- a/infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql +++ b/infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql @@ -25,7 +25,7 @@ WITH vars AS ( WHEN e.type LIKE '%.print.invalid.attachment.received.%' THEN 'Failed' WHEN e.letterstatus = 'RETURNED' THEN 'Returned' WHEN e.letterstatus = 'FAILED' THEN 'Failed' - WHEN e.letterstatus = 'DISPATCHED' THEN 'Dispatched' + WHEN e.letterstatus = 'DELIVERED' THEN 'Delivered' WHEN e.letterstatus = 'REJECTED' THEN 'Rejected' ELSE NULL END as status, e.reasoncode, @@ -55,7 +55,7 @@ WITH vars AS ( -- Print Priority Order WHEN te.status = 'Returned' THEN 4 WHEN te.communicationtype = 'Print' AND te.status = 'Failed' THEN 3 - WHEN te.status = 'Dispatched' THEN 2 + WHEN te.status = 'Delivered' THEN 2 WHEN te.status = 'Rejected' THEN 1 ELSE 0 END DESC ) AS "row_number", diff --git a/tests/playwright/digital-letters-component-tests/report-generator.component.spec.ts b/tests/playwright/digital-letters-component-tests/report-generator.component.spec.ts index fc49da72f..b58753e25 100644 --- a/tests/playwright/digital-letters-component-tests/report-generator.component.spec.ts +++ b/tests/playwright/digital-letters-component-tests/report-generator.component.spec.ts @@ -108,10 +108,10 @@ const scenarios = [ 'The letter was returned', ), new ReportScenario( - 'component-test-dispatched', + 'component-test-delivered', CommunicationType.Print, - [EventStatus.Dispatched], - 'Dispatched', + [EventStatus.Delivered], + 'Delivered', senderId, ), // Scenario for new Print failure event: FileQuarantined @@ -134,7 +134,7 @@ const scenarios = [ 'DL_CLIV_002', 'Invalid attachment received', ), - // multiple events for the same message reference, should take the one with highest priority status (returned > failed > dispatched > rejected) + // multiple events for the same message reference, should take the one with highest priority status (returned > failed > delivered > rejected) new ReportScenario( 'component-test-rejected-pending', CommunicationType.Print, @@ -145,27 +145,27 @@ const scenarios = [ 'The letter was rejected.', ), // pending is ignored. new ReportScenario( - 'component-test-rejected-dispatched', + 'component-test-rejected-delivered', CommunicationType.Print, - [EventStatus.Rejected, EventStatus.Dispatched], - 'Dispatched', + [EventStatus.Rejected, EventStatus.Delivered], + 'Delivered', senderId, ), new ReportScenario( - 'component-test-rejected-dispatched-failed', + 'component-test-rejected-delivered-failed', CommunicationType.Print, - [EventStatus.Rejected, EventStatus.Dispatched, EventStatus.Failed], + [EventStatus.Rejected, EventStatus.Delivered, EventStatus.Failed], 'Failed', senderId, 'API_CODE_002', 'Letter processing failed', ), new ReportScenario( - 'component-test-rejected-dispatched-failed-returned', + 'component-test-rejected-delivered-failed-returned', CommunicationType.Print, [ EventStatus.Rejected, - EventStatus.Dispatched, + EventStatus.Delivered, EventStatus.Failed, EventStatus.Returned, ], diff --git a/tests/playwright/helpers/report-helpers.ts b/tests/playwright/helpers/report-helpers.ts index b93dae11e..544eb1aa9 100644 --- a/tests/playwright/helpers/report-helpers.ts +++ b/tests/playwright/helpers/report-helpers.ts @@ -63,6 +63,7 @@ export enum EventStatus { Rejected = 'REJECTED', Printed = 'PRINTED', Dispatched = 'DISPATCHED', + Delivered = 'DELIVERED', Failed = 'FAILED', Returned = 'RETURNED', Pending = 'PENDING',