From cb5c82609e1a1b265f2b1939e900c346cff4aaa4 Mon Sep 17 00:00:00 2001
From: Leo Folsom <leoebfolsom@gmail.com>
Date: Tue, 22 Oct 2024 08:52:46 -0700
Subject: [PATCH 1/4] Update dim__orgs.sql

---
 models/core_/dim__orgs.sql | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/models/core_/dim__orgs.sql b/models/core_/dim__orgs.sql
index 7107e58f..67fc5385 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 (
@@ -34,12 +34,12 @@ WITH orgs AS (
 
 
 SELECT
-    orgs.org_id
+    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 100 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

From 5e1b87cacce2e7134f0956879a342a35012b7b07 Mon Sep 17 00:00:00 2001
From: Leo Folsom <leoebfolsom@gmail.com>
Date: Tue, 22 Oct 2024 08:57:25 -0700
Subject: [PATCH 2/4] Update sales__sync.sql

---
 models/syncs_/sales__sync.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 (

From d17845369e2e4170cbd613873badb745a7c402a6 Mon Sep 17 00:00:00 2001
From: Leo Folsom <leoebfolsom@gmail.com>
Date: Tue, 22 Oct 2024 09:01:27 -0700
Subject: [PATCH 3/4] Update dim__orgs.sql

---
 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 67fc5385..d97658a4 100644
--- a/models/core_/dim__orgs.sql
+++ b/models/core_/dim__orgs.sql
@@ -34,7 +34,7 @@ WITH orgs AS (
 
 
 SELECT
-    org_id
+    orgs.org_id
     , created_at
     , case when num_users > 4 then 4 else num_users end as num_users
     , sub_created_at

From 0525cd3bbb73f24bdbe55fa747c7ae408e43da5e Mon Sep 17 00:00:00 2001
From: Leo Folsom <leoebfolsom@gmail.com>
Date: Tue, 22 Oct 2024 09:49:30 -0700
Subject: [PATCH 4/4] Update dim__orgs.sql

---
 models/core_/dim__orgs.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/models/core_/dim__orgs.sql b/models/core_/dim__orgs.sql
index d97658a4..3beb314d 100644
--- a/models/core_/dim__orgs.sql
+++ b/models/core_/dim__orgs.sql
@@ -39,7 +39,8 @@ SELECT
     , case when num_users > 4 then 4 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_price
+    , 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
+