CCM-12613: Upload to PDM component

Author: simonlabarere

lambdas/upload-to-pdm-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts

@@ -79,7 +79,10 @@ describe('sqs-trigger-lambda', () => {
 
   describe('successful processing', () => {
     it('should process single message successfully', async () => {
-      mockUploadToPdm.send.mockResolvedValue({ outcome: 'sent' });
+      mockUploadToPdm.send.mockResolvedValue({
+        outcome: 'sent',
+        resourceId: 'resource-123',
+      });
       const handler = createHandler({
         uploadToPdm: mockUploadToPdm,
         eventPublisher: mockEventPublisher,
@@ -218,7 +221,10 @@ describe('sqs-trigger-lambda', () => {
 
   describe('event publishing', () => {
     it('should handle partial event publishing failure for successful events', async () => {
-      mockUploadToPdm.send.mockResolvedValue({ outcome: 'sent' });
+      mockUploadToPdm.send.mockResolvedValue({
+        outcome: 'sent',
+        resourceId: 'resource-123',
+      });
       mockEventPublisher.sendEvents.mockResolvedValue([
         { itemIdentifier: 'failed-event' },
       ] as any);
@@ -241,7 +247,10 @@ describe('sqs-trigger-lambda', () => {
     });
 
     it('should handle event publishing exception for successful events', async () => {
-      mockUploadToPdm.send.mockResolvedValue({ outcome: 'sent' });
+      mockUploadToPdm.send.mockResolvedValue({
+        outcome: 'sent',
+        resourceId: 'resource-123',
+      });
       mockEventPublisher.sendEvents.mockRejectedValue(
         new Error('EventBridge error'),
       );
@@ -313,7 +322,7 @@ describe('sqs-trigger-lambda', () => {
   describe('mixed outcomes', () => {
     it('should handle mix of successful and failed uploads', async () => {
       mockUploadToPdm.send
-        .mockResolvedValueOnce({ outcome: 'sent' })
+        .mockResolvedValueOnce({ outcome: 'sent', resourceId: 'resource-123' })
         .mockResolvedValueOnce({ outcome: 'failed' });
       const handler = createHandler({
         uploadToPdm: mockUploadToPdm,

lambdas/upload-to-pdm-lambda/src/apis/sqs-trigger-lambda.ts

@@ -9,11 +9,17 @@ import type {
   UploadToPdmOutcome,
   UploadToPdmResult,
 } from 'app/upload-to-pdm';
-import { $TtlItemBusEvent, EventPublisher, Logger, TtlItemEvent } from 'utils';
+import {
+  $TtlItemBusEvent,
+  EventPublisher,
+  Logger,
+  PdmResourceRejectedEvent,
+  PdmResourceSubmittedEvent,
+} from 'utils';
 
 interface ProcessingResult {
   result: UploadToPdmResult;
-  item?: TtlItemEvent;
+  item?: PdmResourceSubmittedEvent | PdmResourceRejectedEvent;
 }
 
 interface CreateHandlerDependencies {
@@ -64,8 +70,8 @@ async function processRecord(
 
 function categorizeResults(
   results: PromiseSettledResult<ProcessingResult>[],
-  successfulEvents: TtlItemEvent[],
-  failedEvents: TtlItemEvent[],
+  successfulEvents: PdmResourceSubmittedEvent[],
+  failedEvents: PdmResourceRejectedEvent[],
   logger: Logger,
 ): Record<UploadToPdmOutcome | 'retrieved', number> {
   const processed: Record<UploadToPdmOutcome | 'retrieved', number> = {
@@ -80,10 +86,26 @@ function categorizeResults(
       processed[itemResult.outcome] += 1;
 
       if (item) {
-        if (itemResult.outcome === 'sent') {
-          successfulEvents.push(item);
+        if (itemResult.outcome === 'sent' && itemResult.resourceId) {
+          successfulEvents.push({
+            ...item,
+            data: {
+              'digital-letter-id': item.data['digital-letter-id'],
+              messageReference: item.data.messageReference,
+              senderId: item.data.senderId,
+              resourceId: itemResult.resourceId,
+              retryCount: 0,
+            },
+          });
         } else {
-          failedEvents.push(item);
+          failedEvents.push({
+            ...item,
+            data: {
+              'digital-letter-id': item.data['digital-letter-id'],
+              messageReference: item.data.messageReference,
+              senderId: item.data.senderId,
+            },
+          });
         }
       }
     } else {
@@ -96,7 +118,7 @@ function categorizeResults(
 }
 
 async function publishSuccessfulEvents(
-  successfulEvents: TtlItemEvent[],
+  successfulEvents: PdmResourceSubmittedEvent[],
   eventPublisher: EventPublisher,
   logger: Logger,
 ): Promise<void> {
@@ -129,7 +151,7 @@ async function publishSuccessfulEvents(
 }
 
 async function publishFailedEvents(
-  failedEvents: TtlItemEvent[],
+  failedEvents: PdmResourceRejectedEvent[],
   eventPublisher: EventPublisher,
   logger: Logger,
 ): Promise<void> {
@@ -168,8 +190,8 @@ export const createHandler = ({
 }: CreateHandlerDependencies) =>
   async function handler(sqsEvent: SQSEvent): Promise<SQSBatchResponse> {
     const batchItemFailures: SQSBatchItemFailure[] = [];
-    const successfulEvents: TtlItemEvent[] = [];
-    const failedEvents: TtlItemEvent[] = [];
+    const successfulEvents: PdmResourceSubmittedEvent[] = [];
+    const failedEvents: PdmResourceRejectedEvent[] = [];
 
     const promises = sqsEvent.Records.map((record) =>
       processRecord(record, uploadToPdm, logger, batchItemFailures),

utils/utils/src/types/ttl-item-event.ts

@@ -22,3 +22,20 @@ export type TtlItemBusEvent = z.infer<typeof $TtlItemBusEvent>;
 export const validateTtlItemEvent = (data: unknown) => {
   return $TtlItemEvent.safeParse(data);
 };
+
+export const $PdmResourceSubmittedData = $CloudEventData.extend({
+  resourceId: z.string(),
+  retryCount: z.number(),
+});
+
+export const $PdmResourceSubmittedEvent = $CloudEvent.extend({
+  data: $PdmResourceSubmittedData,
+});
+
+export type PdmResourceSubmittedEvent = z.infer<typeof $PdmResourceSubmittedEvent>;
+
+export const $PdmResourceRejectedEvent = $CloudEvent.extend({
+  data: $CloudEventData,
+});
+
+export type PdmResourceRejectedEvent = z.infer<typeof $PdmResourceRejectedEvent>;