CCM-14974: Additional failure events in CSV reports

infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql

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