From 000b42c6233edc19fcbf2868646deb94d0f7c9ef Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Mon, 22 Apr 2024 07:07:51 -0700 Subject: [PATCH 1/6] update dim_orgs and sales_sync --- models/core/dim_orgs.sql | 11 ++++++----- models/syncs/sales_sync.sql | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql index a2fc2f65..5d2262d1 100644 --- a/models/core/dim_orgs.sql +++ b/models/core/dim_orgs.sql @@ -2,9 +2,10 @@ WITH orgs AS ( --prod SELECT org_id - , MIN(event_timestamp) AS created_at - FROM {{ ref('signed_in') }} - GROUP BY 1 + , org_name + , employee_range + , created_at + FROM {{ ref('org_created') }} -- --dev -- SELECT @@ -28,7 +29,7 @@ WITH orgs AS ( org_id , event_timestamp AS sub_created_at , plan as sub_plan - , price as sub_price + , coalesce(price, 0) as sub_price FROM {{ ref('subscription_created') }} ) @@ -38,7 +39,7 @@ SELECT , created_at , num_users , sub_created_at - , sub_plan + , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan , sub_price FROM orgs LEFT JOIN user_count USING (org_id) diff --git a/models/syncs/sales_sync.sql b/models/syncs/sales_sync.sql index ff10d8c5..2567aacf 100644 --- a/models/syncs/sales_sync.sql +++ b/models/syncs/sales_sync.sql @@ -3,7 +3,7 @@ WITH org_events AS ( * FROM {{ ref('dim_orgs') }} LEFT JOIN {{ ref('feature_used') }} USING (org_id) - WHERE sub_plan IS NULL + WHERE sub_plan IS NULL or sub_plan = 'Individual' ) , final AS ( From 94f1e6f5acbfcf74123724dbf9ea2f5ebb8e1223 Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Mon, 22 Apr 2024 07:08:20 -0700 Subject: [PATCH 2/6] add 1 = 1 to dim_users --- models/core/dim_users.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/models/core/dim_users.sql b/models/core/dim_users.sql index 5fd0bd03..ef0867a8 100644 --- a/models/core/dim_users.sql +++ b/models/core/dim_users.sql @@ -7,3 +7,4 @@ WITH users AS ( SELECT user_id FROM users +WHERE 1 = 1 From 522e9192f3225cb87281b54582e7fdd61ee0db64 Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Tue, 23 Apr 2024 12:03:45 -0700 Subject: [PATCH 3/6] update dim_users --- models/core/dim_orgs.sql | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql index 5d2262d1..bcad6568 100644 --- a/models/core/dim_orgs.sql +++ b/models/core/dim_orgs.sql @@ -2,10 +2,9 @@ WITH orgs AS ( --prod SELECT org_id - , org_name - , employee_range - , created_at - FROM {{ ref('org_created') }} + , MIN(event_timestamp) AS created_at + FROM {{ ref('signed_in') }} + GROUP BY 1 -- --dev -- SELECT From 79d62d51109e787f57332597df789f07182de6ce Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Tue, 23 Apr 2024 12:26:58 -0700 Subject: [PATCH 4/6] update num_users --- models/core/dim_orgs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql index bcad6568..820120fa 100644 --- a/models/core/dim_orgs.sql +++ b/models/core/dim_orgs.sql @@ -36,7 +36,7 @@ WITH orgs AS ( SELECT org_id , created_at - , num_users + , case when num_users > 2 then 2 else num_users end as num_users , sub_created_at , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan , sub_price From f03eb2def9d10134e1f5d4b3202927f75a97254e Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Tue, 23 Apr 2024 12:32:50 -0700 Subject: [PATCH 5/6] update sub_price --- models/core/dim_orgs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql index 820120fa..22998396 100644 --- a/models/core/dim_orgs.sql +++ b/models/core/dim_orgs.sql @@ -39,7 +39,7 @@ SELECT , case when num_users > 2 then 2 else num_users end as num_users , sub_created_at , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan - , sub_price + , case when sub_price = 99 then 100 else sub_price end as sub_orice FROM orgs LEFT JOIN user_count USING (org_id) LEFT JOIN subscriptions USING (org_id) From 9df55af4b2e35340bdb12ad0bfc71993095a56fd Mon Sep 17 00:00:00 2001 From: leoebfolsom Date: Tue, 23 Apr 2024 12:34:41 -0700 Subject: [PATCH 6/6] fix typo --- models/core/dim_orgs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql index 22998396..ab6946b2 100644 --- a/models/core/dim_orgs.sql +++ b/models/core/dim_orgs.sql @@ -39,7 +39,7 @@ SELECT , case when num_users > 2 then 2 else num_users end as num_users , sub_created_at , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan - , case when sub_price = 99 then 100 else sub_price end as sub_orice + , case when sub_price = 99 then 100 else sub_price end as sub_price FROM orgs LEFT JOIN user_count USING (org_id) LEFT JOIN subscriptions USING (org_id)