From 2d7ea687017011c066e383561de5f010a07b3f34 Mon Sep 17 00:00:00 2001
From: jannisvisser <jannisvisser@redcross.nl>
Date: Tue, 8 Oct 2024 15:18:46 +0200
Subject: [PATCH] fix: area speech bbubble appears twice

---
 .../src/api/event/event.service.ts            | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/services/API-service/src/api/event/event.service.ts b/services/API-service/src/api/event/event.service.ts
index 301fe7eba..9fafd718d 100644
--- a/services/API-service/src/api/event/event.service.ts
+++ b/services/API-service/src/api/event/event.service.ts
@@ -346,6 +346,7 @@ export class EventService {
         triggeredPlaceCodes,
         disasterType,
         lastTriggeredDate,
+        eventName,
       );
     }
 
@@ -413,21 +414,30 @@ export class EventService {
     triggeredPlaceCodes: string[],
     disasterType: DisasterType,
     lastTriggeredDate: DateDto,
+    eventName?: string,
+    leadTime?: string,
   ): Promise<TriggeredArea[]> {
     const actionUnit = await this.getActionUnit(disasterType);
+    const whereFilters = {
+      placeCode: In(triggeredPlaceCodes),
+      indicator: actionUnit,
+      disasterType,
+      timestamp: MoreThanOrEqual(
+        this.helperService.getUploadCutoffMoment(
+          disasterType,
+          lastTriggeredDate.timestamp,
+        ),
+      ),
+    };
+    if (eventName) {
+      whereFilters['eventName'] = eventName;
+    }
+    if (leadTime) {
+      whereFilters['leadTime'] = leadTime;
+    }
     const areas = await this.adminAreaDynamicDataRepo
       .createQueryBuilder('dynamic')
-      .where({
-        placeCode: In(triggeredPlaceCodes),
-        indicator: actionUnit,
-        disasterType,
-        timestamp: MoreThanOrEqual(
-          this.helperService.getUploadCutoffMoment(
-            disasterType,
-            lastTriggeredDate.timestamp,
-          ),
-        ),
-      })
+      .where(whereFilters)
       .leftJoinAndSelect(
         AdminAreaEntity,
         'area',
@@ -460,6 +470,7 @@ export class EventService {
         'COALESCE("parentUser"."firstName","grandparentUser"."firstName") || \' \' || COALESCE("parentUser"."lastName","grandparentUser"."lastName") AS "displayName"',
       ])
       .getRawMany();
+
     return areas.map((area) => {
       return {
         placeCode: area.placeCode,