add dfs * sda georegion ids for dashboard detail

Vizzuality · Mar 19, 2024 · 59bb2f0 · 59bb2f0
1 parent 2a48c9a
commit 59bb2f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/api/src/modules/eudr-alerts/dashboard/dashboard-detail.types.ts b/api/src/modules/eudr-alerts/dashboard/dashboard-detail.types.ts
@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { AffectedPlots } from './dashboard.types';
 
 export class EUDRDashBoardDetail {
   @ApiProperty()
@@ -11,6 +12,9 @@ export class EUDRDashBoardDetail {
     type: () => DashBoardDetailSourcingInformation,
     isArray: true,
   })
+  @ApiProperty({ type: () => AffectedPlots })
+  plots: AffectedPlots;
+  @ApiProperty({ type: () => DashBoardDetailCountry, isArray: true })
   sourcingInformation: DashBoardDetailSourcingInformation[];
   @ApiProperty({ type: () => DashBoardDetailAlerts, isArray: true })
   alerts: DashBoardDetailAlerts[];

diff --git a/api/src/modules/eudr-alerts/dashboard/dashboard.types.ts b/api/src/modules/eudr-alerts/dashboard/dashboard.types.ts
@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 
-class AffectedPlots {
+export class AffectedPlots {
   @ApiProperty()
   dfs: string[];
   @ApiProperty()

diff --git a/api/src/modules/eudr-alerts/dashboard/eudr-dashboard.service.ts b/api/src/modules/eudr-alerts/dashboard/eudr-dashboard.service.ts
@@ -448,6 +448,7 @@ export class EudrDashboardService {
     const sourcingInformation: any = {};
     let supplier: Supplier;
     const geoRegionMap: Map<string, { plotName: string }> = new Map();
+    const allGeoRegionsBySupplier: string[] = [];
 
     return this.datasource.transaction(async (manager: EntityManager) => {
       supplier = await manager
@@ -514,7 +515,11 @@ export class EudrDashboardService {
           plotName: string;
           geoRegionId: string;
         }[] = [];
+
         for (const geoRegion of geoRegions) {
+          if (geoRegion.geoRegionId) {
+            allGeoRegionsBySupplier.push(geoRegion.geoRegionId);
+          }
           geoRegion.geoRegionId = geoRegion.geoRegionId ?? null;
           geoRegion.plotName = geoRegion.plotName ?? 'Unknown';
           if (!geoRegionMap.get(geoRegion.geoRegionId)) {
@@ -583,13 +588,16 @@ export class EudrDashboardService {
         endAlertDate: dto?.endAlertDate,
       });
 
+      const affectedGeoRegionIds: Set<string> = new Set<string>();
       const { totalAlerts, totalCarbonRemovals } = alertsOutput.reduce(
         (
           acc: { totalAlerts: number; totalCarbonRemovals: number },
           cur: AlertsOutput,
         ) => {
           acc.totalAlerts += cur.alertCount;
           acc.totalCarbonRemovals += cur.carbonRemovals;
+          console.log(cur.geoRegionId);
+          affectedGeoRegionIds.add(cur.geoRegionId);
           return acc;
         },
         { totalAlerts: 0, totalCarbonRemovals: 0 },
@@ -608,6 +616,14 @@ export class EudrDashboardService {
         values: groupAlertsByDate(alertsOutput, geoRegionMap),
       };
 
+      const nonAlertedGeoRegions: string[] = allGeoRegionsBySupplier.filter(
+        (id: string) => ![...affectedGeoRegionIds].includes(id),
+      );
+      result.plots = {
+        dfs: nonAlertedGeoRegions,
+        sda: [...affectedGeoRegionIds],
+      };
+
       result.alerts = alerts;
 
       return result;