fix: 🐛 simplify regional consumptions search

Vini7Dev · Jun 29, 2023 · 7771b25 · 7771b25
1 parent 780025c
commit 7771b25
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/...ules/consumptionMarkings/useCases/seeRegionalConsumption/SeeRegionalConsumptionUseCase.ts b/...ules/consumptionMarkings/useCases/seeRegionalConsumption/SeeRegionalConsumptionUseCase.ts
@@ -3,7 +3,7 @@ import { injectable, inject } from 'tsyringe'
 import { IConsumptionMarkingsRepository } from '@modules/consumptionMarkings/repositories/IConsumptionMarkingsRepository'
 import { groupConsumptionMarkingsByTimeDivision } from '@utils/groupConsumptionMarkingsByIimeDivision'
 import { periodFilterBuilder } from '@utils/periodFilterBuilder'
-import { groupConsumptionMarkingsByHydrometerId } from '@utils/groupConsumptionMarkingsByHydrometerId'
+import { groupConsumptionByDate } from '@utils/groupConsumptionByDate'
 
 type PeriodType = 'YESTERDAY' | 'PAST_MONTH' | 'PAST_YEAR' | 'CUSTOM'
 
@@ -47,17 +47,19 @@ export class SeeRegionalConsumptionUseCase {
       timeDivision: middleIntervalDate,
     })
 
-    const pastConsumptionByHydrometerId = groupConsumptionMarkingsByHydrometerId({
-      consumptionMarkingList: groupsOfConsumptionMarkings.pastGroup
-    })
-
-    const presentConsumptionByHydrometerId = groupConsumptionMarkingsByHydrometerId({
-      consumptionMarkingList: groupsOfConsumptionMarkings.presentGroup
-    })
-
-    return {
-      pastGroup: pastConsumptionByHydrometerId,
-      presentGroup: presentConsumptionByHydrometerId,
+    const groupedConsumptionMarkings = {
+      pastGroup: groupConsumptionByDate({
+        afterDate,
+        beforeDate,
+        consumptions: groupsOfConsumptionMarkings.pastGroup,
+      }),
+      presentGroup: groupConsumptionByDate({
+        afterDate,
+        beforeDate,
+        consumptions: groupsOfConsumptionMarkings.presentGroup,
+      }),
     }
+
+    return groupedConsumptionMarkings
   }
 }
diff --git a/server/src/utils/groupConsumptionMarkingsByHydrometerId.ts b/server/src/utils/groupConsumptionMarkingsByHydrometerId.ts