From e019774f5848c84754519497d978afd878c5c3e3 Mon Sep 17 00:00:00 2001
From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com>
Date: Tue, 22 Apr 2025 16:55:07 +0300
Subject: [PATCH] type fixing

---
 .../fact_hourly_energy_consumed.sql                  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 c783a14..4d5cbc1 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
@@ -3,7 +3,7 @@ WITH params AS (
     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)  
     NULL::text AS event_month,      -- filter: MM-YYYY (or NULL for all)
-    NULL::int AS event_year,        -- filter: YYYY (or NULL for all)
+    NULL::text AS event_year,        -- filter: YYYY (or NULL for all)
     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)
 ),
@@ -24,7 +24,7 @@ total_energy AS (
       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)
       AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
-      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
+      AND (params.event_year IS NULL OR TO_CHAR(EXTRACT(YEAR FROM log.event_time), 'FM9999') = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -44,7 +44,7 @@ energy_phase_A AS (
       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)
       AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
-      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
+      AND (params.event_year IS NULL OR TO_CHAR(EXTRACT(YEAR FROM log.event_time), 'FM9999') = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -64,7 +64,7 @@ energy_phase_B AS (
       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)
       AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
-      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
+      AND (params.event_year IS NULL OR TO_CHAR(EXTRACT(YEAR FROM log.event_time), 'FM9999') = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -84,14 +84,14 @@ energy_phase_C AS (
       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)
       AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
-      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
+      AND (params.event_year IS NULL OR TO_CHAR(EXTRACT(YEAR FROM log.event_time), 'FM9999') = params.event_year)
     GROUP BY 1,2,3,4,5
 )
 
 SELECT 
     t.device_id,
     t.date,
-    t.event_year,
+    t.event_year::text,
     t.event_month,
     t.hour,
     (t.max_value - t.min_value) AS energy_consumed_kW,