diff --git a/models/core_/dim__orgs.sql b/models/core_/dim__orgs.sql index 7107e58f..3beb314d 100644 --- a/models/core_/dim__orgs.sql +++ b/models/core_/dim__orgs.sql @@ -1,18 +1,18 @@ WITH orgs AS ( --prod - SELECT - org_id - , MIN(event_timestamp) AS created_at - FROM {{ ref('signed__in') }} - GROUP BY 1 - --- --dev -- SELECT --- org_id --- , org_name --- , employee_range --- , created_at --- FROM {{ ref('org__created') }} +-- org_id +-- , MIN(event_timestamp) AS created_at +-- FROM {{ ref('signed__in') }} +-- GROUP BY 1 + + --dev + SELECT + org_id + , org_name + , employee_range + , created_at + FROM {{ ref('org__created') }} ) , user_count AS ( @@ -36,10 +36,11 @@ WITH orgs AS ( SELECT orgs.org_id , created_at - , num_users + , case when num_users > 4 then 4 else num_users end as num_users , sub_created_at - , sub_plan - , sub_price + , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan + , case when sub_price = 99 then 101 else sub_price end as sub_price FROM orgs LEFT JOIN user_count on orgs.org_id = user_count.org_id LEFT JOIN subscriptions on orgs.org_id = subscriptions.org_id + diff --git a/models/syncs_/sales__sync.sql b/models/syncs_/sales__sync.sql index 88003284..c79c3ab0 100644 --- a/models/syncs_/sales__sync.sql +++ b/models/syncs_/sales__sync.sql @@ -10,7 +10,7 @@ WITH org_events AS ( , b.activity FROM {{ ref('dim__orgs') }} a LEFT JOIN {{ ref('feature__used') }} b on a.org_id = b.org_id - WHERE sub_plan IS NULL + WHERE sub_plan IS NULL or sub_plan = 'Individual' ) , final AS (