From 25650ca91b5ba3c2038c480b6771f70f78d1e6e2 Mon Sep 17 00:00:00 2001
From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com>
Date: Wed, 16 Apr 2025 12:14:38 +0300
Subject: [PATCH] adjusted params

---
 .../fact_hourly_energy_consumed.sql           | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql b/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
index d2b46fe..9674d74 100644
--- a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
+++ b/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
@@ -1,8 +1,7 @@
 WITH params AS (
   SELECT
-    NULL::uuid AS device_id,     -- filter: specific device (or NULL for all)
-    NULL::date AS start_date,    -- filter: start date (or NULL for open range)
-    NULL::date AS end_date,      -- filter: end date (or NULL for open range)
+    NULL::uuid AS device_id, -- filter: specific device (or NULL for all)
+    NULL::date AS input_date, -- filter: start date (or NULL for open range)    -- filter: end date (or NULL for open range)
     NULL::int AS hour,           -- filter: hour of day (or NULL for all hours)
     NULL::int AS min_kw          -- filter: min kW consumed (or NULL for no filter)
 ),
@@ -17,8 +16,8 @@ total_energy AS (
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
       AND (params.device_id IS NULL OR log.device_id = params.device_id)
-      AND (params.start_date IS NULL OR log.event_time::date >= params.start_date)
-      AND (params.end_date IS NULL OR log.event_time::date <= params.end_date)
+      AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
+      AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
     GROUP BY log.device_id, log.event_time::date, EXTRACT(HOUR FROM log.event_time)
 ),
@@ -33,8 +32,8 @@ energy_phase_A AS (
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
       AND (params.device_id IS NULL OR log.device_id = params.device_id)
-      AND (params.start_date IS NULL OR log.event_time::date >= params.start_date)
-      AND (params.end_date IS NULL OR log.event_time::date <= params.end_date)
+      AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
+      AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
     GROUP BY log.device_id, log.event_time::date, EXTRACT(HOUR FROM log.event_time)
 ),
@@ -49,8 +48,8 @@ energy_phase_B AS (
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
       AND (params.device_id IS NULL OR log.device_id = params.device_id)
-      AND (params.start_date IS NULL OR log.event_time::date >= params.start_date)
-      AND (params.end_date IS NULL OR log.event_time::date <= params.end_date)
+      AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
+      AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
     GROUP BY log.device_id, log.event_time::date, EXTRACT(HOUR FROM log.event_time)
 ),
@@ -65,8 +64,8 @@ energy_phase_C AS (
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
       AND (params.device_id IS NULL OR log.device_id = params.device_id)
-      AND (params.start_date IS NULL OR log.event_time::date >= params.start_date)
-      AND (params.end_date IS NULL OR log.event_time::date <= params.end_date)
+      AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
+      AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
     GROUP BY log.device_id, log.event_time::date, EXTRACT(HOUR FROM log.event_time)
 )