From a85033922cafb2a2b308f5a03c9f4f7e822564f1 Mon Sep 17 00:00:00 2001
From: Joaquin <joaquin.ossa@truvi.com>
Date: Wed, 19 Mar 2025 16:50:19 +0100
Subject: [PATCH 1/2] Filtered test accounts

---
 models/intermediate/core/int_core__check_in_hero_users.sql      | 2 ++
 models/intermediate/core/int_core__screen_and_protect_users.sql | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/models/intermediate/core/int_core__check_in_hero_users.sql b/models/intermediate/core/int_core__check_in_hero_users.sql
index ef7588e..5399dc4 100644
--- a/models/intermediate/core/int_core__check_in_hero_users.sql
+++ b/models/intermediate/core/int_core__check_in_hero_users.sql
@@ -1,4 +1,5 @@
 {% set api_name = "CHECKINHEROAPI" %}
+{% set test_account = "TEST" %}
 
 with
     stg_core__apim_user as (select * from {{ ref("stg_core__apim_user") }}),
@@ -27,3 +28,4 @@ inner join
     and upper(aut.user_type_name) = '{{ api_name }}'
 inner join stg_core__user u on au.id_apim_user = u.id_user
 inner join stg_core__currency c on u.id_account_currency = c.id_currency
+where upper(au.json_document_user_data ->> 'AccountType') <> '{{ test_account }}'
diff --git a/models/intermediate/core/int_core__screen_and_protect_users.sql b/models/intermediate/core/int_core__screen_and_protect_users.sql
index d279445..bdc05e4 100644
--- a/models/intermediate/core/int_core__screen_and_protect_users.sql
+++ b/models/intermediate/core/int_core__screen_and_protect_users.sql
@@ -1,4 +1,5 @@
 {% set api_name = "SCREENANDPROTECTAPI" %}
+{% set test_account = "TEST" %}
 
 with
     stg_core__apim_user as (select * from {{ ref("stg_core__apim_user") }}),
@@ -46,3 +47,4 @@ inner join
     on au.id_apim_user_type = aut.id_apim_user_type
     and upper(aut.user_type_name) = '{{ api_name }}'
 inner join stg_core__user u on au.id_apim_user = u.id_user
+where upper(au.json_document_user_data ->> 'AccountType') <> '{{ test_account }}'

From d06f58b76e64f422cb7c1f0c8007e495e08ea7ae Mon Sep 17 00:00:00 2001
From: Joaquin <joaquin.ossa@truvi.com>
Date: Thu, 20 Mar 2025 09:30:33 +0100
Subject: [PATCH 2/2] Removed test users from staging

---
 models/intermediate/core/int_core__check_in_hero_users.sql     | 2 --
 .../intermediate/core/int_core__screen_and_protect_users.sql   | 2 --
 models/staging/core/stg_core__apim_user.sql                    | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/models/intermediate/core/int_core__check_in_hero_users.sql b/models/intermediate/core/int_core__check_in_hero_users.sql
index 5399dc4..ef7588e 100644
--- a/models/intermediate/core/int_core__check_in_hero_users.sql
+++ b/models/intermediate/core/int_core__check_in_hero_users.sql
@@ -1,5 +1,4 @@
 {% set api_name = "CHECKINHEROAPI" %}
-{% set test_account = "TEST" %}
 
 with
     stg_core__apim_user as (select * from {{ ref("stg_core__apim_user") }}),
@@ -28,4 +27,3 @@ inner join
     and upper(aut.user_type_name) = '{{ api_name }}'
 inner join stg_core__user u on au.id_apim_user = u.id_user
 inner join stg_core__currency c on u.id_account_currency = c.id_currency
-where upper(au.json_document_user_data ->> 'AccountType') <> '{{ test_account }}'
diff --git a/models/intermediate/core/int_core__screen_and_protect_users.sql b/models/intermediate/core/int_core__screen_and_protect_users.sql
index bdc05e4..d279445 100644
--- a/models/intermediate/core/int_core__screen_and_protect_users.sql
+++ b/models/intermediate/core/int_core__screen_and_protect_users.sql
@@ -1,5 +1,4 @@
 {% set api_name = "SCREENANDPROTECTAPI" %}
-{% set test_account = "TEST" %}
 
 with
     stg_core__apim_user as (select * from {{ ref("stg_core__apim_user") }}),
@@ -47,4 +46,3 @@ inner join
     on au.id_apim_user_type = aut.id_apim_user_type
     and upper(aut.user_type_name) = '{{ api_name }}'
 inner join stg_core__user u on au.id_apim_user = u.id_user
-where upper(au.json_document_user_data ->> 'AccountType') <> '{{ test_account }}'
diff --git a/models/staging/core/stg_core__apim_user.sql b/models/staging/core/stg_core__apim_user.sql
index af724d2..6a41a0b 100644
--- a/models/staging/core/stg_core__apim_user.sql
+++ b/models/staging/core/stg_core__apim_user.sql
@@ -1,3 +1,5 @@
+{% set test_account = "TEST" %}
+
 with
     raw_apim_user as (select * from {{ source("core", "ApimUser") }}),
     stg_core__apim_user as (
@@ -15,3 +17,4 @@ with
     )
 select *
 from stg_core__apim_user
+where upper(json_document_user_data ->> 'AccountType') <> '{{ test_account }}'