Switch from org name to org id because of duplicate names (singer-io#94)

dialoguemd-archives · Nov 30, 2018 · b1e4528 · b1e4528
1 parent 1ad3b3e
commit b1e4528
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/models/meta/medops/medops_video_rate_by_org_monthly.sql b/models/meta/medops/medops_video_rate_by_org_monthly.sql
@@ -22,6 +22,7 @@ with videos as (
 
 select paid_employees_monthly.date_month
     , paid_employees_monthly.organization_name
+    , paid_employees_monthly.organization_id
     , paid_employees_monthly.account_name
     , coalesce(paid_employees_monthly.count_paid_employees, 0)
         as count_paid_employees
@@ -36,9 +37,10 @@ select paid_employees_monthly.date_month
     , case
         when count_paid_employees <> 0
         then coalesce(videos.count_videos, 0)::float / count_paid_employees
+        else 0
     end as video_rate
 from paid_employees_monthly
-left join videos using (date_month, organization_name)
+left join videos using (date_month, organization_id)
 left join ubi_consults
     on paid_employees_monthly.date_month = ubi_consults.date_month
     and paid_employees_monthly.organization_name

diff --git a/models/meta/medops/schema.yml b/models/meta/medops/schema.yml
@@ -176,7 +176,7 @@ models:
         - name: date_month
           tests:
               - not_null
-        - name: organization_name
+        - name: organization_id
           tests:
               - not_null
         - name: count_paid_employees
@@ -190,7 +190,7 @@ models:
               - not_null
     tests:
         - unique:
-            column_name: "concat(date_month, organization_name)"
+            column_name: "concat(date_month, organization_id)"
 
   - name: medops_video_cost_monthly
     columns:
@@ -207,7 +207,7 @@ models:
         - name: date_month
           tests:
               - not_null
-        - name: organization_name
+        - name: organization_id
           tests:
               - not_null
         - name: count_paid_employees
@@ -218,22 +218,22 @@ models:
               - not_null
     tests:
         - unique:
-            column_name: "concat(date_month, organization_name)"
+            column_name: "concat(date_month, organization_id)"
 
   - name: medops_videos_by_org_monthly
     columns:
         - name: date_month
           tests:
               - not_null
-        - name: organization_name
+        - name: organization_id
           tests:
               - not_null
         - name: count_videos
           tests:
               - not_null
     tests:
         - unique:
-            column_name: "concat(date_month, organization_name)"
+            column_name: "concat(date_month, organization_id)"
 
   - name: medops_gm1_weekly
     columns:

diff --git a/models/meta/table/schema.yml b/models/meta/table/schema.yml
@@ -57,6 +57,20 @@ models:
         tests:
           - not_null
 
+  - name: organizations_monthly
+    columns:
+      - name: date_month
+        tests:
+          - not_null
+      - name: organization_name
+        tests:
+          - not_null
+
+    tests:
+      - unique:
+          column_name: "concat(date_month, organization_id)"
+
+
   - name: meta_accounts_monthly
     columns:
       - name: account_id

diff --git a/models/meta/users/schema.yaml b/models/meta/users/schema.yaml
diff --git a/models/meta/users/schema.yml b/models/meta/users/schema.yml
@@ -0,0 +1,14 @@
+version: 2
+
+models:
+  - name: users_paid_employees_monthly
+    columns:
+        - name: organization_id
+          tests:
+              - not_null
+        - name: date_month
+          tests:
+              - not_null
+    tests:
+      - unique:
+          column_name: "concat(date_month, organization_id)"