Merge pull request #7 from AplinkosMinisterija/refactor

Refactor
AplinkosMinisterija · Sep 21, 2023 · fbb8d7a · fbb8d7a
2 parents f97055b + 866ca27
commit fbb8d7a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/services/hydroPowerPlants.service.ts b/services/hydroPowerPlants.service.ts
@@ -262,24 +262,24 @@ export default class hydroPowerPlantsService extends moleculer.Service {
      SELECT COUNT(*)
      FROM events e
      WHERE e.hydro_power_plant_id = hpp.id
-       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '2 day' - INTERVAL '1 second')
-       AND ((e.upper_basin >= hpp.upper_basin_max OR e.upper_basin <= hpp.lower_basin_min)
+       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '1 day' - INTERVAL '1 second')
+       AND ((e.upper_basin > hpp.upper_basin_max OR e.upper_basin < hpp.lower_basin_min)
          OR e.lower_basin < hpp.lower_basin_min)
     ) AS today,
     (
      SELECT COUNT(*)
      FROM events e
      WHERE e.hydro_power_plant_id = hpp.id
-       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '1 week' AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '2 day' - INTERVAL '1 second')
-       AND ((e.upper_basin >= hpp.upper_basin_max OR e.upper_basin <= hpp.lower_basin_min)
+       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '1 week' AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '1 day' - INTERVAL '1 second')
+       AND ((e.upper_basin > hpp.upper_basin_max OR e.upper_basin < hpp.lower_basin_min)
          OR e.lower_basin < hpp.lower_basin_min)
     ) AS week,
     (
      SELECT COUNT(*)
      FROM events e
      WHERE e.hydro_power_plant_id = hpp.id
-       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '1 month' AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '2 day' - INTERVAL '1 second')
-       AND ((e.upper_basin >= hpp.upper_basin_max OR e.upper_basin <= hpp.lower_basin_min)
+       AND e.time BETWEEN DATE_TRUNC('day', CURRENT_DATE) - INTERVAL '1 month' AND (DATE_TRUNC('day', CURRENT_DATE) + INTERVAL '1 day' - INTERVAL '1 second')
+       AND ((e.upper_basin > hpp.upper_basin_max OR e.upper_basin < hpp.lower_basin_min)
          OR e.lower_basin < hpp.lower_basin_min)
     ) AS month,
     (