From 4e6b6f6ac574f9a2c6992d5f4bc5eae8f0dd8a74 Mon Sep 17 00:00:00 2001 From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com> Date: Tue, 24 Jun 2025 13:04:21 +0300 Subject: [PATCH] adjusted procedures --- .../fact_daily_device_energy_consumed_procedure.sql | 13 ++++--------- ...fact_hourly_device_energy_consumed_procedure.sql | 12 +----------- ...act_monthly_device_energy_consumed_procedure.sql | 5 ----- 3 files changed, 5 insertions(+), 25 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 c549891..ab9e7d2 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 @@ -1,6 +1,5 @@ WITH params AS ( SELECT - $1::uuid AS device_id, $2::date AS target_date ), total_energy AS ( @@ -14,8 +13,7 @@ total_energy AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' - AND log.device_id = params.device_id - AND log.event_time::date = params.target_date + AND log.event_time::date = params.target_date GROUP BY 1,2,3,4,5 ), energy_phase_A AS ( @@ -29,8 +27,7 @@ energy_phase_A AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' - AND log.device_id = params.device_id - AND log.event_time::date = params.target_date + AND log.event_time::date = params.target_date GROUP BY 1,2,3,4,5 ), energy_phase_B AS ( @@ -44,8 +41,7 @@ energy_phase_B AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' - AND log.device_id = params.device_id - AND log.event_time::date = params.target_date + AND log.event_time::date = params.target_date GROUP BY 1,2,3,4,5 ), energy_phase_C AS ( @@ -59,8 +55,7 @@ energy_phase_C AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' - AND log.device_id = params.device_id - AND log.event_time::date = params.target_date + AND log.event_time::date = params.target_date GROUP BY 1,2,3,4,5 ), final_data AS ( 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 ffefc4f..c056a0f 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 @@ -1,8 +1,6 @@ WITH params AS ( SELECT - $1::uuid AS device_id, - $2::date AS target_date, - $3::text AS target_hour + $2::date AS target_date ), total_energy AS ( SELECT @@ -15,9 +13,7 @@ total_energy AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' - AND log.device_id = params.device_id AND log.event_time::date = params.target_date - AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour GROUP BY 1,2,3,4,5 ), energy_phase_A AS ( @@ -31,9 +27,7 @@ energy_phase_A AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' - AND log.device_id = params.device_id AND log.event_time::date = params.target_date - AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour GROUP BY 1,2,3,4,5 ), energy_phase_B AS ( @@ -47,9 +41,7 @@ energy_phase_B AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' - AND log.device_id = params.device_id AND log.event_time::date = params.target_date - AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour GROUP BY 1,2,3,4,5 ), energy_phase_C AS ( @@ -63,9 +55,7 @@ energy_phase_C AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' - AND log.device_id = params.device_id AND log.event_time::date = params.target_date - AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour GROUP BY 1,2,3,4,5 ), final_data AS ( 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 0e69d60..691de79 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 @@ -1,6 +1,5 @@ WITH params AS ( SELECT - $1::uuid AS device_id, $2::text AS target_month -- Format should match 'MM-YYYY' ), total_energy AS ( @@ -14,7 +13,6 @@ total_energy AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumed' - AND log.device_id = params.device_id AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month GROUP BY 1,2,3,4,5 ), @@ -29,7 +27,6 @@ energy_phase_A AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedA' - AND log.device_id = params.device_id AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month GROUP BY 1,2,3,4,5 ), @@ -44,7 +41,6 @@ energy_phase_B AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedB' - AND log.device_id = params.device_id AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month GROUP BY 1,2,3,4,5 ), @@ -59,7 +55,6 @@ energy_phase_C AS ( MAX(log.value)::integer AS max_value FROM "device-status-log" log, params WHERE log.code = 'EnergyConsumedC' - AND log.device_id = params.device_id AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month GROUP BY 1,2,3,4,5 ),