CCM-13303: Address comments + update Generate Report schema

Author: simonlabarere

.trivyignore

@@ -2,4 +2,3 @@
 CVE-2024-49761 # https://avd.aquasec.com/nvd/cve-2024-49761 ## latest Jekyll Webpack (0.2.7) installs old version of rexml
 CVE-2024-47220 # https://avd.aquasec.com/nvd/cve-2024-47220 ## latest lint_roller (1.1.0) installs old version of rexml
 CVE-2024-7254 # https://avd.aquasec.com/nvd/cve-2024-7254 ## latest Jekyll Webpack (0.2.7) installs old version of google-protobuf
-CVE-2026-25128

lambdas/report-scheduler/package.json

@@ -1,19 +1,12 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "sender-management": "^0.0.1",
     "utils": "^0.0.1"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.2",
-    "@types/aws-lambda": "^8.10.155",
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.20",
-    "aws-sdk-client-mock": "^4.1.0",
-    "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^29.7.0",
-    "jest-mock-extended": "^3.0.7",
     "typescript": "^5.9.3"
   },
   "name": "nhs-notify-digital-letters-report-scheduler-lambda",

lambdas/report-scheduler/src/__tests__/apis/scheduled-event-handler.test.ts

@@ -1,22 +1,14 @@
-import { EventPublisher, Logger, Sender } from 'utils';
+import { EventPublisher, Sender } from 'utils';
 import { ISenderManagement } from 'sender-management';
 import { GenerateReport } from 'digital-letters-events';
 import { createHandler } from 'apis/scheduled-event-handler';
 import GenerateReportValidator from 'digital-letters-events/GenerateReport.js';
 
 describe('scheduled-event-handler', () => {
-  let mockLogger: jest.Mocked<Logger>;
   let mockSenderManagement: jest.Mocked<ISenderManagement>;
   let mockEventPublisher: jest.Mocked<EventPublisher>;
 
   beforeEach(() => {
-    mockLogger = {
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    } as unknown as jest.Mocked<Logger>;
-
     mockSenderManagement = {
       listSenders: jest.fn(),
     } as unknown as jest.Mocked<ISenderManagement>;
@@ -33,34 +25,11 @@ describe('scheduled-event-handler', () => {
   });
 
   describe('createHandler', () => {
-    it('should calculate yesterday date range correctly', async () => {
-      const mockDate = new Date('2024-01-15T12:00:00.000Z');
-      jest.setSystemTime(mockDate);
-
-      mockSenderManagement.listSenders.mockResolvedValue([]);
-      mockEventPublisher.sendEvents.mockResolvedValue([]);
-
-      const handler = createHandler({
-        logger: mockLogger,
-        senderManagement: mockSenderManagement,
-        eventPublisher: mockEventPublisher,
-      });
-
-      await handler();
-
-      expect(mockLogger.debug).toHaveBeenCalledWith({
-        description: 'Calculated yesterday date range',
-        yesterdayStart: '2024-01-14T00:00:00.000Z',
-        yesterdayEnd: '2024-01-14T23:59:59.999Z',
-      });
-    });
-
     it('should retrieve senders from sender management', async () => {
       mockSenderManagement.listSenders.mockResolvedValue([]);
       mockEventPublisher.sendEvents.mockResolvedValue([]);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -84,7 +53,6 @@ describe('scheduled-event-handler', () => {
       mockEventPublisher.sendEvents.mockResolvedValue([]);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -110,7 +78,6 @@ describe('scheduled-event-handler', () => {
       mockEventPublisher.sendEvents.mockResolvedValue([]);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -121,8 +88,7 @@ describe('scheduled-event-handler', () => {
       const event = events[0] as GenerateReport;
 
       expect(event.data.senderId).toBe('test-sender-123');
-      expect(event.data.reportPeriodStartTime).toBe('2024-01-14T00:00:00.000Z');
-      expect(event.data.reportPeriodEndTime).toBe('2024-01-14T23:59:59.999Z');
+      expect(event.data.reportDate).toBe('2024-01-14');
       expect(event.specversion).toBe('1.0');
       expect(event.id).toBeDefined();
       expect(event.source).toBe(
@@ -145,7 +111,6 @@ describe('scheduled-event-handler', () => {
       mockEventPublisher.sendEvents.mockResolvedValue([]);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -161,7 +126,6 @@ describe('scheduled-event-handler', () => {
       mockSenderManagement.listSenders.mockRejectedValue(error);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -178,7 +142,6 @@ describe('scheduled-event-handler', () => {
       mockEventPublisher.sendEvents.mockRejectedValue(error);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });
@@ -196,7 +159,6 @@ describe('scheduled-event-handler', () => {
       mockEventPublisher.sendEvents.mockResolvedValue([]);
 
       const handler = createHandler({
-        logger: mockLogger,
         senderManagement: mockSenderManagement,
         eventPublisher: mockEventPublisher,
       });

lambdas/report-scheduler/src/apis/scheduled-event-handler.ts

@@ -1,45 +1,30 @@
-import { EventPublisher, Logger } from 'utils';
+import { EventPublisher } from 'utils';
 import { ISenderManagement } from 'sender-management';
 import { GenerateReport } from 'digital-letters-events';
 import GenerateReportValidator from 'digital-letters-events/GenerateReport.js';
 import { randomUUID } from 'node:crypto';
 
 export type CreateHandlerDependencies = {
-  logger: Logger;
   senderManagement: ISenderManagement;
   eventPublisher: EventPublisher;
 };
 
 export const createHandler = ({
   eventPublisher,
-  logger,
   senderManagement,
 }: CreateHandlerDependencies) => {
-  function yesterdayDateRange() {
-    const yesterday = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    const yesterdayStart = new Date(yesterday.setUTCHours(0, 0, 0, 0));
-    const yesterdayEnd = new Date(yesterday.setUTCHours(23, 59, 59, 999));
-
-    logger.debug({
-      description: 'Calculated yesterday date range',
-      yesterdayStart: yesterdayStart.toISOString(),
-      yesterdayEnd: yesterdayEnd.toISOString(),
-    });
-
-    return { yesterdayStart, yesterdayEnd };
-  }
-
   return async () => {
-    const { yesterdayEnd, yesterdayStart } = yesterdayDateRange();
+    const yesterday = new Date();
+    yesterday.setDate(yesterday.getDate() - 1);
+    const yesterdayString = yesterday.toISOString().split('T')[0];
 
     const senders = await senderManagement.listSenders();
 
     await eventPublisher.sendEvents<GenerateReport>(
       senders.map((sender) => ({
         data: {
           senderId: sender.senderId,
-          reportPeriodStartTime: yesterdayStart.toISOString(),
-          reportPeriodEndTime: yesterdayEnd.toISOString(),
+          reportDate: yesterdayString,
         },
         specversion: '1.0',
         id: randomUUID(),

lambdas/report-scheduler/src/container.ts

@@ -25,7 +25,7 @@ export const createContainer = (): CreateHandlerDependencies => {
     eventBridgeClient,
   });
 
-  return { logger, senderManagement, eventPublisher };
+  return { senderManagement, eventPublisher };
 };
 
 export default createContainer;

package-lock.json

@@ -3,6 +3,7 @@ import {
   EVENT_BUS_LOG_GROUP_NAME,
   REPORT_SCHEDULER_LAMBDA_NAME,
 } from 'constants/backend-constants';
+import { SENDER_ID_SKIPS_NOTIFY, SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX, SENDER_ID_VALID_FOR_NOTIFY_SANDBOX } from 'constants/tests-constants';
 import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
 import expectToPassEventually from 'helpers/expectations';
 import { invokeLambda } from 'helpers/lambda-helpers';
@@ -48,9 +49,9 @@ test.describe('Digital Letters - Report Scheduler', () => {
       }
 
       const senderIds = parsedEvents.map((event) => event.data.senderId);
-      expect(senderIds).toContain('2b8ebb33-8b33-49bd-949e-c12e22d25320');
-      expect(senderIds).toContain('f017669b-6da4-4576-9d59-3d2b7f005ae2');
-      expect(senderIds).toContain('67403568-166e-41d0-900a-1f31fe93a091');
+      expect(senderIds).toContain(SENDER_ID_VALID_FOR_NOTIFY_SANDBOX);
+      expect(senderIds).toContain(SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX);
+      expect(senderIds).toContain(SENDER_ID_SKIPS_NOTIFY);
     }, 120);
   });
 });