Tuva Data Model Change: Add person_id

ci_testing/dbt_project.yml

@@ -12,7 +12,7 @@ vars:
 
   ## Update these vars to use your own data as input, do not comment out
   # enabled logic has been added to the sources config
-  input_database: dev-ci-testing
+  input_database: dev_ci_testing
   input_schema: input_layer
 
   tuva_last_run: '{{ run_started_at.astimezone(modules.pytz.timezone("UTC")) }}'
@@ -62,14 +62,14 @@ dispatch:
 seeds:
   ci_testing:
     eligibility_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/tuva_synthetic_data','eligibility.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','eligibility.csv',headers=true) }}"
     lab_result_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/tuva_synthetic_data','lab_result.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','lab_result.csv',headers=true) }}"
     medical_claim_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/tuva_synthetic_data','medical_claim.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','medical_claim.csv',headers=true) }}"
     observation_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/tuva_synthetic_data','observation.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','observation.csv',headers=true) }}"
     pharmacy_claim_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/tuva_synthetic_data','pharmacy_claim.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','pharmacy_claim.csv',headers=true) }}"
     provider_attribution_seed:
-      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.12.0','provider_attribution.csv',headers=true) }}"
+      +post-hook: "{{ the_tuva_project.load_seed('tuva-public-resources/versioned_tuva_synthetic_data/0.13.0','provider_attribution.csv',headers=true) }}"

ci_testing/macros/quote_column.sql

@@ -0,0 +1,7 @@
+{% macro quote_column(column_name) %}
+    {%- if target.type == 'fabric' -%}
+        "{{ column_name }}"
+    {%- else -%}
+        {{ column_name }}
+    {%- endif -%}
+{% endmacro %}

ci_testing/models/condition.sql

@@ -1,6 +1,6 @@
-{% if target.type == 'fabric' %}
-select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
  cast(null as {{ dbt.type_string() }} ) as condition_id
+, cast(null as {{ dbt.type_string() }} ) as person_id
 , cast(null as {{ dbt.type_string() }} ) as patient_id
 , cast(null as {{ dbt.type_string() }} ) as encounter_id
 , cast(null as {{ dbt.type_string() }} ) as claim_id
@@ -19,28 +19,7 @@ select top 0
 , cast(null as {{ dbt.type_string() }} ) as present_on_admit_code
 , cast(null as {{ dbt.type_string() }} ) as present_on_admit_description
 , cast(null as {{ dbt.type_string() }} ) as data_source
+, cast(null as {{ dbt.type_string() }} ) as file_name
+, cast(null as {{ dbt.type_timestamp() }} ) as ingest_datetime
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
- cast(null as {{ dbt.type_string() }} ) as condition_id
-, cast(null as {{ dbt.type_string() }} ) as patient_id
-, cast(null as {{ dbt.type_string() }} ) as encounter_id
-, cast(null as {{ dbt.type_string() }} ) as claim_id
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as recorded_date
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as onset_date
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as resolved_date
-, cast(null as {{ dbt.type_string() }} ) as status
-, cast(null as {{ dbt.type_string() }} ) as condition_type
-, cast(null as {{ dbt.type_string() }} ) as source_code_type
-, cast(null as {{ dbt.type_string() }} ) as source_code
-, cast(null as {{ dbt.type_string() }} ) as source_description
-, cast(null as {{ dbt.type_string() }} ) as normalized_code_type
-, cast(null as {{ dbt.type_string() }} ) as normalized_code
-, cast(null as {{ dbt.type_string() }} ) as normalized_description
-, cast(null as {{ dbt.type_int() }} ) as condition_rank
-, cast(null as {{ dbt.type_string() }} ) as present_on_admit_code
-, cast(null as {{ dbt.type_string() }} ) as present_on_admit_description
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}

ci_testing/models/encounter.sql

@@ -1,6 +1,6 @@
-{% if target.type == 'fabric' %}
-select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
 cast(null as {{ dbt.type_string() }} ) as encounter_id
