CCM-12875: add our messageReference to the x-request-id header

Author: Ian-Hodges

lambdas/pdm-uploader-lambda/src/__tests__/app/upload-to-pdm.test.ts

@@ -80,8 +80,7 @@ describe('UploadToPdm', () => {
       expect(getS3ObjectFromUri).toHaveBeenCalledWith('s3://bucket/key');
       expect(mockPdmClient.createDocumentReference).toHaveBeenCalledWith(
         mockFhirRequest,
-        expect.any(String),
-        'test-event-id',
+        'test-message-reference',
       );
       expect(result).toEqual({
         outcome: 'sent',
@@ -98,17 +97,6 @@ describe('UploadToPdm', () => {
       expect(mockLogger.error).not.toHaveBeenCalled();
     });
 
-    it('should generate unique requestId for each call', async () => {
-      (getS3ObjectFromUri as jest.Mock).mockResolvedValue(mockFhirRequest);
-      mockPdmClient.createDocumentReference.mockResolvedValue(mockPdmResponse);
-
-      await uploadToPdm.send(mockEvent);
-      await uploadToPdm.send(mockEvent);
-
-      const { calls } = mockPdmClient.createDocumentReference.mock;
-      expect(calls[0][1]).not.toEqual(calls[1][1]);
-    });
-
     it('should return failed outcome when getS3ObjectFromUri throws error', async () => {
       const error = new Error('S3 error');
       (getS3ObjectFromUri as jest.Mock).mockRejectedValue(error);

lambdas/pdm-uploader-lambda/src/__tests__/infra/pdm-api-client.test.ts

@@ -62,7 +62,6 @@ describe('PdmClient', () => {
       resourceType: 'DocumentReference',
     });
     const mockRequestId = 'req-123';
-    const mockCorrelationId = 'corr-456';
 
     it('should successfully create document reference', async () => {
       const mockResponse = { data: { id: 'doc-123' } };
@@ -89,7 +88,6 @@ describe('PdmClient', () => {
       expect(result).toEqual(mockResponse.data);
       expect(mockLogger.debug).toHaveBeenCalledWith({
         requestId: mockRequestId,
-        correlationId: mockCorrelationId,
         description: 'Sending request',
         attempt: 1,
       });
@@ -166,7 +164,6 @@ describe('PdmClient', () => {
       expect(mockLogger.error).toHaveBeenCalledWith({
         description: 'Failed sending PDM request',
         requestId: mockRequestId,
-        correlationId: mockCorrelationId,
         err: mockError,
       });
     });

lambdas/pdm-uploader-lambda/src/app/upload-to-pdm.ts

@@ -18,19 +18,17 @@ export class UploadToPdm {
   async send(event: MESHInboxMessageDownloaded): Promise<UploadToPdmResult> {
     try {
       const fhirRequest = await getS3ObjectFromUri(event.data.messageUri);
-      const requestId = crypto.randomUUID();
+      const messageReference = event.data.messageReference;
 
       const response = await this.pdmClient.createDocumentReference(
         fhirRequest,
-        requestId,
-        event.id,
+        messageReference,
       );
 
       this.logger.info({
         description: 'Successfully sent request to PDM',
         eventId: event.id,
-        messageReference: event.data.messageReference,
-        requestId,
+        messageReference,
         resourceId: response.id,
       });