group plots by alert date in eudr dashboard detail alerts

Vizzuality · Mar 14, 2024 · f9617d5 · f9617d5
1 parent d8010b5
commit f9617d5
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 deletions.
diff --git a/api/src/modules/eudr-alerts/dashboard/dashboard-detail.types.ts b/api/src/modules/eudr-alerts/dashboard/dashboard-detail.types.ts
@@ -49,6 +49,10 @@ class ByVolume {
   percentage: number;
   @ApiProperty()
   volume: number;
+  @ApiProperty()
+  geoRegionId: string;
+  @ApiProperty()
+  plotName: string;
 }
 
 class ByArea {
@@ -75,9 +79,16 @@ class DashBoardDetailAlerts {
 
 class AlertValues {
   @ApiProperty()
-  geoRegionId: string;
+  alertDate: string;
+  @ApiProperty({ type: () => AlertPlots, isArray: true })
+  plots: AlertPlots[];
+}
+
+class AlertPlots {
   @ApiProperty()
-  alertCount: number;
+  geoRegionId: string;
   @ApiProperty()
   plotName: string;
+  @ApiProperty()
+  alertCount: number;
 }
diff --git a/api/src/modules/eudr-alerts/dashboard/dashboard.types.ts b/api/src/modules/eudr-alerts/dashboard/dashboard.types.ts
@@ -56,12 +56,13 @@ export type EntityMetadata = {
   supplierId: string;
   supplierName: string;
   companyId: string;
-  adminRegionId: string;
-  adminRegionName: string;
   materialId: string;
   materialName: string;
+  adminRegionId: string;
+  adminRegionName: string;
   totalBaselineVolume: number;
-  geoRegionCount: number;
+  knownGeoRegions: number;
+  totalSourcingLocations: number;
   isoA3: string;
 };
 

diff --git a/api/src/modules/eudr-alerts/dashboard/eudr-dashboard.service.ts b/api/src/modules/eudr-alerts/dashboard/eudr-dashboard.service.ts
@@ -522,7 +522,7 @@ export class EudrDashboardService {
         );
         const sourcingRecords: SourcingRecord[] = [];
         for (const geoRegion of geoRegions) {
-          geoRegion.geoRegionId = geoRegion.geoRegionId ?? 'Unknown';
+          geoRegion.geoRegionId = geoRegion.geoRegionId ?? null;
           geoRegion.plotName = geoRegion.plotName ?? 'Unknown';
           if (!geoRegionMap.get(geoRegion.geoRegionId)) {
             geoRegionMap.set(geoRegion.geoRegionId, {
@@ -533,7 +533,7 @@ export class EudrDashboardService {
             .createQueryBuilder(SourcingRecord, 'sr')
             .leftJoin(SourcingLocation, 'sl', 'sr.sourcingLocationId = sl.id')
             .leftJoin(GeoRegion, 'gr', 'gr.id = sl.geoRegionId');
-          if (geoRegion.geoRegionId === 'Unknown') {
+          if (!geoRegion.geoRegionId) {
             queryBuilder.andWhere('sl.geoRegionId IS NULL');
           } else {
             queryBuilder.andWhere('sl.geoRegionId = :geoRegionId', {
@@ -601,11 +601,13 @@ export class EudrDashboardService {
         startAlertDate: startAlertDate,
         endAlertDate: endAlertDate,
         totalAlerts,
-        values: alertsOutput.map((alert: AlertsOutput) => ({
-          geoRegionId: alert.geoRegionId,
-          alertCount: alert.alertCount || null,
-          plotName: geoRegionMap.get(alert.geoRegionId)?.plotName,
-        })),
+        // values: alertsOutput.map((alert: AlertsOutput) => ({
+        //   alertDate: alert.alertDate.value,
+        //   geoRegionId: alert.geoRegionId,
+        //   alertCount: alert.alertCount || null,
+        //   plotName: geoRegionMap.get(alert.geoRegionId)?.plotName,
+        // })),
+        values: groupAlertsByDate(alertsOutput, geoRegionMap),
       };
 
       result.alerts = alerts;
@@ -635,3 +637,25 @@ const aggregateUnknownGeoRegionVolumeValues = (arr: any[]): any[] => {
   });
   return finalRecords;
 };
+
+const groupAlertsByDate = (
+  alerts: AlertsOutput[],
+  geoRegionMap: Map<string, any>,
+): any[] => {
+  const alertsByDate: any = alerts.reduce((acc: any, cur: AlertsOutput) => {
+    const date: string = cur.alertDate.value.toString();
+    if (!acc[date]) {
+      acc[date] = [];
+    }
+    acc[date].push({
+      plotName: geoRegionMap.get(cur.geoRegionId)?.plotName,
+      geoRegionId: cur.geoRegionId,
+      alertCount: cur.alertCount,
+    });
+    return acc;
+  }, {});
+  return Object.keys(alertsByDate).map((key) => ({
+    alertDate: key,
+    plots: alertsByDate[key],
+  }));
+};
diff --git a/api/src/modules/eudr-alerts/eudr.repositoty.interface.ts b/api/src/modules/eudr-alerts/eudr.repositoty.interface.ts
@@ -14,7 +14,6 @@ export class EUDRAlertDates {
 
 export interface EUDRAlertDatabaseResult {
   supplierid: string;
-  tpl: number;
   dfs: number;
   sda: number;
 }