CCM-12045: cleanup

Author: alexnuttall

lambdas/event-publisher/src/__tests__/domain/event-builder.test.ts

@@ -296,70 +296,27 @@ test('builds template drafted event', () => {
   );
 });
 
-test('builds template drafted event when no old image is available', () => {
-  const event = eventBuilder.buildEvent({
+test('builds event when no old image is available', () => {
+  // although not required by this lambda, an old image would be expected here in real usage
+  const mockEvent = publishableEventRecord('SUBMITTED');
+
+  const noOldImage = {
+    ...mockEvent,
     dynamodb: {
-      SequenceNumber: '4',
-      NewImage: {
-        owner: {
-          S: 'owner',
-        },
-        id: {
-          S: 'id',
-        },
-        clientId: {
-          S: 'client-id',
-        },
-        createdAt: {
-          S: 'created-at',
-        },
-        createdBy: {
-          S: 'created-by',
-        },
-        name: {
-          S: 'name',
-        },
-        templateStatus: {
-          S: 'NOT_YET_SUBMITTED',
-        },
-        updatedAt: {
-          S: 'updated-at',
-        },
-        updatedBy: {
-          S: 'updated-by',
-        },
-        templateType: {
-          S: 'NHS_APP',
-        },
-        message: {
-          S: 'app content',
-        },
-      },
+      SequenceNumber: mockEvent.dynamodb.SequenceNumber,
+      NewImage: mockEvent.dynamodb.NewImage,
     },
-    eventID: 'event-id',
-    tableName: 'table-name',
-  });
+  };
 
-  expect(event).toEqual({
-    ...expectedEvent(
-      'PROOF_AVAILABLE',
-      'uk.nhs.notify.template-management.TemplateDrafted.v1',
-      'https://notify.nhs.uk/events/schemas/TemplateDrafted/v1.json'
-    ),
-    data: {
-      clientId: 'client-id',
-      createdAt: 'created-at',
-      createdBy: 'created-by',
-      id: 'id',
-      message: 'app content',
-      name: 'name',
-      owner: 'owner',
-      templateStatus: 'NOT_YET_SUBMITTED',
-      templateType: 'NHS_APP',
-      updatedAt: 'updated-at',
-      updatedBy: 'updated-by',
-    },
-  });
+  const event = eventBuilder.buildEvent(noOldImage);
+
+  expect(event).toEqual(
+    expectedEvent(
+      'SUBMITTED',
+      'uk.nhs.notify.template-management.TemplateCompleted.v1',
+      'https://notify.nhs.uk/events/schemas/TemplateCompleted/v1.json'
+    )
+  );
 });
 
 test('builds template deleted event', () => {

lambdas/event-publisher/src/__tests__/domain/should-publish.test.ts

@@ -44,21 +44,23 @@ describe('shouldPublish', () => {
     }
   );
 
-  const letterPublishCases: Record<TemplateStatus, boolean> = {
+  type LetterStatus = Exclude<TemplateStatus, 'NOT_YET_SUBMITTED'>;
+
+  const letterPublishCases: Record<LetterStatus, boolean> = {
     DELETED: true,
     PENDING_PROOF_REQUEST: true,
     PROOF_AVAILABLE: true,
     SUBMITTED: true,
     WAITING_FOR_PROOF: true,
-    NOT_YET_SUBMITTED: false,
     PENDING_UPLOAD: false,
     PENDING_VALIDATION: false,
     VALIDATION_FAILED: false,
     VIRUS_SCAN_FAILED: false,
   };
 
+  // not all of these transitions are expected in real usage
   test.each(Object.entries(letterPublishCases) as [TemplateStatus, boolean][])(
-    'templateType LETTER with current status %p should return %p when proofingEnabled is true and status of previous is PENDING_PROOF_REQUEST',
+    'templateType LETTER with current status %p should return %p when proofingEnabled is true and status of previous is not restrictive',
     (templateStatus, publishable) => {
       const publish = shouldPublish(
         {
@@ -79,8 +81,9 @@ describe('shouldPublish', () => {
     }
   );
 
+  // not all of these transitions are expected in real usage
   test.each(Object.entries(letterPublishCases) as [TemplateStatus, boolean][])(
-    'templateType LETTER with current status DELETED and previous status %p should return %p when proofingEnabled is true',
+    'templateType LETTER with new status DELETED and previous status %p should return %p when proofingEnabled is true',
     (templateStatus, publishable) => {
       const publish = shouldPublish(
         {

lambdas/event-publisher/src/domain/should-publish.ts

@@ -12,18 +12,16 @@ function shouldPublishLetter(
   previous: DynamoDBTemplate | undefined,
   current: DynamoDBTemplate
 ): boolean {
+  if (!current.proofingEnabled) return false;
+
   if (current.templateStatus === 'DELETED') {
     return (
       previous !== undefined &&
-      publishableLetterStatuses.has(previous.templateStatus) &&
-      !!current.proofingEnabled
+      publishableLetterStatuses.has(previous.templateStatus)
     );
   }
 
-  return (
-    publishableLetterStatuses.has(current.templateStatus) &&
-    !!current.proofingEnabled
-  );
+  return publishableLetterStatuses.has(current.templateStatus);
 }
 
 export function shouldPublish(