From ddb205658c14d6a594663673cf829039e243cea9 Mon Sep 17 00:00:00 2001 From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com> Date: Tue, 15 Jul 2025 13:48:00 +0300 Subject: [PATCH] divided the energy consumption metric by 100 to convert to kWh --- ...ct_daily_device_energy_consumed_procedure.sql | 16 ++++++++-------- ...t_hourly_device_energy_consumed_procedure.sql | 16 ++++++++-------- ..._monthly_device_energy_consumed_procedure.sql | 16 ++++++++-------- .../fact_daily_device_energy_consumed.sql | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql index 233b24d..e9905db 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql @@ -9,8 +9,8 @@ total_energy AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' AND log.event_time::date = params.target_date @@ -23,8 +23,8 @@ energy_phase_A AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' AND log.event_time::date = params.target_date @@ -37,8 +37,8 @@ energy_phase_B AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' AND log.event_time::date = params.target_date @@ -51,8 +51,8 @@ energy_phase_C AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' AND log.event_time::date = params.target_date diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql index afe6e4d..ce5a101 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql @@ -9,8 +9,8 @@ total_energy AS ( EXTRACT(HOUR FROM log.event_time)::text AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' AND log.event_time::date = params.target_date @@ -23,8 +23,8 @@ energy_phase_A AS ( EXTRACT(HOUR FROM log.event_time)::text AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' AND log.event_time::date = params.target_date @@ -37,8 +37,8 @@ energy_phase_B AS ( EXTRACT(HOUR FROM log.event_time)::text AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' AND log.event_time::date = params.target_date @@ -51,8 +51,8 @@ energy_phase_C AS ( EXTRACT(HOUR FROM log.event_time)::text AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' AND log.event_time::date = params.target_date diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql index 8deddda..3c049fc 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql @@ -9,8 +9,8 @@ total_energy AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month @@ -23,8 +23,8 @@ energy_phase_A AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month @@ -37,8 +37,8 @@ energy_phase_B AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month @@ -51,8 +51,8 @@ energy_phase_C AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month diff --git a/libs/common/src/sql/queries/fact_daily_device_energy_consumed/fact_daily_device_energy_consumed.sql b/libs/common/src/sql/queries/fact_daily_device_energy_consumed/fact_daily_device_energy_consumed.sql index b7967ce..a2760c2 100644 --- a/libs/common/src/sql/queries/fact_daily_device_energy_consumed/fact_daily_device_energy_consumed.sql +++ b/libs/common/src/sql/queries/fact_daily_device_energy_consumed/fact_daily_device_energy_consumed.sql @@ -4,8 +4,8 @@ WITH total_energy AS ( SELECT device_id, event_time::date AS date, - MIN(value)::integer AS min_value, - MAX(value)::integer AS max_value + MIN(value)::integer/100 AS min_value, + MAX(value)::integer/100 AS max_value FROM "device-status-log" where code='EnergyConsumed' GROUP BY device_id, date @@ -15,8 +15,8 @@ WITH total_energy AS ( SELECT device_id, event_time::date AS date, - MIN(value)::integer AS min_value, - MAX(value)::integer AS max_value + MIN(value)::integer/100 AS min_value, + MAX(value)::integer/100 AS max_value FROM "device-status-log" where code='EnergyConsumedA' GROUP BY device_id, date @@ -26,8 +26,8 @@ WITH total_energy AS ( SELECT device_id, event_time::date AS date, - MIN(value)::integer AS min_value, - MAX(value)::integer AS max_value + MIN(value)::integer/100 AS min_value, + MAX(value)::integer/100 AS max_value FROM "device-status-log" where code='EnergyConsumedB' GROUP BY device_id, date @@ -37,8 +37,8 @@ WITH total_energy AS ( SELECT device_id, event_time::date AS date, - MIN(value)::integer AS min_value, - MAX(value)::integer AS max_value + MIN(value)::integer/100 AS min_value, + MAX(value)::integer/100 AS max_value FROM "device-status-log" where code='EnergyConsumedC' GROUP BY device_id, date