Merge pull request #1632 from rodekruis/fix.area-speech-bubble-appear…

…s-twice

fix: area speech bbubble appears twice

services/API-service/src/api/event/event.service.ts

@@ -343,6 +343,7 @@ export class EventService {
         triggeredPlaceCodes,
         disasterType,
         lastTriggeredDate,
+        eventName,
       );
     }
 
@@ -410,21 +411,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',
@@ -457,6 +467,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,