Merge branch 'wip.email-multi-event' into refactor.date-fns

services/API-service/README.md

@@ -177,3 +177,7 @@ For the rest, follow the same instructions as above to receive initial and follo
    - Endpoint URL: `https://ibf.510.global/api/point-data/community-notification/${countryCodeISO3}`
    - To test this locally you can replace `ibf.510.global` by a local ngrok address
    - To demo on other environments, replace by respective environment-url, e.g. `ibf-test.510.global`
+
+## API tests
+
+1. Run them by `docker exec ibf-api-service npm run test:api:all`

services/API-service/jest.api.config.js

@@ -0,0 +1,16 @@
+/**
+ * @type {import('@jest/types').Config.InitialOptions}
+ */
+module.exports = {
+  moduleFileExtensions: ['js', 'ts'],
+  transform: {
+    '^.+\\.ts?$': ['ts-jest', { tsconfig: '<rootDir>/test/tsconfig.json' }],
+  },
+  rootDir: '.',
+  testMatch: ['<rootDir>/test/**/*.test.ts'],
+  coverageReporters: ['json', 'lcov'],
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  testTimeout: 30_000,
+  verbose: true,
+  reporters: ['default'],
+};

services/API-service/migration/1710512991479-rename-mock-rasters.ts

@@ -14,8 +14,6 @@ export class RenameMockRasters1710512991479 implements MigrationInterface {
 
     if (fs.existsSync(directoryPath)) {
       const files = fs.readdirSync(directoryPath);
-      console.log('🚀 ~ RenameMockRasters1710512991479 ~ up ~ files:', files);
-
       files.forEach((file) => {
         if (!file.includes('hour_MWI')) {
           const newFilename = file.replace(

services/API-service/package.json

@@ -16,6 +16,8 @@
     "test": "jest --config=jest.json --detectOpenHandles --forceExit --passWithNoTests",
     "test:dev": "npm test -- --watchAll",
     "test:coverage": "npm test -- --coverage --coverageDirectory=coverage",
+    "test:api:all": "node --expose-gc node_modules/.bin/jest --config=jest.api.config.js --runInBand --detectOpenHandles --logHeapUsage",
+    "test:api:watch": "npm run test:api:all -- --watchAll",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
     "migration:generate": "npm run typeorm migration:generate -- -d ./appdatasource.ts",
     "migration:run": "npm run typeorm migration:run -- -d ./appdatasource.ts",

services/API-service/src/api/notification/dto/notification-api-test-response.dto.ts

@@ -0,0 +1,9 @@
+export class NotificationApiTestResponseDto {
+  activeEvents: NotificationApiTestResponseChannelDto;
+  finishedEvents: NotificationApiTestResponseChannelDto;
+}
+
+export class NotificationApiTestResponseChannelDto {
+  email: string;
+  whatsapp: string;
+}

services/API-service/src/api/notification/dto/notification-date-per-event.dto.ts

@@ -5,10 +5,29 @@ export class NotificationDataPerEventDto {
   triggerStatusLabel: TriggerStatusLabelEnum;
   eventName: string;
   disasterSpecificCopy: DisasterSpecificCopy;
+
+  /**
+   * The day that the event starts.
+   */
   firstLeadTime: LeadTime;
+
+  /**
+   * The day that the event triggers. This could be different from firstLeadTimeString.
+   * For example, a flood could transition from a warning (a chance of a small flood)
+   * to an EAP trigger (a larger chance of a bigger flood).
+   */
+  firstTriggerLeadTime: LeadTime;
+
+  firstLeadTimeString: string;
+  firstTriggerLeadTimeString: string;
+
   triggeredAreas: TriggeredArea[];
+
+  /**
+   * The number of areas where the event triggers.
+   */
   nrOfTriggeredAreas: number;
-  startDateDisasterString: string;
+
   totalAffectedOfIndicator: number;
   mapImage?: Buffer;
   issuedDate: Date;