From 0f5eb5fba2365320fe5dcf11d1e1ce644318b662 Mon Sep 17 00:00:00 2001
From: Joaquin Ossa <joaquin.ossa@superhog.com>
Date: Tue, 26 Nov 2024 10:16:08 +0100
Subject: [PATCH] Addressed comments

---
 macros/tests/kpis_outlier_detector.sql                   | 9 ++++++---
 .../kpis/int_kpis__product_guest_daily_metrics.sql       | 4 ++--
 models/intermediate/kpis/schema.yml                      | 4 ++--
 .../reporting/kpis/kpis__product_guest_daily_metrics.sql | 4 ++--
 models/reporting/kpis/schema.yml                         | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/macros/tests/kpis_outlier_detector.sql b/macros/tests/kpis_outlier_detector.sql
index 1c97be4..0f100a5 100644
--- a/macros/tests/kpis_outlier_detector.sql
+++ b/macros/tests/kpis_outlier_detector.sql
@@ -4,7 +4,7 @@
     with
         -- Retrieve recent data based on the defined days_to_consider
         recent_data as (
-            select *
+            select date_day, {{ column_name }}
             from {{ model }}
             where
                 date_day between (
@@ -20,8 +20,11 @@
         outliers as (
             select
                 {{ column_name }} as value,
-                abs({{ column_name }} - metrics_stats.avg_value)
-                > (metrics_stats.stddev_value * {{ sigma_threshold }}) as is_outlier
+                (abs({{ column_name }} - metrics_stats.avg_value))
+                / (metrics_stats.stddev_value) as absolute_deviation_z_score,
+                (abs({{ column_name }} - metrics_stats.avg_value))
+                / (metrics_stats.stddev_value)
+                > {{ sigma_threshold }} as is_outlier
             from {{ model }}
             cross join metrics_stats
             where date_day = current_date - interval '1 day'
diff --git a/models/intermediate/kpis/int_kpis__product_guest_daily_metrics.sql b/models/intermediate/kpis/int_kpis__product_guest_daily_metrics.sql
index d30c291..fd69444 100644
--- a/models/intermediate/kpis/int_kpis__product_guest_daily_metrics.sql
+++ b/models/intermediate/kpis/int_kpis__product_guest_daily_metrics.sql
@@ -93,7 +93,7 @@ select
     sum(gk.created_guest_journeys) as created_guest_journeys,
     sum(gk.started_guest_journeys) as started_guest_journeys,
     sum(gk.completed_guest_journeys) as completed_guest_journeys,
-    sum(gk.count_csat_score) as count_csat_score,
+    sum(gk.count_csat_score) as total_csat_score_count,
     case
         when sum(gk.count_csat_score) > 0
         then sum(gk.average_csat_score * gk.count_csat_score) / sum(gk.count_csat_score)
@@ -115,7 +115,7 @@ select
     sum(gk_py.created_guest_journeys) as py_created_guest_journeys,
     sum(gk_py.started_guest_journeys) as py_started_guest_journeys,
     sum(gk_py.completed_guest_journeys) as py_completed_guest_journeys,
-    sum(gk_py.count_csat_score) as py_count_csat_score,
+    sum(gk_py.count_csat_score) as py_total_csat_score_count,
     case
         when sum(gk_py.count_csat_score) > 0
         then
diff --git a/models/intermediate/kpis/schema.yml b/models/intermediate/kpis/schema.yml
index 85cdf31..78bbefa 100644
--- a/models/intermediate/kpis/schema.yml
+++ b/models/intermediate/kpis/schema.yml
@@ -5180,7 +5180,7 @@ models:
           Count of daily guest journeys completed in a given date and
            per specified dimension.
 
-      - name: count_csat_score
+      - name: total_csat_score_count
         data_type: bigint
         description: |
           Count of daily guest journeys with CSAT (customer satisfaction score)
@@ -5251,7 +5251,7 @@ models:
           Count of daily guest journeys completed on the same date in the previous year, 
           segmented by the specified dimension.
 
-      - name: py_count_csat_score
+      - name: py_total_csat_score_count
         data_type: bigint
         description: |
           Count of daily guest journeys with CSAT (customer satisfaction score) 
diff --git a/models/reporting/kpis/kpis__product_guest_daily_metrics.sql b/models/reporting/kpis/kpis__product_guest_daily_metrics.sql
index b9fbe42..b0878ef 100644
--- a/models/reporting/kpis/kpis__product_guest_daily_metrics.sql
+++ b/models/reporting/kpis/kpis__product_guest_daily_metrics.sql
@@ -15,7 +15,7 @@ select
     created_guest_journeys as created_guest_journeys,
     started_guest_journeys as started_guest_journeys,
     completed_guest_journeys as completed_guest_journeys,
-    count_csat_score as count_csat_score,
+    total_csat_score_count as total_csat_score_count,
     average_csat_score as average_csat_score,
     deposit_fees_in_gbp as deposit_fees_in_gbp,
     waiver_payments_in_gbp as waiver_payments_in_gbp,
@@ -28,7 +28,7 @@ select
     py_created_guest_journeys as py_created_guest_journeys,
     py_started_guest_journeys as py_started_guest_journeys,
     py_completed_guest_journeys as py_completed_guest_journeys,
-    py_count_csat_score as py_count_csat_score,
+    py_total_csat_score_count as py_total_csat_score_count,
     py_average_csat_score as py_average_csat_score,
     py_deposit_fees_in_gbp as py_deposit_fees_in_gbp,
     py_waiver_payments_in_gbp as py_waiver_payments_in_gbp,
diff --git a/models/reporting/kpis/schema.yml b/models/reporting/kpis/schema.yml
index 6acc28e..47cb078 100644
--- a/models/reporting/kpis/schema.yml
+++ b/models/reporting/kpis/schema.yml
@@ -109,7 +109,7 @@ models:
         tests:
           - kpis_outlier_detector
 
-      - name: count_csat_score
+      - name: total_csat_score_count
         data_type: bigint
         description: |
           Count of daily guest journeys with CSAT (customer satisfaction score)
@@ -190,7 +190,7 @@ models:
           Count of daily guest journeys completed on the same date in the previous year, 
           segmented by the specified dimension.
 
-      - name: py_count_csat_score
+      - name: py_total_csat_score_count
         data_type: bigint
         description: |
           Count of daily guest journeys with CSAT (customer satisfaction score)