From d255e6811e89905491b6e02d83ab787408fa061a Mon Sep 17 00:00:00 2001
From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com>
Date: Wed, 25 Jun 2025 10:47:37 +0300
Subject: [PATCH] update procedures

---
 .../proceduce_update_daily_space_aqi.sql                  | 8 +++++---
 .../procedure_update_daily_space_occupancy_duration.sql   | 6 ++----
 .../procedure_update_fact_space_occupancy.sql             | 6 ++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql b/libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql
index 04fb661..aa2fa2a 100644
--- a/libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql
+++ b/libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql
@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
-      $2::uuid AS space_id
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
 ),
 
 -- Query Pipeline Starts Here
@@ -277,7 +276,10 @@ SELECT
   a.daily_avg_ch2o,a.daily_max_ch2o, a.daily_min_ch2o
 FROM daily_percentages p
 LEFT JOIN daily_averages a 
-  ON p.space_id = a.space_id AND p.event_date = a.event_date
+  ON p.space_id = a.space_id 
+  AND p.event_date = a.event_date
+JOIN params  
+    ON params.event_date = a.event_date
 ORDER BY p.space_id, p.event_date)
 
 
diff --git a/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql b/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql
index e669864..f2bd3da 100644
--- a/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql
+++ b/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql
@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
-      $2::uuid AS space_id
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
 ),
 
 presence_logs AS (
@@ -86,8 +85,7 @@ final_data AS (
     ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
   FROM summed_intervals s
   JOIN params p 
-    ON p.space_id = s.space_id 
-   AND p.event_date = s.event_date
+    ON p.event_date = s.event_date
 )
 
 INSERT INTO public."space-daily-occupancy-duration" (
diff --git a/libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql b/libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql
index cc727c0..ecf5ffc 100644
--- a/libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql
+++ b/libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql
@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
-      $2::uuid AS space_id
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
 ),
 
 device_logs AS (
@@ -87,8 +86,7 @@ SELECT summary.space_id,
        count_total_presence_detected
 FROM summary
 JOIN params P ON true
-where summary.space_id = P.space_id
-and (P.event_date IS NULL or summary.event_date::date = P.event_date)
+where (P.event_date IS NULL or summary.event_date::date = P.event_date)
 ORDER BY space_id, event_date)