Merge pull request #1595 from rodekruis/fix.mock-from-frontend

Fix.mock from frontend

Author: jannisvisser

interfaces/IBF-dashboard/src/app/services/api.service.ts

@@ -410,18 +410,41 @@ export class ApiService {
     removeEvents: boolean,
     disasterType: DisasterType,
   ) {
-    return this.post(
-      'scripts/mock-dynamic-data',
-      {
-        secret,
-        countryCodeISO3: country.countryCodeISO3,
-        disasterType: disasterType.disasterType,
-        triggered,
-        removeEvents,
-        date: new Date(),
-      },
-      false,
-    );
+    // Part of disaster-types is migrated to new mock setup
+    // Once all disaster-types are migrated, this code can be simplified again
+    let apiPath = 'scripts/mock-dynamic-data';
+    let isNewBodyFormat = false;
+    if (disasterType.disasterType === DisasterTypeKey.floods) {
+      apiPath = 'mock/floods';
+      isNewBodyFormat = true;
+    } else if (disasterType.disasterType === DisasterTypeKey.flashFloods) {
+      apiPath = 'mock/flash-floods';
+      isNewBodyFormat = true;
+    } else if (
+      disasterType.disasterType === DisasterTypeKey.dengue ||
+      disasterType.disasterType === DisasterTypeKey.malaria
+    ) {
+      apiPath = 'mock/epidemics';
+      isNewBodyFormat = true;
+    }
+
+    const body = isNewBodyFormat
+      ? {
+          secret,
+          countryCodeISO3: country.countryCodeISO3,
+          removeEvents,
+          date: new Date(),
+          scenario: triggered ? 'trigger' : 'no-trigger',
+        }
+      : {
+          secret,
+          countryCodeISO3: country.countryCodeISO3,
+          disasterType: disasterType.disasterType,
+          triggered,
+          removeEvents,
+          date: new Date(),
+        };
+    return this.post(apiPath, body, false);
   }
 
   getActivationLogs(countryCodeISO3?: string, disasterType?: DisasterTypeKey) {

services/API-service/src/scripts/enum/mock-scenario.enum.ts

@@ -1,17 +1,17 @@
 export enum FloodsScenario {
-  Default = 'default',
+  Trigger = 'trigger',
   Warning = 'warning',
   WarningToTrigger = 'warning-to-trigger',
   NoTrigger = 'no-trigger',
 }
 
 export enum FlashFloodsScenario {
-  Default = 'default',
+  Trigger = 'trigger',
   NoTrigger = 'no-trigger',
 }
 
 export enum EpidemicsScenario {
-  Default = 'default',
+  Trigger = 'trigger',
   NoTrigger = 'no-trigger',
 }
 

services/API-service/src/scripts/mock-data/dengue/PHL/scenarios.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "0-month", "leadTime": "0-month" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/0-month/upload-alert_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/0-month/upload-alert_threshold-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "Rumphi", "leadTime": "6-hour" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/0-month/upload-potential_cases-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/0-month/upload-potential_cases-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [{ "eventName": "G1067", "leadTime": "4-day" }]
   },

services/API-service/src/scripts/mock-data/dengue/PHL/default/0-month/upload-potential_cases_65-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/0-month/upload-potential_cases_65-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [{ "eventName": "G5305", "leadTime": "4-day" }]
   },

services/API-service/src/scripts/mock-data/dengue/PHL/default/0-month/upload-potential_cases_U9-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/0-month/upload-potential_cases_U9-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [{ "eventName": "G1724", "leadTime": "4-day" }]
   },

services/API-service/src/scripts/mock-data/dengue/PHL/default/0-month/upload-potential_cases_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/0-month/upload-potential_cases_threshold-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "G1966", "leadTime": "4-day" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/1-month/upload-alert_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/1-month/upload-alert_threshold-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [{ "eventName": "G5100", "leadTime": "4-day" }]
   },

services/API-service/src/scripts/mock-data/dengue/PHL/default/1-month/upload-potential_cases-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/1-month/upload-potential_cases-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "G5075", "leadTime": "0-day" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/1-month/upload-potential_cases_65-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/1-month/upload-potential_cases_65-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "G1328", "leadTime": "7-day" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/1-month/upload-potential_cases_U9-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/1-month/upload-potential_cases_U9-2.json

