Migrate typhoon to new mock

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

@@ -423,6 +423,12 @@ export class ApiService {
     } else if (disasterType.disasterType === DisasterTypeKey.malaria) {
       apiPath = 'mock/malaria';
       isNewBodyFormat = true;
+    } else if (disasterType.disasterType === DisasterTypeKey.drought) {
+      apiPath = 'mock/drought';
+      isNewBodyFormat = true;
+    } else if (disasterType.disasterType === DisasterTypeKey.typhoon) {
+      apiPath = 'mock/typhoon';
+      isNewBodyFormat = true;
     }
 
     const body = isNewBodyFormat

services/API-service/src/api/admin-area-data/dto/upload-admin-area-data.dto.ts

@@ -12,8 +12,8 @@ import {
 } from 'class-validator';
 import { JoinColumn, ManyToOne } from 'typeorm';
 
+import indicatorData from '../../../scripts/mock-data/drought/ETH/trigger/Belg JAS_Belg/upload-alert_threshold-2.json';
 import { DynamicDataPlaceCodeDto } from '../../admin-area-dynamic-data/dto/dynamic-data-place-code.dto';
-import indicatorData from '../../admin-area-dynamic-data/dto/example/ETH/drought/upload-alert_threshold-2.json';
 import { UpdateableStaticIndicator } from '../../admin-area-dynamic-data/enum/dynamic-data-unit';
 import { AdminLevel } from '../../country/admin-level.enum';
 import { CountryEntity } from '../../country/country.entity';

services/API-service/src/api/admin-area-dynamic-data/admin-area-dynamic-data.service.ts

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import path from 'path';
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
@@ -260,10 +261,15 @@ export class AdminAreaDynamicDataService {
       );
     }
     try {
-      fs.writeFileSync(
-        `./geoserver-volume/raster-files/output/${subfolder}/${data.originalname}`,
-        data.buffer,
+      const ROOT_DIR = path.resolve('./geoserver-volume/raster-files/output');
+      const filePath = path.resolve(
+        ROOT_DIR,
+        `${subfolder}/${data.originalname}`,
       );
+      if (!filePath.startsWith(ROOT_DIR)) {
+        throw new Error('Invalid file path');
+      }
+      fs.writeFileSync(filePath, data.buffer);
     } catch (e) {
       console.error(e);
       throw new HttpException('File not written: ' + e, HttpStatus.NOT_FOUND);