From 14b7f4ab6b5f83b16c4eca4c974c5559f7c2e493 Mon Sep 17 00:00:00 2001
From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com>
Date: Mon, 9 Jun 2025 15:24:18 +0300
Subject: [PATCH] hot fix of occupancy

---
 ...procedure_insert_all_daily_spacy_occupancy_duration.sql | 4 ++--
 .../procedure_update_daily_space_occupancy_duration.sql    | 4 +++-
 .../fact_daily_space_presence_duration.sql                 | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_insert_all_daily_spacy_occupancy_duration.sql b/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_insert_all_daily_spacy_occupancy_duration.sql
index d0bb0d4..96beac1 100644
--- a/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_insert_all_daily_spacy_occupancy_duration.sql
+++ b/libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_insert_all_daily_spacy_occupancy_duration.sql
@@ -20,8 +20,8 @@ presence_intervals AS (
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' 
-    AND prev_value = 'presence'
+  WHERE value <> 'none' 
+    AND prev_value = 'none'
     AND prev_time IS NOT NULL
 ),
 
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..df1bd55 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
@@ -24,7 +24,9 @@ presence_intervals AS (
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' AND prev_time IS NOT NULL
+  WHERE value = 'none' 
+  and prev_value <>'none'
+  AND prev_time IS NOT NULL
 ),
 
 split_intervals AS (
diff --git a/libs/common/src/sql/queries/fact_daily_space_presence_duration/fact_daily_space_presence_duration.sql b/libs/common/src/sql/queries/fact_daily_space_presence_duration/fact_daily_space_presence_duration.sql
index 74e20c6..15d9702 100644
--- a/libs/common/src/sql/queries/fact_daily_space_presence_duration/fact_daily_space_presence_duration.sql
+++ b/libs/common/src/sql/queries/fact_daily_space_presence_duration/fact_daily_space_presence_duration.sql
@@ -2,7 +2,7 @@ WITH presence_logs AS (
   SELECT 
     d.space_device_uuid AS space_id,
     l.device_id,
-    l.event_time,
+    l.event_time as start_time,
     l.value,
     LAG(l.event_time) OVER (PARTITION BY l.device_id ORDER BY l.event_time) AS prev_time,
     LAG(l.value) OVER (PARTITION BY l.device_id ORDER BY l.event_time) AS prev_value 
@@ -17,11 +17,12 @@ WITH presence_logs AS (
 presence_intervals AS (
   SELECT 
     space_id,
+    device_id,
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' 
-    AND prev_value = 'presence'
+  WHERE value <> 'none' 
+    AND prev_value = 'none'
     AND prev_time IS NOT NULL
 ),