Merge pull request #33 from fivetran/jr_working

deal-company
fivetran · Mar 22, 2021 · 49ea100 · 49ea100
2 parents 60f4395 + 31b4483
commit 49ea100
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/dbt_project.yml b/dbt_project.yml
@@ -3,10 +3,6 @@ version: '0.3.0'
 config-version: 2
 require-dbt-version: [">=0.18.0", "<0.20.0"]
 
-models:
-  hubspot:
-    +materialized: table
-    +schema: hubspot
 vars:
   hubspot:
     contact: "{{ ref('stg_hubspot__contact') }}"
@@ -18,6 +14,7 @@ vars:
     company_property_history: "{{ ref('stg_hubspot__company_property_history') }}"
 
     deal: "{{ ref('stg_hubspot__deal') }}"
+    deal_company: "{{ ref('stg_hubspot__deal_company') }}"
     deal_pipeline: "{{ ref('stg_hubspot__deal_pipeline') }}"
     deal_pipeline_stage: "{{ ref('stg_hubspot__deal_pipeline_stage') }}"
     deal_property_history: "{{ ref('stg_hubspot__deal_property_history') }}"
@@ -64,6 +61,7 @@ vars:
 models:
   hubspot:
     +materialized: table
+    +schema: hubspot
     marketing:
       intermediate:
         +materialized: ephemeral
diff --git a/models/marketing/hubspot__contact_lists.sql b/models/marketing/hubspot__contact_lists.sql
@@ -1,4 +1,5 @@
-{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_contact_list_enabled'])) }}
+
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled', 'hubspot_contact_list_enabled'])) }}
 
 with contact_lists as (
 

diff --git a/models/sales/hubspot__deals.sql b/models/sales/hubspot__deals.sql
@@ -20,6 +20,13 @@ with deals as (
     select *
     from {{ var('owner') }}
 
+{% if var('hubspot_company_enabled', True) %}
+), companies as (
+
+    select *
+    from {{ var('deal_company') }}
+{% endif %}
+
 ), deal_fields_joined as (
 
     select 
@@ -28,6 +35,11 @@ with deals as (
         pipeline_stages.pipeline_stage_label,
         owners.email_address as owner_email_address,
         owners.full_name as owner_full_name
+
+        {% if var('hubspot_company_enabled', True) %}
+        , companies.company_id
+        {% endif %}
+
     from deals
     left join pipelines
         using (deal_pipeline_id)
@@ -36,6 +48,11 @@ with deals as (
     left join owners
         using (owner_id)
 
+    {% if var('hubspot_company_enabled', True) %}
+    left join companies 
+        on deals.deal_id = companies.deal_id
+    {% endif %}
+
 {% if fivetran_utils.enabled_vars(['hubspot_engagement_enabled','hubspot_engagement_deal_enabled']) %}
 
 ), engagements as (

diff --git a/models/sales/sales.yml b/models/sales/sales.yml
@@ -58,6 +58,9 @@ models:
 
       - name: owner_full_name
         description: The full name of the deal's owner.
+
+      - name: company_id
+        description: ID of the deal's associated company.
 
 
   - name: hubspot__companies