@@ -1,6 +1,6 @@
 [
   {
-    "scenarioName": "default",
+    "scenarioName": "trigger",
     "defaultScenario": true,
     "events": [
       { "eventName": "0-month", "leadTime": "0-month" },

services/API-service/src/scripts/mock-data/dengue/PHL/default/1-month/upload-potential_cases_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/1-month/upload-potential_cases_threshold-2.json

@@ -62,7 +62,7 @@ export class MockFloodsScenario extends MockBaseScenario {
   @ApiProperty({
     example: Object.values(FloodsScenario).join(' | '),
     description:
-      'default: ongoing + trigger + warning event; warning: 1 warning event; warning-to-trigger: 1 event that evolves from warning to trigger',
+      'trigger: ongoing + trigger + warning event; warning: 1 warning event; warning-to-trigger: 1 event that evolves from warning to trigger',
   })
   @IsEnum(FloodsScenario)
   public readonly scenario: FloodsScenario;
@@ -71,7 +71,7 @@ export class MockFloodsScenario extends MockBaseScenario {
 export class MockFlashFloodsScenario extends MockBaseScenario {
   @ApiProperty({
     example: Object.values(FlashFloodsScenario).join(' | '),
-    description: 'default: trigger + warning event',
+    description: 'trigger: trigger + warning event',
   })
   @IsEnum(FlashFloodsScenario)
   public readonly scenario: FlashFloodsScenario;
@@ -80,7 +80,7 @@ export class MockFlashFloodsScenario extends MockBaseScenario {
 export class MockEpidemicsScenario extends MockBaseScenario {
   @ApiProperty({
     example: Object.values(EpidemicsScenario).join(' | '),
-    description: 'default: trigger in each month',
+    description: 'trigger: trigger in each month',
   })
   @IsEnum(EpidemicsScenario)
   public readonly scenario: EpidemicsScenario;

services/API-service/src/scripts/mock-data/dengue/PHL/default/2-month/upload-alert_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/2-month/upload-alert_threshold-2.json

@@ -11,9 +11,9 @@ describe('Should send an email for phl dengue', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     await testDengueScenario(
-      EpidemicsScenario.Default,
+      EpidemicsScenario.Trigger,
       countryCodeISO3,
       accessToken,
     );

services/API-service/src/scripts/mock-data/dengue/PHL/default/2-month/upload-potential_cases-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/2-month/upload-potential_cases-2.json

@@ -32,7 +32,7 @@ export async function testDengueScenario(
   expect(mockResult.status).toBe(202);
   expect(response.status).toBe(201);
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     expect(response.body.activeEvents.email).toBeDefined();
   } else {
     expect(response.body.activeEvents.email).toBeUndefined();
@@ -51,13 +51,13 @@ export async function testDengueScenario(
     (el) => (el as Element).textContent.toLowerCase(),
   ).map((el) => el.trim());
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     expect(eventNamesInEmail.length).toBe(eventNames.length);
   } else {
     expect(eventNamesInEmail.length).toBe(0);
   }
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     // Check if each expected event name is included in at least one title
     for (const eventName of eventNames) {
       const eventTitle = getEventTitle(disasterTypeLabel, eventName);

services/API-service/src/scripts/mock-data/dengue/PHL/default/2-month/upload-potential_cases_65-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/2-month/upload-potential_cases_65-2.json

@@ -11,9 +11,9 @@ describe('Should send an email for mwi flash flood', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     await testFlashFloodScenario(
-      FlashFloodsScenario.Default,
+      FlashFloodsScenario.Trigger,
       countryCodeISO3,
       accessToken,
     );

services/API-service/src/scripts/mock-data/dengue/PHL/default/2-month/upload-potential_cases_U9-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/2-month/upload-potential_cases_U9-2.json

@@ -32,7 +32,7 @@ export async function testFlashFloodScenario(
   expect(mockResult.status).toBe(202);
   expect(response.status).toBe(201);
 
-  if (scenario === FlashFloodsScenario.Default) {
+  if (scenario === FlashFloodsScenario.Trigger) {
     expect(response.body.activeEvents.email).toBeDefined();
   } else {
     expect(response.body.activeEvents.email).toBeUndefined();
@@ -51,13 +51,13 @@ export async function testFlashFloodScenario(
     (el) => (el as Element).textContent.toLowerCase(),
   ).map((el) => el.trim());
 
-  if (scenario === FlashFloodsScenario.Default) {
+  if (scenario === FlashFloodsScenario.Trigger) {
     expect(eventNamesInEmail.length).toBe(eventNames.length);
   } else {
     expect(eventNamesInEmail.length).toBe(0);
   }
 
-  if (scenario === FlashFloodsScenario.Default) {
+  if (scenario === FlashFloodsScenario.Trigger) {
     // Check if each expected event name is included in at least one title
     for (const eventName of eventNames) {
       const eventTitle = getEventTitle(disasterTypeLabel, eventName);

services/API-service/src/scripts/mock-data/dengue/PHL/default/2-month/upload-potential_cases_threshold-2.json services/API-service/src/scripts/mock-data/dengue/PHL/trigger/2-month/upload-potential_cases_threshold-2.json

@@ -12,9 +12,9 @@ describe('Should send an email for ssd floods', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     // Arrange
-    const scenario = FloodsScenario.Default;
+    const scenario = FloodsScenario.Trigger;
     await testFloodScenario(scenario, {
       scenarios,
       countryCodeISO3,

services/API-service/src/scripts/mock-data/flash-floods/MWI/scenarios.json

@@ -12,9 +12,9 @@ describe('Should send an email for uga floods', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     // Arrange
-    const scenario = FloodsScenario.Default;
+    const scenario = FloodsScenario.Trigger;
     await testFloodScenario(scenario, {
       scenarios,
       countryCodeISO3,

services/API-service/src/scripts/mock-data/flash-floods/MWI/default/Karonga/upload-alert_threshold-3.json services/API-service/src/scripts/mock-data/flash-floods/MWI/trigger/Karonga/upload-alert_threshold-3.json

@@ -11,9 +11,9 @@ describe('Should send an email for eth malaria', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     await testMalariaScenario(
-      EpidemicsScenario.Default,
+      EpidemicsScenario.Trigger,
       countryCodeISO3,
       accessToken,
     );

services/API-service/src/scripts/mock-data/flash-floods/MWI/default/Karonga/upload-damage_estimation-3.json services/API-service/src/scripts/mock-data/flash-floods/MWI/trigger/Karonga/upload-damage_estimation-3.json

@@ -32,7 +32,7 @@ export async function testMalariaScenario(
   expect(mockResult.status).toBe(202);
   expect(response.status).toBe(201);
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     expect(response.body.activeEvents.email).toBeDefined();
   } else {
     expect(response.body.activeEvents.email).toBeUndefined();
@@ -51,13 +51,13 @@ export async function testMalariaScenario(
     (el) => (el as Element).textContent.toLowerCase(),
   ).map((el) => el.trim());
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     expect(eventNamesInEmail.length).toBe(eventNames.length);
   } else {
     expect(eventNamesInEmail.length).toBe(0);
   }
 
-  if (scenario === EpidemicsScenario.Default) {
+  if (scenario === EpidemicsScenario.Trigger) {
     // Check if each expected event name is included in at least one title
     for (const eventName of eventNames) {
       const eventTitle = getEventTitle(disasterTypeLabel, eventName);

services/API-service/src/scripts/mock-data/flash-floods/MWI/default/Karonga/upload-nr_affected_buildings-3.json services/API-service/src/scripts/mock-data/flash-floods/MWI/trigger/Karonga/upload-nr_affected_buildings-3.json

@@ -11,7 +11,7 @@ describe('Should send an email for phl typhoon', () => {
     await resetDB(accessToken);
   });
 
-  it('default', async () => {
+  it('trigger', async () => {
     await testTyphoonScenario(
       TyphoonScenario.EventTrigger,
       countryCodeISO3,