+, cast(null as {{ dbt.type_string() }} ) as person_id
 , cast(null as {{ dbt.type_string() }} ) as patient_id
 , cast(null as {{ dbt.type_string() }} ) as encounter_type
 , {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as encounter_start_date
@@ -27,36 +27,7 @@ cast(null as {{ dbt.type_string() }} ) as encounter_id
 , cast(null as {{ dbt.type_float() }} ) as allowed_amount
 , cast(null as {{ dbt.type_float() }} ) as charge_amount
 , cast(null as {{ dbt.type_string() }} ) as data_source
+, cast(null as {{ dbt.type_string() }} ) as file_name
+, cast(null as {{ dbt.type_timestamp() }} ) as ingest_datetime
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
-cast(null as {{ dbt.type_string() }} ) as encounter_id
-, cast(null as {{ dbt.type_string() }} ) as patient_id
-, cast(null as {{ dbt.type_string() }} ) as encounter_type
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as encounter_start_date
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as encounter_end_date
-, cast(null as {{ dbt.type_int() }} ) as length_of_stay
-, cast(null as {{ dbt.type_string() }} ) as admit_source_code
-, cast(null as {{ dbt.type_string() }} ) as admit_source_description
-, cast(null as {{ dbt.type_string() }} ) as admit_type_code
-, cast(null as {{ dbt.type_string() }} ) as admit_type_description
-, cast(null as {{ dbt.type_string() }} ) as discharge_disposition_code
-, cast(null as {{ dbt.type_string() }} ) as discharge_disposition_description
-, cast(null as {{ dbt.type_string() }} ) as attending_provider_id
-, cast(null as {{ dbt.type_string() }} ) as attending_provider_name
-, cast(null as {{ dbt.type_string() }} ) as facility_id
-, cast(null as {{ dbt.type_string() }} ) as facility_name
-, cast(null as {{ dbt.type_string() }} ) as primary_diagnosis_code_type
-, cast(null as {{ dbt.type_string() }} ) as primary_diagnosis_code
-, cast(null as {{ dbt.type_string() }} ) as primary_diagnosis_description
-, cast(null as {{ dbt.type_string() }} ) as ms_drg_code
-, cast(null as {{ dbt.type_string() }} ) as ms_drg_description
-, cast(null as {{ dbt.type_string() }} ) as apr_drg_code
-, cast(null as {{ dbt.type_string() }} ) as apr_drg_description
-, cast(null as {{ dbt.type_float() }} ) as paid_amount
-, cast(null as {{ dbt.type_float() }} ) as allowed_amount
-, cast(null as {{ dbt.type_float() }} ) as charge_amount
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}

ci_testing/models/lab_result.sql

@@ -6,9 +6,9 @@ select * from {{ ref('lab_result_seed') }}
 
 {%- else -%}
 
-    {% if target.type == 'fabric' %}
-    select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
     cast(null as {{ dbt.type_string() }} ) as lab_result_id
+    , cast(null as {{ dbt.type_string() }} ) as person_id
     , cast(null as {{ dbt.type_string() }} ) as patient_id
     , cast(null as {{ dbt.type_string() }} ) as encounter_id
     , cast(null as {{ dbt.type_string() }} ) as accession_number
@@ -36,37 +36,6 @@ select * from {{ ref('lab_result_seed') }}
     , cast(null as {{ dbt.type_string() }} ) as ordering_practitioner_id
     , cast(null as {{ dbt.type_string() }} ) as data_source
     , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-    {% else %}
