removed dqi calendar; added column to reference data calendar and fix…

…ed refs
tuva-health · Jul 2, 2024 · c8544b7 · c8544b7
1 parent 09dd83b
commit c8544b7
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 43 deletions.
diff --git a/integration_tests/models/_integration_tests__models.yml b/integration_tests/models/_integration_tests__models.yml
@@ -6,98 +6,98 @@ models:
     description: Created from seed or source data depending on test_data_override variable.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_claims
+        {% else %}_tuva_claims{%- endif -%}
       tags: claims
-      materialized: table
+      materialized: ephemeral
 
   - name: medical_claim
     description: Created from seed or source data depending on test_data_override variable.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_claims
+        {% else %}_tuva_claims{%- endif -%}
       tags: claims
-      materialized: table
+      materialized: ephemeral
 
   - name: pharmacy_claim
     description: Created from seed or source data depending on test_data_override variable.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_claims
+        {% else %}_tuva_claims{%- endif -%}
       tags: claims
-      materialized: table
+      materialized: ephemeral
 
 # clinical input models
   - name: condition
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: encounter
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: lab_result
     description: Created from seed or source data depending on test_data_override variable.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: location
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: medication
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: observation
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: patient
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: practitioner
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
 
   - name: procedure
     description: Created using empty table logic.
     config:
       schema: |
-        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}input_layer
-        {% else %}input_layer{%- endif -%}
-      materialized: table
+        {%- if var('tuva_schema_prefix',None) != None -%}_{{var('tuva_schema_prefix')}}_tuva_clinical
+        {% else %}_tuva_clinical{%- endif -%}
+      materialized: ephemeral
diff --git a/models/data_quality/final/data_quality__quality_trend.sql b/models/data_quality/final/data_quality__quality_trend.sql
@@ -24,7 +24,7 @@ select
     , sum(DENOM)  as DENOM
     , '{{ var('tuva_last_run')}}' as tuva_last_run
 from cte
-left join {{ ref('data_quality__dqi_calendar') }} c on cte.source_date_type = c.full_date
+left join {{ ref('reference_data__calendar') }} c on cte.source_date_type = c.full_date
 group by
       c.first_day_of_month
     , summary_sk

diff --git a/models/data_quality/mart_review/final/mart_review__calendar_month.sql b/models/data_quality/mart_review/final/mart_review__calendar_month.sql
@@ -9,5 +9,5 @@ select distinct
 cast(year_month_int as varchar(6)) as year_month
 , full_date
 , '{{ var('tuva_last_run')}}' as tuva_last_run
-from {{ ref('data_quality__dqi_calendar') }} c
+from {{ ref('reference_data__calendar') }} c
 where day = 1
diff --git a/models/data_quality/mart_review/stage/mart_review__stg_medical_claim.sql b/models/data_quality/mart_review/stage/mart_review__stg_medical_claim.sql
@@ -7,4 +7,4 @@
 select mc.*,
 cast(c.year_month_int as varchar(6)) as year_month
 FROM {{ ref('core__medical_claim')}}  mc
-left join {{ ref('data_quality__dqi_calendar') }} c on coalesce(mc.claim_line_start_date,mc.claim_start_date) = c.full_date
+left join {{ ref('reference_data__calendar') }} c on coalesce(mc.claim_line_start_date,mc.claim_start_date) = c.full_date
diff --git a/models/data_quality/mart_review/stage/mart_review__stg_member_month.sql b/models/data_quality/mart_review/stage/mart_review__stg_member_month.sql
@@ -8,7 +8,7 @@ with cte as
 (
 select distinct year_month_int
 ,full_date
-from {{ ref('data_quality__dqi_calendar') }} c
+from {{ ref('reference_data__calendar') }} c
 where day = 1
 
 )

diff --git a/models/data_quality/mart_review/stage/mart_review__stg_pharmacy_claim.sql b/models/data_quality/mart_review/stage/mart_review__stg_pharmacy_claim.sql
@@ -7,4 +7,4 @@
 select mc.*,
 cast(c.year_month_int as varchar(6)) as year_month
 FROM {{ ref('core__pharmacy_claim')}}  mc
-left join {{ ref('data_quality__dqi_calendar') }} c on coalesce(mc.paid_date,mc.dispensing_date) = c.full_date
+left join {{ ref('reference_data__calendar') }} c on coalesce(mc.paid_date,mc.dispensing_date) = c.full_date
diff --git a/seeds/reference_data/reference_data.yml b/seeds/reference_data/reference_data.yml
@@ -52,6 +52,8 @@ seeds:
           {%- if target.type in ("bigquery", "databricks") -%} string {%- else -%} varchar {%- endif -%}
         first_day_of_month: date
         last_day_of_month: date
+        year_month_int: integer
+
     columns:
       - name: full_date
         description: 'The complete date.'

diff --git a/seeds/reference_data/reference_data__calendar.csv b/seeds/reference_data/reference_data__calendar.csv
@@ -1 +1 @@
-full_date,year,month,day,month_name,day_of_week_number,day_of_week_name,week_of_year,day_of_year,year_month,first_day_of_month,last_day_of_month
+full_date,year,month,day,month_name,day_of_week_number,day_of_week_name,week_of_year,day_of_year,year_month,first_day_of_month,last_day_of_month,year_month_int
diff --git a/seeds/value_sets/data_quality/data_quality__dqi_calendar.csv b/seeds/value_sets/data_quality/data_quality__dqi_calendar.csv