From 3f2c36d48b8d538c5966f9893975571023186c12 Mon Sep 17 00:00:00 2001 From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:45:07 +0300 Subject: [PATCH] consolidated all the procedures into 1 script and removed redundant ones --- ...ert_fact_daily_device_energy_consumed.sql} | 0 ...rt_fact_hourly_device_energy_consumed.sql} | 0 ...t_fact_monthly_device_energy_consumed.sql} | 0 ...urly_energy_consumed_insert_statements.sql | 135 ------------------ 4 files changed, 135 deletions(-) rename libs/common/src/sql/procedures/fact_device_energy_consumed/{fact_daily_device_energy_consumed_procedure.sql => procedure_insert_fact_daily_device_energy_consumed.sql} (100%) rename libs/common/src/sql/procedures/fact_device_energy_consumed/{fact_hourly_device_energy_consumed_procedure.sql => procedure_insert_fact_hourly_device_energy_consumed.sql} (100%) rename libs/common/src/sql/procedures/fact_device_energy_consumed/{fact_monthly_device_energy_consumed_procedure.sql => procedure_insert_fact_monthly_device_energy_consumed.sql} (100%) delete mode 100644 libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed_insert_statements.sql 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/procedure_insert_fact_daily_device_energy_consumed.sql similarity index 100% rename from libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql rename to libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_fact_daily_device_energy_consumed.sql 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/procedure_insert_fact_hourly_device_energy_consumed.sql similarity index 100% rename from libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql rename to libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_fact_hourly_device_energy_consumed.sql 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/procedure_insert_fact_monthly_device_energy_consumed.sql similarity index 100% rename from libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql rename to libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_fact_monthly_device_energy_consumed.sql diff --git a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed_insert_statements.sql b/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed_insert_statements.sql deleted file mode 100644 index fd0d955..0000000 --- a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed_insert_statements.sql +++ /dev/null @@ -1,135 +0,0 @@ -WITH total_energy AS ( - SELECT - log.device_id, - log.event_time::date AS date, - 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 - FROM "device-status-log" log - WHERE log.code = 'EnergyConsumed' - GROUP BY 1,2,3,4,5 -), - -energy_phase_A AS ( - SELECT - log.device_id, - log.event_time::date AS date, - 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 - FROM "device-status-log" log - WHERE log.code = 'EnergyConsumedA' - GROUP BY 1,2,3,4,5 -), - -energy_phase_B AS ( - SELECT - log.device_id, - log.event_time::date AS date, - 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 - FROM "device-status-log" log - WHERE log.code = 'EnergyConsumedB' - GROUP BY 1,2,3,4,5 -), - -energy_phase_C AS ( - SELECT - log.device_id, - log.event_time::date AS date, - 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 - FROM "device-status-log" log - WHERE log.code = 'EnergyConsumedC' - GROUP BY 1,2,3,4,5 -) -, final_data as ( -SELECT - t.device_id, - t.date, - t.event_year::text, - t.event_month, - t.hour, - (t.max_value - t.min_value) AS energy_consumed_kW, - (a.max_value - a.min_value) AS energy_consumed_A, - (b.max_value - b.min_value) AS energy_consumed_B, - (c.max_value - c.min_value) AS energy_consumed_C -FROM total_energy t -JOIN energy_phase_A a ON t.device_id = a.device_id AND t.date = a.date AND t.hour = a.hour -JOIN energy_phase_B b ON t.device_id = b.device_id AND t.date = b.date AND t.hour = b.hour -JOIN energy_phase_C c ON t.device_id = c.device_id AND t.date = c.date AND t.hour = c.hour -ORDER BY 1,2) - - -INSERT INTO public."power-clamp-energy-consumed-daily"( - device_uuid, - energy_consumed_kw, - energy_consumed_a, - energy_consumed_b, - energy_consumed_c, - date -) - -SELECT - device_id, - SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR, - date -FROM final_data -GROUP BY device_id, date; - - - -INSERT INTO public."power-clamp-energy-consumed-hourly"( - device_uuid, - energy_consumed_kw, - energy_consumed_a, - energy_consumed_b, - energy_consumed_c, - date, - hour -) - -SELECT - device_id, - SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR, - date, - hour -FROM final_data -GROUP BY 1,6,7 - - -INSERT INTO public."power-clamp-energy-consumed-monthly"( - device_uuid, - energy_consumed_kw, - energy_consumed_a, - energy_consumed_b, - energy_consumed_c, - month -) - -SELECT - device_id, - SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR, - SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR, - TO_CHAR(date, 'MM-YYYY') - FROM final_data -GROUP BY 1,6; -