-    select
-    cast(null as {{ dbt.type_string() }} ) as lab_result_id
-    , cast(null as {{ dbt.type_string() }} ) as patient_id
-    , cast(null as {{ dbt.type_string() }} ) as encounter_id
-    , cast(null as {{ dbt.type_string() }} ) as accession_number
-    , cast(null as {{ dbt.type_string() }} ) as source_code_type
-    , cast(null as {{ dbt.type_string() }} ) as source_code
-    , cast(null as {{ dbt.type_string() }} ) as source_description
-    , cast(null as {{ dbt.type_string() }} ) as source_component
-    , cast(null as {{ dbt.type_string() }} ) as normalized_code_type
-    , cast(null as {{ dbt.type_string() }} ) as normalized_code
-    , cast(null as {{ dbt.type_string() }} ) as normalized_description
-    , cast(null as {{ dbt.type_string() }} ) as normalized_component
-    , cast(null as {{ dbt.type_string() }} ) as status
-    , cast(null as {{ dbt.type_string() }} ) as result
-    , {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as result_date
-    , {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as collection_date
-    , cast(null as {{ dbt.type_string() }} ) as source_units
-    , cast(null as {{ dbt.type_string() }} ) as normalized_units
-    , cast(null as {{ dbt.type_string() }} ) as source_reference_range_low
-    , cast(null as {{ dbt.type_string() }} ) as source_reference_range_high
-    , cast(null as {{ dbt.type_string() }} ) as normalized_reference_range_low
-    , cast(null as {{ dbt.type_string() }} ) as normalized_reference_range_high
-    , cast(null as {{ dbt.type_int() }} ) as source_abnormal_flag
-    , cast(null as {{ dbt.type_int() }} ) as normalized_abnormal_flag
-    , cast(null as {{ dbt.type_string() }} ) as specimen
-    , cast(null as {{ dbt.type_string() }} ) as ordering_practitioner_id
-    , cast(null as {{ dbt.type_string() }} ) as data_source
-    , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-    limit 0
-    {%- endif %}
+    {% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}
 
 {%- endif %}

ci_testing/models/location.sql

@@ -1,5 +1,4 @@
-{% if target.type == 'fabric' %}
-select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
 cast(null as {{ dbt.type_string() }} ) as location_id
 , cast(null as {{ dbt.type_string() }} ) as npi
 , cast(null as {{ dbt.type_string() }} ) as name
@@ -13,20 +12,4 @@ cast(null as {{ dbt.type_string() }} ) as location_id
 , cast(null as {{ dbt.type_float() }} ) as longitude
 , cast(null as {{ dbt.type_string() }} ) as data_source
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
-cast(null as {{ dbt.type_string() }} ) as location_id
-, cast(null as {{ dbt.type_string() }} ) as npi
-, cast(null as {{ dbt.type_string() }} ) as name
-, cast(null as {{ dbt.type_string() }} ) as facility_type
-, cast(null as {{ dbt.type_string() }} ) as parent_organization
-, cast(null as {{ dbt.type_string() }} ) as address
-, cast(null as {{ dbt.type_string() }} ) as city
-, cast(null as {{ dbt.type_string() }} ) as state
-, cast(null as {{ dbt.type_string() }} ) as zip_code
-, cast(null as {{ dbt.type_float() }} ) as latitude
-, cast(null as {{ dbt.type_float() }} ) as longitude
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}

ci_testing/models/medication.sql

@@ -1,6 +1,6 @@
-{% if target.type == 'fabric' %}
-select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
 cast(null as {{ dbt.type_string() }} ) as medication_id
+, cast(null as {{ dbt.type_string() }} ) as person_id
 , cast(null as {{ dbt.type_string() }} ) as patient_id
 , cast(null as {{ dbt.type_string() }} ) as encounter_id
 , {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as dispensing_date
@@ -22,29 +22,4 @@ cast(null as {{ dbt.type_string() }} ) as medication_id
 , cast(null as {{ dbt.type_string() }} ) as practitioner_id
 , cast(null as {{ dbt.type_string() }} ) as data_source
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
-cast(null as {{ dbt.type_string() }} ) as medication_id
-, cast(null as {{ dbt.type_string() }} ) as patient_id
-, cast(null as {{ dbt.type_string() }} ) as encounter_id
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as dispensing_date
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as prescribing_date
-, cast(null as {{ dbt.type_string() }} ) as source_code_type
-, cast(null as {{ dbt.type_string() }} ) as source_code
-, cast(null as {{ dbt.type_string() }} ) as source_description
-, cast(null as {{ dbt.type_string() }} ) as ndc_code
-, cast(null as {{ dbt.type_string() }} ) as ndc_description
-, cast(null as {{ dbt.type_string() }} ) as rxnorm_code
-, cast(null as {{ dbt.type_string() }} ) as rxnorm_description
-, cast(null as {{ dbt.type_string() }} ) as atc_code
-, cast(null as {{ dbt.type_string() }} ) as atc_description
-, cast(null as {{ dbt.type_string() }} ) as route
-, cast(null as {{ dbt.type_string() }} ) as strength
-, cast(null as {{ dbt.type_int() }} ) as quantity
-, cast(null as {{ dbt.type_string() }} ) as quantity_unit
-, cast(null as {{ dbt.type_int() }} ) as days_supply
-, cast(null as {{ dbt.type_string() }} ) as practitioner_id
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}

ci_testing/models/observation.sql

@@ -6,9 +6,9 @@ select * from {{ ref('observation_seed') }}
 
 {%- else -%}
 
-{% if target.type == 'fabric' %}
-    select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
     cast(null as {{ dbt.type_string() }} ) as observation_id
+    , cast(null as {{ dbt.type_string() }} ) as person_id
     , cast(null as {{ dbt.type_string() }} ) as patient_id
     , cast(null as {{ dbt.type_string() }} ) as encounter_id
     , cast(null as {{ dbt.type_string() }} ) as panel_id
@@ -29,30 +29,6 @@ select * from {{ ref('observation_seed') }}
     , cast(null as {{ dbt.type_string() }} ) as normalized_reference_range_high
     , cast(null as {{ dbt.type_string() }} ) as data_source
     , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-    {% else %}
-    select
-    cast(null as {{ dbt.type_string() }} ) as observation_id
-    , cast(null as {{ dbt.type_string() }} ) as patient_id
-    , cast(null as {{ dbt.type_string() }} ) as encounter_id
-    , cast(null as {{ dbt.type_string() }} ) as panel_id
-    , {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as observation_date
-    , cast(null as {{ dbt.type_string() }} ) as observation_type
-    , cast(null as {{ dbt.type_string() }} ) as source_code_type
-    , cast(null as {{ dbt.type_string() }} ) as source_code
-    , cast(null as {{ dbt.type_string() }} ) as source_description
-    , cast(null as {{ dbt.type_string() }} ) as normalized_code_type
-    , cast(null as {{ dbt.type_string() }} ) as normalized_code
-    , cast(null as {{ dbt.type_string() }} ) as normalized_description
-    , cast(null as {{ dbt.type_string() }} ) as result
-    , cast(null as {{ dbt.type_string() }} ) as source_units
-    , cast(null as {{ dbt.type_string() }} ) as normalized_units
-    , cast(null as {{ dbt.type_string() }} ) as source_reference_range_low
-    , cast(null as {{ dbt.type_string() }} ) as source_reference_range_high
-    , cast(null as {{ dbt.type_string() }} ) as normalized_reference_range_low
-    , cast(null as {{ dbt.type_string() }} ) as normalized_reference_range_high
-    , cast(null as {{ dbt.type_string() }} ) as data_source
-    , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-    limit 0
-    {% endif %}
+    {% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}
 
 {%- endif %}

ci_testing/models/patient.sql

@@ -1,6 +1,6 @@
-{% if target.type == 'fabric' %}
-select top 0
-cast(null as {{ dbt.type_string() }} ) as patient_id
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
+cast(null as {{ dbt.type_string() }} ) as person_id
+, cast(null as {{ dbt.type_string() }} ) as patient_id
 , cast(null as {{ dbt.type_string() }} ) as first_name
 , cast(null as {{ dbt.type_string() }} ) as last_name
 , cast(null as {{ dbt.type_string() }} ) as sex
@@ -16,27 +16,7 @@ cast(null as {{ dbt.type_string() }} ) as patient_id
 , cast(null as {{ dbt.type_string() }} ) as county
 , cast(null as {{ dbt.type_float() }} ) as latitude
 , cast(null as {{ dbt.type_float() }} ) as longitude
+, cast(null as {{ dbt.type_string() }}) as phone
 , cast(null as {{ dbt.type_string() }} ) as data_source
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
-cast(null as {{ dbt.type_string() }} ) as patient_id
-, cast(null as {{ dbt.type_string() }} ) as first_name
-, cast(null as {{ dbt.type_string() }} ) as last_name
-, cast(null as {{ dbt.type_string() }} ) as sex
-, cast(null as {{ dbt.type_string() }} ) as race
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as birth_date
-, {{ try_to_cast_date('null', 'YYYY-MM-DD') }} as death_date
-, cast(null as {{ dbt.type_int() }} ) as death_flag
-, cast(null as {{ dbt.type_string() }} ) as social_security_number
-, cast(null as {{ dbt.type_string() }} ) as address
-, cast(null as {{ dbt.type_string() }} ) as city
-, cast(null as {{ dbt.type_string() }} ) as state
-, cast(null as {{ dbt.type_string() }} ) as zip_code
-, cast(null as {{ dbt.type_string() }} ) as county
-, cast(null as {{ dbt.type_float() }} ) as latitude
-, cast(null as {{ dbt.type_float() }} ) as longitude
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}

ci_testing/models/practitioner.sql

@@ -1,5 +1,4 @@
-{% if target.type == 'fabric' %}
-select top 0
+select {% if target.type == 'fabric' %} top 0 {% else %}{% endif %}
  cast(null as {{ dbt.type_string() }} ) as practitioner_id
 , cast(null as {{ dbt.type_string() }} ) as npi
 , cast(null as {{ dbt.type_string() }} ) as first_name
@@ -9,16 +8,4 @@ select top 0
 , cast(null as {{ dbt.type_string() }} ) as sub_specialty
 , cast(null as {{ dbt.type_string() }} ) as data_source
 , cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-{% else %}
-select
- cast(null as {{ dbt.type_string() }} ) as practitioner_id
-, cast(null as {{ dbt.type_string() }} ) as npi
-, cast(null as {{ dbt.type_string() }} ) as first_name
-, cast(null as {{ dbt.type_string() }} ) as last_name
-, cast(null as {{ dbt.type_string() }} ) as practice_affiliation
-, cast(null as {{ dbt.type_string() }} ) as specialty
-, cast(null as {{ dbt.type_string() }} ) as sub_specialty
-, cast(null as {{ dbt.type_string() }} ) as data_source
-, cast(null as {{ dbt.type_timestamp() }} ) as tuva_last_run
-limit 0
-{% endif %}
+{% if target.type == 'fabric' %} {% else %} limit 0 {% endif %}