CCM-15676: rename delete to markWithdrawn

Author: Ian-Hodges

lambdas/nhsapp-status-handler/src/__tests__/apis/sqs-trigger-lambda.test.ts

@@ -43,14 +43,14 @@ describe('createHandler', () => {
   };
 
   beforeEach(() => {
-    ttlActions = { delete: jest.fn() };
+    ttlActions = { markWithdrawn: jest.fn() };
     eventPublisher = { sendEvents: jest.fn().mockResolvedValue([]) };
     logger = { error: jest.fn(), info: jest.fn(), warn: jest.fn() };
     handler = createHandler({ ttlActions, eventPublisher, logger });
   });
 
   it('processes a valid SQS event and returns success', async () => {
-    ttlActions.delete.mockResolvedValue({
+    ttlActions.markWithdrawn.mockResolvedValue({
       result: 'success',
       ttlItem: { event: messageDownloadedEvent },
     });
@@ -61,7 +61,7 @@ describe('createHandler', () => {
     const res = await handler(event);
 
     expect(res.batchItemFailures).toEqual([]);
-    expect(ttlActions.delete).toHaveBeenCalledWith(nhsAppStatusEvent);
+    expect(ttlActions.markWithdrawn).toHaveBeenCalledWith(nhsAppStatusEvent);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
       [digitalLetterReadEvent],
       validateDigitalLetterRead,
@@ -131,14 +131,16 @@ describe('createHandler', () => {
     });
   });
 
-  it('handles ttlActions.delete failure', async () => {
-    ttlActions.delete.mockResolvedValue({ result: 'failed' });
+  it('handles ttlActions.markWithdrawn failure', async () => {
+    ttlActions.markWithdrawn.mockResolvedValue({ result: 'failed' });
     const event: SQSEvent = {
       Records: [{ body: JSON.stringify(eventBusEvent), messageId: 'msg1' }],
     } as any;
 
     const res = await handler(event);
 
+    expect(ttlActions.markWithdrawn).toHaveBeenCalledWith(nhsAppStatusEvent);
+    expect(eventPublisher.sendEvents).not.toHaveBeenCalled();
     expect(res.batchItemFailures).toEqual([{ itemIdentifier: 'msg1' }]);
     expect(logger.info).toHaveBeenCalledWith({
       description: 'Processed SQS Event.',
@@ -202,7 +204,7 @@ describe('createHandler', () => {
   });
 
   it('processes multiple successful events and sends them as a batch', async () => {
-    ttlActions.delete.mockResolvedValue({
+    ttlActions.markWithdrawn.mockResolvedValue({
       result: 'success',
       ttlItem: { event: messageDownloadedEvent },
     });
@@ -217,7 +219,7 @@ describe('createHandler', () => {
     const res = await handler(sqsEvent);
 
     expect(res.batchItemFailures).toEqual([]);
-    expect(ttlActions.delete).toHaveBeenCalledTimes(3);
+    expect(ttlActions.markWithdrawn).toHaveBeenCalledTimes(3);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
       [digitalLetterReadEvent, digitalLetterReadEvent, digitalLetterReadEvent],
       validateDigitalLetterRead,
@@ -231,7 +233,7 @@ describe('createHandler', () => {
   });
 
   it('handles partial event publishing failures and logs warning', async () => {
-    ttlActions.delete.mockResolvedValue({
+    ttlActions.markWithdrawn.mockResolvedValue({
       result: 'success',
       ttlItem: { event: messageDownloadedEvent },
     });
@@ -260,7 +262,7 @@ describe('createHandler', () => {
   });
 
   it('handles event publishing exception and logs warning', async () => {
-    ttlActions.delete.mockResolvedValue({
+    ttlActions.markWithdrawn.mockResolvedValue({
       result: 'success',
       ttlItem: { event: messageDownloadedEvent },
     });
@@ -286,7 +288,7 @@ describe('createHandler', () => {
   });
 
   it('does not call eventPublisher when no successful events', async () => {
-    ttlActions.delete.mockResolvedValue({ result: 'failed' });
+    ttlActions.markWithdrawn.mockResolvedValue({ result: 'failed' });
 
     const event: SQSEvent = {
       Records: [{ body: JSON.stringify(eventBusEvent), messageId: 'msg1' }],
@@ -305,7 +307,7 @@ describe('createHandler', () => {
   });
 
   it('does not call eventPublisher when no TTL record is found', async () => {
-    ttlActions.delete.mockResolvedValue({ result: 'success' });
+    ttlActions.markWithdrawn.mockResolvedValue({ result: 'success' });
 
     const event: SQSEvent = {
       Records: [{ body: JSON.stringify(eventBusEvent), messageId: 'msg1' }],
@@ -324,7 +326,7 @@ describe('createHandler', () => {
   });
 
   it('handles mixed success and failure scenarios', async () => {
-    ttlActions.delete
+    ttlActions.markWithdrawn
       .mockResolvedValueOnce({
         result: 'success',
         ttlItem: { event: messageDownloadedEvent },

lambdas/nhsapp-status-handler/src/__tests__/app/ttl-actions.test.ts

@@ -16,7 +16,7 @@ describe('TtlActions', () => {
   it('returns success when markWithdrawn succeeds', async () => {
     repo.markWithdrawn.mockResolvedValue({ event: messageDownloadedEvent });
 
-    const result = await ttlActions.delete(nhsAppStatusEvent);
+    const result = await ttlActions.markWithdrawn(nhsAppStatusEvent);
 
     expect(result).toEqual({
       result: 'success',
@@ -31,7 +31,7 @@ describe('TtlActions', () => {
     // eslint-disable-next-line unicorn/no-useless-undefined
     repo.markWithdrawn.mockResolvedValue(undefined);
 
-    const result = await ttlActions.delete(nhsAppStatusEvent);
+    const result = await ttlActions.markWithdrawn(nhsAppStatusEvent);
 
     expect(result).toEqual({ result: 'success' });
 
@@ -50,7 +50,7 @@ describe('TtlActions', () => {
     const error = new Error('fail');
     repo.markWithdrawn.mockRejectedValue(error);
 
-    const result = await ttlActions.delete(nhsAppStatusEvent);
+    const result = await ttlActions.markWithdrawn(nhsAppStatusEvent);
 
     expect(result).toEqual({ result: 'failed' });
     expect(logger.warn).toHaveBeenCalledWith(

lambdas/nhsapp-status-handler/src/apis/sqs-trigger-lambda.ts

@@ -55,7 +55,7 @@ export const createHandler = ({
             return { outcome: { result: 'failed' } };
           }
 
-          const result = await ttlActions.delete(item);
+          const result = await ttlActions.markWithdrawn(item);
 
           if (result.result === 'failed') {
             batchItemFailures.push({ itemIdentifier: messageId });

lambdas/nhsapp-status-handler/src/app/ttl-actions.ts

@@ -15,7 +15,7 @@ export class TtlActions {
     private readonly logger: Logger,
   ) {}
 
-  async delete(item: NhsAppStatus): Promise<TtlActionOutcome> {
+  async markWithdrawn(item: NhsAppStatus): Promise<TtlActionOutcome> {
     let ttlItem: TtlItem;
 
     try {