Updated sequence diagram for latest GuarDuty design

Author: tdroza-nhs

docs/collections/_diagrams/c4code-printer-scanner.md

@@ -8,25 +8,29 @@ title: c4code-printer-scanner
 architecture-beta
     group printScanner(cloud)[PrintScanner]
     service itemDequeued(aws:res-amazon-eventbridge-event)[ItemDequeued Event]
-    service analyseQueue(logos:aws-sqs)[Analyse Queue] in printScanner
-    service analyseLambda(logos:aws-lambda)[PrintScanner] in printScanner
+    service scannerQueue(logos:aws-sqs)[Scanner Queue] in printScanner
+    service scannerLambda(logos:aws-lambda)[PrintScanner] in printScanner
+    service moveLambda(logos:aws-lambda)[MoveLetters] in printScanner
     service docRefBucket(logos:aws-s3)[DocumentReference] in printScanner
-    service lettersBucket(logos:aws-s3)[DigitalLetters] in printScanner
+    service unscannedBucket(logos:aws-s3)[UnscannedLetters] in printScanner
     service quarantineBucket(logos:aws-s3)[QuarantinedLetters] in printScanner
     service safeBucket(logos:aws-s3)[SafeLetters] in printScanner
     service guardDuty(aws:arch-amazon-guardduty)[GuardDuty] in printScanner
+    service scanComplete(aws:res-amazon-eventbridge-event)[ScanResult Event]
     service safeLetter(aws:res-amazon-eventbridge-event)[PrintLetterSafe Event]
     service quarantinedLetter(aws:res-amazon-eventbridge-event)[PrintLetterQuarantined Event]
     junction j1 in printScanner
     junction j2 in printScanner
     junction j3 in printScanner
 
-    itemDequeued:R --> L:analyseQueue
-    docRefBucket:T --> B:analyseLambda
-    analyseQueue:R --> L:analyseLambda
-    analyseLambda:T --> B:lettersBucket
-    lettersBucket:R --> L:guardDuty
-    guardDuty:R -- L:j1
+    itemDequeued:R --> L:scannerQueue
+    docRefBucket:B --> T:scannerLambda
+    scannerQueue:R --> L:scannerLambda
+    scannerLambda:B --> T:unscannedBucket
+    unscannedBucket:R --> L:guardDuty
+    guardDuty:R --> L:scanComplete
+    scanComplete:R --> L:moveLambda
+    moveLambda:R -- L:j1
     j1:T -- B:j2
     j1:B -- T:j3
     j2:R --> L:quarantineBucket

docs/collections/_diagrams/sequence-print-metadata.md

@@ -6,30 +6,51 @@ title: sequence-expire-print-ttl
 
 ```mermaid
 sequenceDiagram
-  participant dl as Digital Letters
-  participant s3 as S3 Bucket
+  participant scannerlambda as Lambda<br/>PrintScanner
+  participant analyserLambda as Lambda<br/>PrintAnalyser
+  participant senderLambda as Lambda<br/>PrintSender
+  participant moveLambda as Lambda<br/>MoveLetters
+  participant unscannedS3 as S3<br/>UnscannedLetters
+  participant gd as GuardDuty
+  participant safeS3 as S3<br/>SafeLetters
+  participant quarantinedS3 as S3<br/>QuarantinedLetters
   participant eventBus as Event Bus
   participant printApi as Print API
 
-  eventBus ->> dl: ItemDequeued event
-  activate dl
-  dl ->> dl: Extract & Decode PDF
-        dl -) s3: Store PDF
-  deactivate dl
-  s3 -) s3: GuardDuty
-  s3 -) eventBus: ScanResult event
-  eventBus ->> dl: ScanResult event
-  activate dl
-  dl ->> s3: Get scanned PDF
-        activate s3
-                s3 -->> dl: PDF
-        deactivate s3
-  dl ->> dl: Count pages
-  dl ->> dl: SHA256
-  dl ->> eventBus: LetterAvailable event
-  deactivate dl
-  eventBus ->> dl: LetterAvailable event
-  activate dl
-  dl -) printApi: letter.PREPARED event
-  deactivate dl
+  eventBus ->> scannerlambda: ItemDequeued event
+  activate scannerlambda
+  scannerlambda ->> scannerlambda: Extract & Decode PDF
+        scannerlambda -) unscannedS3: Store PDF
+  deactivate scannerlambda
+  unscannedS3 -) gd: S3 new object event
+  activate gd
+      gd -) gd: Scan for threats
+      gd -) eventBus: ScanResult event
+  deactivate gd
+  eventBus -) moveLambda: ScanResult event
+  activate moveLambda
+    alt Move scanned letter
+      moveLambda ->> safeS3: Store safe PDF
+      moveLambda ->> eventBus: PrintLetterSafe event
+    else
+      moveLambda ->> quarantinedS3: Store quarantined PDF
+      moveLambda ->> eventBus: PrintLetterQuarantined event
+  end
+  moveLambda ->> unscannedS3: Delete unscanned PDF
+  deactivate moveLambda
+  eventBus -) analyserLambda: PrintLetterSafe event
+  activate analyserLambda
+  analyserLambda ->> safeS3: Get scanned PDF
+        activate safeS3
+                safeS3 -->> analyserLambda: PDF
+        deactivate safeS3
+  analyserLambda ->> analyserLambda: Count pages
+  analyserLambda ->> analyserLambda: SHA256
+  analyserLambda ->> eventBus: PrintLetterAnalysed event
+  deactivate analyserLambda
+  eventBus -) senderLambda: PrintLetterAnalysed event
+  activate senderLambda
+  senderLambda -) eventBus: letter.PREPARED event
+  deactivate senderLambda
+  eventBus -) printApi: letter.PREPARED event
 ```

src/cloudevents/domains/digital-letters/2025-10-draft/defs/core.schema.yaml

@@ -25,5 +25,4 @@ properties:
       "2025-10-01T10:15:30.000Z"
     ]
     type: "string"
-    format: "date-time"
     pattern: "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$"