fix: errors from merge

EyeSeeTea · Aug 20, 2024 · 612e12a · 612e12a
1 parent 2ae9cb9
commit 612e12a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/data/repositories/AlertD2Repository.ts b/src/data/repositories/AlertD2Repository.ts
@@ -14,6 +14,7 @@ import {
     D2TrackerTrackedEntity,
     TrackedEntitiesGetResponse,
 } from "@eyeseetea/d2-api/api/trackerTrackedEntities";
+import { Maybe } from "../../utils/ts-utils";
 
 export class AlertD2Repository implements AlertRepository {
     constructor(private api: D2Api) {}
@@ -52,7 +53,7 @@ export class AlertD2Repository implements AlertRepository {
 
     private async getTrackedEntitiesByTEACodeAsync(filter: {
         id: Id;
-        value: string;
+        value: Maybe<string>;
     }): Promise<D2TrackerTrackedEntity[]> {
         const d2TrackerTrackedEntities: D2TrackerTrackedEntity[] = [];
 
@@ -92,7 +93,7 @@ export class AlertD2Repository implements AlertRepository {
 
     private getTrackedEntitiesByTEACode(filter: {
         id: Id;
-        value: string;
+        value: Maybe<string>;
     }): FutureData<D2TrackerTrackedEntity[]> {
         return Future.fromPromise(this.getTrackedEntitiesByTEACodeAsync(filter));
     }

diff --git a/src/domain/repositories/AlertRepository.ts b/src/domain/repositories/AlertRepository.ts
@@ -1,4 +1,5 @@
 import { FutureData } from "../../data/api-futures";
+import { Maybe } from "../../utils/ts-utils";
 import { IncidentStatusType } from "../entities/disease-outbreak-event/DiseaseOutbreakEvent";
 import { Id } from "../entities/Ref";
 
@@ -8,6 +9,6 @@ export interface AlertRepository {
 
 export type AlertOptions = {
     eventId: Id;
-    filter: { id: Id; value: string };
+    filter: { id: Id; value: Maybe<string> };
     incidentStatus: IncidentStatusType;
 };
diff --git a/src/domain/usecases/MapDiseaseOutbreakToAlertsUseCase.ts b/src/domain/usecases/MapDiseaseOutbreakToAlertsUseCase.ts
@@ -12,7 +12,7 @@ import {
 
 type DiseaseOutbreakEventData = Pick<
     DiseaseOutbreakEventBaseAttrs,
-    "dataSourceCode" | "hazardType" | "incidentStatus" | "suspectedDiseaseCode"
+    "dataSource" | "hazardType" | "incidentStatus" | "suspectedDiseaseCode"
 >;
 
 const incidentDataSourceCode = "IBS";
@@ -24,15 +24,15 @@ export class MapDiseaseOutbreakToAlertsUseCase {
         diseaseOutbreakEventId: Id,
         diseaseOutbreakEventData: DiseaseOutbreakEventData
     ): FutureData<void> {
-        const { dataSourceCode, hazardType, incidentStatus, suspectedDiseaseCode } =
+        const { dataSource, hazardType, incidentStatus, suspectedDiseaseCode } =
             diseaseOutbreakEventData;
-        const hazardTypeCode = hazardTypeCodeMap[hazardType];
+        const hazardTypeCode = hazardType ? hazardTypeCodeMap[hazardType] : undefined;
 
         if (!diseaseOutbreakEventId)
             return Future.error(new Error("Disease Outbreak Event Id is required"));
 
         const filter =
-            dataSourceCode === incidentDataSourceCode
+            dataSource === incidentDataSourceCode
                 ? { id: RTSL_ZEBRA_ALERTS_DISEASE_TEA_ID, value: suspectedDiseaseCode }
                 : { id: RTSL_ZEBRA_ALERTS_EVENT_TYPE_TEA_ID, value: hazardTypeCode };
 

diff --git a/src/domain/usecases/__tests__/MapDiseaseOutbreakToAlertsUseCase.spec.ts b/src/domain/usecases/__tests__/MapDiseaseOutbreakToAlertsUseCase.spec.ts
@@ -6,7 +6,7 @@ describe("MapDiseaseOutbreakToAlertsUseCase", () => {
 
         compositionRoot.diseaseOutbreakEvent.mapDiseaseOutbreakEventToAlerts
             .execute("", {
-                dataSourceCode: "EBS",
+                dataSource: "EBS",
                 hazardType: "Biological:Human",
                 suspectedDiseaseCode: "",
                 incidentStatus: "Watch",
@@ -22,7 +22,7 @@ describe("MapDiseaseOutbreakToAlertsUseCase", () => {
 
         compositionRoot.diseaseOutbreakEvent.mapDiseaseOutbreakEventToAlerts
             .execute("123", {
-                dataSourceCode: "EBS",
+                dataSource: "EBS",
                 hazardType: "Biological:Human",
                 suspectedDiseaseCode: "",
                 incidentStatus: "Watch",