From 7d8ed7768e8c7d8feba5904767827d86203502bc Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 23 May 2024 17:47:52 +0200 Subject: [PATCH 1/6] reordering some ids --- models/staging/core/stg_core__user.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/staging/core/stg_core__user.sql b/models/staging/core/stg_core__user.sql index c70a553..cbef85b 100644 --- a/models/staging/core/stg_core__user.sql +++ b/models/staging/core/stg_core__user.sql @@ -5,6 +5,9 @@ with stg_core__user as ( select {{ adapter.quote("Id") }} as id_user, + {{ adapter.quote("AccountTypeId") }} as id_account_type, + {{ adapter.quote("CreatedUserId") }} as id_created_user, + {{ adapter.quote("BillingCountryId") }} as id_billing_country, {{ adapter.quote("Code") }} as user_code, {{ adapter.quote("Email") }} as email, {{ adapter.quote("Title") }} as title, @@ -21,13 +24,10 @@ with cast({{ adapter.quote("DateOfBirth") }} as date) as date_of_birth, {{ adapter.quote("PhoneNumber") }} as phone_number, {{ adapter.quote("PasswordHash") }} as password_hash, - {{ adapter.quote("AccountTypeId") }} as id_account_type, - {{ adapter.quote("CreatedUserId") }} as id_created_user, {{ adapter.quote("SecurityStamp") }} as security_stamp, {{ adapter.quote("EmailConfirmed") }} as is_email_confirmed, {{ adapter.quote("LockoutEnabled") }} as is_lockout_enabled, {{ adapter.quote("BillingPostcode") }} as billing_postcode, - {{ adapter.quote("BillingCountryId") }} as id_billing_country, {{ adapter.quote("TwoFactorEnabled") }} as is_twofactor_enabled, {{ adapter.quote("AccessFailedCount") }} as access_failed_count, {{ adapter.quote("LockoutEndDateUtc") }} as lockout_end_date_utc, From 558844494333cbaf125e72b09092566da49c7933 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 23 May 2024 17:49:41 +0200 Subject: [PATCH 2/6] add account currency id to User model --- models/staging/core/stg_core__user.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/models/staging/core/stg_core__user.sql b/models/staging/core/stg_core__user.sql index cbef85b..9e72d2d 100644 --- a/models/staging/core/stg_core__user.sql +++ b/models/staging/core/stg_core__user.sql @@ -8,6 +8,7 @@ with {{ adapter.quote("AccountTypeId") }} as id_account_type, {{ adapter.quote("CreatedUserId") }} as id_created_user, {{ adapter.quote("BillingCountryId") }} as id_billing_country, + {{ adapter.quote("AccountCurrencyId") }} as id_account_currency, {{ adapter.quote("Code") }} as user_code, {{ adapter.quote("Email") }} as email, {{ adapter.quote("Title") }} as title, From 69f11c5d4a1220822da4c4f38192290c9b9e0c9d Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 23 May 2024 17:50:08 +0200 Subject: [PATCH 3/6] propagate id account currency --- models/intermediate/core/int_core__unified_user.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/models/intermediate/core/int_core__unified_user.sql b/models/intermediate/core/int_core__unified_user.sql index b117d32..313ef65 100644 --- a/models/intermediate/core/int_core__unified_user.sql +++ b/models/intermediate/core/int_core__unified_user.sql @@ -3,6 +3,7 @@ with stg_core__superhog_user as (select * from {{ ref("stg_core__superhog_user") }}) select id_user, + id_account_currency, user_code, first_name, last_name, From 322fcb8eb08233c5ba4e0c559a0d272dc3377ca0 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 23 May 2024 17:51:04 +0200 Subject: [PATCH 4/6] add id account type to int model --- models/intermediate/core/int_core__unified_user.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/intermediate/core/int_core__unified_user.sql b/models/intermediate/core/int_core__unified_user.sql index 313ef65..7c475e5 100644 --- a/models/intermediate/core/int_core__unified_user.sql +++ b/models/intermediate/core/int_core__unified_user.sql @@ -3,6 +3,8 @@ with stg_core__superhog_user as (select * from {{ ref("stg_core__superhog_user") }}) select id_user, + id_account_type, + id_billing_country, id_account_currency, user_code, first_name, From 9c293e8bf45ce55245635c3cccfd7843f59e985f Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Fri, 24 May 2024 11:32:54 +0200 Subject: [PATCH 5/6] add currency source and stg --- models/staging/core/_core_sources.yml | 2 ++ models/staging/core/stg_core__currency.sql | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 models/staging/core/stg_core__currency.sql diff --git a/models/staging/core/_core_sources.yml b/models/staging/core/_core_sources.yml index cf19d2c..f680cad 100644 --- a/models/staging/core/_core_sources.yml +++ b/models/staging/core/_core_sources.yml @@ -199,4 +199,6 @@ sources: identifier: PricePlanToUser - name: PricePlanChargedByType identifier: PricePlanChargedByType + - name: Currency + identifier: Currency diff --git a/models/staging/core/stg_core__currency.sql b/models/staging/core/stg_core__currency.sql new file mode 100644 index 0000000..102a309 --- /dev/null +++ b/models/staging/core/stg_core__currency.sql @@ -0,0 +1,14 @@ +with + raw_currency as (select * from {{ source("core", "Currency") }}), + stg_core__currency as ( + select + {{ adapter.quote("Id") }} as id_currency, + {{ adapter.quote("Name") }} as currency_name, + {{ adapter.quote("IsoCode") }} as iso4217_code, + {{ adapter.quote("DisplayOrder") }} as display_order, + {{ adapter.quote("_airbyte_extracted_at") }} as dwh_extract_at_utc + + from raw_currency + ) +select * +from stg_core__currency From 90f67d63217f777749bdea7236f6cffbb41ac7b9 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Fri, 24 May 2024 11:54:40 +0200 Subject: [PATCH 6/6] include currency in unified user --- models/intermediate/core/int_core__unified_user.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/models/intermediate/core/int_core__unified_user.sql b/models/intermediate/core/int_core__unified_user.sql index 7c475e5..36616a7 100644 --- a/models/intermediate/core/int_core__unified_user.sql +++ b/models/intermediate/core/int_core__unified_user.sql @@ -1,11 +1,12 @@ with stg_core__user as (select * from {{ ref("stg_core__user") }}), - stg_core__superhog_user as (select * from {{ ref("stg_core__superhog_user") }}) + stg_core__superhog_user as (select * from {{ ref("stg_core__superhog_user") }}), + stg_core__currency as (select * from {{ ref("stg_core__currency") }}) select id_user, id_account_type, id_billing_country, - id_account_currency, + c.iso4217_code as account_currency_iso4217, user_code, first_name, last_name, @@ -41,3 +42,4 @@ select id_user_verification_status from stg_core__user as u inner join stg_core__superhog_user as su on u.id_user = su.id_superhoguser +left join stg_core__currency c on u.id_account_currency = c.id_currency