Merge pull request #120 from fivetran/feature/add-ticket-end-models

ensure v3 endpoint has appropriate `_deleted` field

CHANGELOG.md

@@ -1,3 +1,23 @@
+# dbt_hubspot_source v0.13.0
+
+## 🚨 Breaking Changes 🚨
+- The `created_at` and `closed_at` fields in the below mentioned staging models have been renamed to `created_date` and `closed_date` respectively to be consistent with the source data. Additionally, this will ensure there are no duplicate column errors when passing through all `property_*` columns, which could potentially conflict with `property_created_at` or `property_closed_at` ([PR #119](https://github.com/fivetran/dbt_hubspot_source/pull/119)).
+  - `stg_hubspot__company`
+  - `stg_hubspot__contact`
+  - `stg_hubspot__deal`
+  - `stg_hubspot__ticket`
+
+## Features
+- Addition of the following variables to allow the disabling of the `*_property_history` models if they are not being leveraged. All variables are `true` by default ([PR #119](https://github.com/fivetran/dbt_hubspot_source/pull/119)).
+  - `hubspot_company_property_history_enabled`
+  - `hubspot_contact_property_history_enabled`
+  - `hubspot_deal_property_history_enabled`
+
+## Under the Hood
+- All `stg_hubspot__*_tmp` models have been updated to leverage the `dbt_utils.star()` macro. This ensures if the source dimension changes there is no potential for a mismatch in columns error that is commonly seen in Snowflake destinations ([PR #119](https://github.com/fivetran/dbt_hubspot_source/pull/119)).
+- Updates to the seed files and seed file configurations for the package integration tests to ensure updates are properly tested ([PR #119](https://github.com/fivetran/dbt_hubspot_source/pull/119)).
+- V3 of the Hubspot Service endpoint contains the field `_fivetran_deleted` in the `TICKET` table, whereas V2 has a field called `is_deleted`. Previously, the package only looked at `is_deleted`. Now, it will fold in `_fivetran_deleted` and coalesce it with `is_deleted` to more fully represent `is_ticket_deleted` ([PR #120](https://github.com/fivetran/dbt_hubspot_source/pull/120)).
+
 # dbt_hubspot_source v0.12.0
 ## 🚨 Breaking Changes 🚨
 - The following models now use a custom macro to remove the property_hs_ prefix in staging columns, while also preventing duplicates. If de-prefixed columns match existing ones (e.g., `property_hs_meeting_outcome` vs. `meeting_outcome`), the macro favors the `property_hs_`field, aligning with the latest HubSpot API update. ([PR #115](https://github.com/fivetran/dbt_hubspot_source/pull/115))

README.md

@@ -44,7 +44,7 @@ Include the following hubspot_source package version in your `packages.yml` file
 ```yaml
 packages:
   - package: fivetran/hubspot_source
-    version: [">=0.12.0", "<0.13.0"]
+    version: [">=0.13.0", "<0.14.0"]
 ```
 ## Step 3: Define database and schema variables
 By default, this package runs using your destination and the `hubspot` schema. If this is not where your HubSpot data is (for example, if your HubSpot schema is named `hubspot_fivetran`), add the following configuration to your root `dbt_project.yml` file:
@@ -67,6 +67,7 @@ vars:
   hubspot_contact_list_enabled: false                     # Disables contact list models
   hubspot_contact_list_member_enabled: false              # Disables contact list member models
   hubspot_contact_property_enabled: false                 # Disables the contact property models
+  hubspot_contact_property_history_enabled: false         # Disables the contact property history models
   hubspot_email_event_enabled: false                      # Disables all email_event models and functionality
   hubspot_email_event_bounce_enabled: false
   hubspot_email_event_click_enabled: false
@@ -88,9 +89,11 @@ vars:
 
   hubspot_sales_enabled: false                            # Disables all sales models
   hubspot_company_enabled: false
+  hubspot_company_property_history_enabled: false         # Disable the company property history models
   hubspot_deal_enabled: false
   hubspot_deal_company_enabled: false
   hubspot_deal_contact_enabled: false
+  hubspot_deal_property_history_enabled: false            # Disables the deal property history tables
   hubspot_engagement_enabled: false                       # Disables all engagement models and functionality
   hubspot_engagement_contact_enabled: false
   hubspot_engagement_company_enabled: false

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'hubspot_source'
-version: '0.12.0'
+version: '0.13.0'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 models:

integration_tests/ci/sample.profiles.yml

@@ -16,13 +16,13 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: hubspot_source_integration_tests_6
+      schema: hubspot_source_integration_tests_7
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: hubspot_source_integration_tests_6
+      schema: hubspot_source_integration_tests_7
       threads: 8
       keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}"
     snowflake:
@@ -33,7 +33,7 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: hubspot_source_integration_tests_6
+      schema: hubspot_source_integration_tests_7
       threads: 8
     postgres:
       type: postgres
@@ -42,13 +42,13 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: hubspot_source_integration_tests_6
+      schema: hubspot_source_integration_tests_7
       threads: 8
     databricks:
       catalog: null
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: hubspot_source_integration_tests_6
+      schema: hubspot_source_integration_tests_7
       threads: 8
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks

integration_tests/dbt_project.yml

@@ -1,12 +1,12 @@
 name: 'hubspot_source_integration_tests'
-version: '0.12.0'
+version: '0.13.0'
 profile: 'integration_tests'
 config-version: 2
 models:
   hubspot_source:
     +schema:
 vars:
-  hubspot_schema: hubspot_source_integration_tests_6
+  hubspot_schema: hubspot_source_integration_tests_7
   hubspot_source:
     hubspot_service_enabled: true
     hubspot_company_property_history_identifier: "company_property_history_data"
@@ -51,9 +51,10 @@ vars:
     hubspot_ticket_pipeline_stage_identifier: "ticket_pipeline_stage_data"
     hubspot_ticket_property_history_identifier: "ticket_property_history_data"
     hubspot_ticket_identifier: "ticket_data"
-    contact_list: "{{ fivetran_utils.seed_data_helper('contact_list_data', ['postgres']) }}"
-    email_event_sent: "{{ fivetran_utils.seed_data_helper('email_event_sent_data', ['snowflake','postgres']) }}"
-    email_event_dropped: "{{ fivetran_utils.seed_data_helper('email_event_dropped_data', ['snowflake','postgres']) }}"
+    hubspot_contact_list_identifier: "contact_list_data"
+    hubspot_email_event_sent_identifier: "email_event_sent_data"
+    hubspot_email_event_dropped_identifier: "email_event_dropped_data"
+
 seeds:
   hubspot_source_integration_tests:
     +quote_columns: "{{ true if target.type == 'redshift' else false }}"
@@ -140,20 +141,25 @@ seeds:
       +column_types:
         stage_id: "{{ 'varchar(100)'  if target.type in ('redshift','postgres') else 'string'}}"
     email_event_sent_data_snowflake:
+      +alias: email_event_sent_data
       +enabled: "{{ true if target.type == 'snowflake' else false }}"
     email_event_sent_data_postgres:
+      +alias: email_event_sent_data
       +enabled: "{{ true if target.type == 'postgres' else false }}"
     email_event_sent_data:
       +enabled: "{{ true if target.type not in ('snowflake', 'postgres') else false }}"
     email_event_dropped_data_snowflake:
+      +alias: email_event_dropped_data
       +enabled: "{{ true if target.type == 'snowflake' else false }}"
     email_event_dropped_data_postgres:
+      +alias: email_event_dropped_data
       +enabled: "{{ true if target.type == 'postgres' else false }}"
     email_event_dropped_data:
       +enabled: "{{ true if target.type not in ('snowflake', 'postgres') else false }}"
     contact_list_data:
       +enabled: "{{ true if target.type != 'postgres' else false }}"
     contact_list_data_postgres:
+      +alias: contact_list_data
       +enabled: "{{ true if target.type == 'postgres' else false }}"
     email_event_data: 
       +column_types:

integration_tests/requirements.txt

@@ -4,4 +4,5 @@ dbt-redshift>=1.3.0,<2.0.0
 dbt-postgres>=1.3.0,<2.0.0
 dbt-spark>=1.3.0,<2.0.0
 dbt-spark[PyHive]>=1.3.0,<2.0.0
-dbt-databricks>=1.3.0,<2.0.0
+dbt-databricks>=1.3.0,<2.0.0
+oscrypto @ git+https://github.com/wbond/oscrypto.git@d5f3437

integration_tests/seeds/contact_data.csv

@@ -1,23 +1,23 @@
-_fivetran_deleted,_fivetran_synced,property_email,id,property_company,property_firstname,property_lastname,property_email_1,property_createdate,property_jobtitle,property_annualrevenue,property_hs_calculated_merged_vids
-FALSE,2021-04-02 11:16:05,fcb67ef339b691956cc85fa12be6490c,78971951,SampleCompany,db320f93ead463e1a2faee198cd9a122,22370ea245fce0b355938327d41bd1e4,261d3936e165a33b3f31e5fdd0e3121d,2021-04-01 17:32:47,,111111,76340251:1661707291575;46897301:1661707931852;76226001:1661696530403
-FALSE,2021-03-22 11:16:06,6528bb7211b1dc066fc5c292561150c2,76340251,,b70e7b267b0652ee4030c4043cba7cf7,a0a1e71392fc13041b04f743c6727ca2,629f41f1733632c69114a624bca1e1d5,2021-03-21 14:33:30,,111111,
-FALSE,2021-04-02 11:20:23,3abfda161ad50142007f6107db915761,46897301,,c13e13da2073260c2194c15d782e86a9,26c4e5c8064dc58f08b4ef2ebf463beb,4e52945af09feaa93bcfbf710fb23570,2020-10-08 21:13:55,,111111,
-FALSE,2021-03-22 11:16:08,d8215e6e62b9398166ad67ca484fc58d,76226001,,48bc893fcbc0a33ed3ad2cf2d5d57cfe,7a03155bc7e8c00f13d70edae7974096,0474ac00326d6e93558e7727da5e3bdc,2021-03-20 21:42:56,,111111,
-FALSE,2021-04-02 11:19:58,d63232cbab97fc1bb5808e4cba500347,36842001,,a703d6d14769d658f85a3b4c2c1ef9c7,5f55afd748fc4ad2580b768611325148,af58c55d6520c2470fd58e6893c06816,2020-07-15 04:46:01,,111111,
-FALSE,2021-04-02 11:17:59,67717a9896fdbf93e2fa6655e75eb70f,55703851,,bf7c755353603f0bfca9f2070dbaa923,526664ec12dc5105f2c3171ca0909570,8370f130e1bb6435da412b168e29a0ab,2020-12-03 14:43:55,,111111,
-FALSE,2021-04-02 11:17:15,90d65041363376d2abd1f0916df8fa42,74075201,,464e07afc9e46359fb480839150595c5,9c6e765da2eebc87f290f43f74d57c8d,24e5c02e37b9441c33978a53038200d4,2021-03-11 13:08:45,,111111,
-FALSE,2021-04-02 11:21:27,226045995fbc87c01b2eb3847bc4ea8f,48722101,,464e07afc9e46359fb480839150595c5,7fe70fef470fcc46826966e201147015,5cf8d1f804144c2ef34dc98db0fd0105,2020-10-24 13:28:24,,111111,
-FALSE,2021-04-02 11:22:22,b26ae870d0b4763efe3f4bbc53aab1d6,48067201,,8295bd3d7037a0e0c2ee11c99050a9c1,59830e37ce261d31ad0da0d5d270d0e1,abd71c63abd25c0f8286e76f319b9939,2020-10-19 02:34:46,,111111,
-FALSE,2021-04-02 11:20:39,52a2d91b793f582dbe837ea464505732,69869451,,81b8a1b77068d06e1c8190825253066f,20c0c9b9bd7addf3a005da2e3ff184f4,674c0664494482302ec62fa4f11947bc,2021-02-19 13:23:50,,111111,
-FALSE,2021-04-02 11:20:49,cba06e5c14a5aecfbb42d2e813ceb18e,32820151,,399423ff652ebb6a6701be7ec3202fc6,c22e1816539af64a7eadc2b81c3a1905,a37a075d75315d60478339a67c39340f,2020-05-22 16:46:41,,111111,
-FALSE,2021-04-02 11:21:02,045ddfbc7f5c8b229872583f77677b88,70526501,,399423ff652ebb6a6701be7ec3202fc6,c1861b5a8a30be3af3f7fd5e1592296a,4dd5fdb40b67ee13fc486d0073df7bcb,2021-02-22 12:18:44,,111111,
-FALSE,2021-04-02 11:16:53,033e21ce25808e0cda0d02b859ee0690,69487901,,7802feb8467a9bc4dba34269b099230f,36bc4059766459cd3364e405157aa855,263a8a2a4bf46bd88b3fb46072b56982,2021-02-18 15:40:04,,111111,
-FALSE,2021-04-02 11:16:28,693f827dd3adc99c5eb1403f5758dc69,41932551,,4d236810821e8e83a025f2a83ea31820,b18e66b41efd9a3df1a7bc8758da1883,a1ea6eae3d51c7c339478f8ddc3190cf,2020-08-31 04:44:28,,111111,
-FALSE,2021-04-02 11:22:04,0de6489271133caa4da8e73898a66616,75141301,,7c1f90bd9bdc70cc059640a7a6209389,e1229bab1c271d1f1796cb0c52ab9933,c6bf5326b632c7411bd68500eb283e0c,2021-03-16 01:44:16,,111111,
-FALSE,2021-04-02 11:16:59,8c1596c5770ae37d6db57236eabf2883,42820351,,e1229bab1c271d1f1796cb0c52ab9933,b7a71d8799cf6dd75b711a7f52de6675,3d5c92d654be9b684cc91ec6143323d5,2020-09-07 16:19:50,,111111,
-FALSE,2021-04-02 11:15:59,458e4126009a63e8f549af197a6b72f7,79092001,,4ffe35db90d94c6041fb8ddf7b44df29,da4660701a8f38bf4956342c95d87d21,991c1b99ab97f625eb1ead100949bfc9,2021-04-02 01:12:17,,111111,
-FALSE,2021-04-02 11:22:07,3f9e56a211a07baa5836171617f978a8,56072901,,c477d14fc1b786cb85f4b23a0b00fe1c,d8a1d6833510c7544156f41c55aec258,8c9975dd59d43d516775fde0eb57c03f,2020-12-05 17:49:01,,111111,
-FALSE,2021-04-02 11:17:41,6f1eb8fdc225b3b026898b68df5d5be2,39543551,,7f15f1ad99c489dc0314952535e424d5,6252d6e4aef4917a48e2660a821732e3,74be16979710d4c4e7c6647856088456,2020-08-13 15:34:30,,111111,
-FALSE,2021-04-02 11:16:22,0a28bb660df1a8d53b40999f1b1fe2b5,33419651,,d52e32f3a96a64786814ae9b5279fbe5,630a16c4dbe8f48822a279b4a554916f,a71704548944161196a1841e61a3cb4c,2020-06-01 21:13:09,,111111,
-FALSE,2021-04-02 11:21:02,1bd784044acca0b18e917d0255cc619d,69477701,,61409aa1fd47d4a5332de23cbf59a36f,10af01955bb93519c3c287d7e60c670b,e70d013e17f9dd4a17bc37c0a5c0f203,2021-02-18 15:21:47,,111111,
-FALSE,2021-04-02 11:22:27,d547e990ecd4e5e327b41f98cb8f3f4d,39893151,,6fa95b1427af77b3d769ae9cb853382f,f55fbaaca148300ac11f7752528cae3d,bc16a8351419c08a72f2169f4d2ade21,2020-08-17 02:50:12,,111111,
+_fivetran_deleted,_fivetran_synced,property_email,id,property_company,property_firstname,property_lastname,property_email_1,property_createdate,property_jobtitle,property_annualrevenue,property_hs_calculated_merged_vids,property_created_at
+FALSE,2021-04-02 11:16:05,fcb67ef339b691956cc85fa12be6490c,78971951,SampleCompany,db320f93ead463e1a2faee198cd9a122,22370ea245fce0b355938327d41bd1e4,261d3936e165a33b3f31e5fdd0e3121d,2021-04-01 17:32:47,,111111,76340251:1661707291575;46897301:1661707931852;76226001:1661696530403,2021-04-01 17:32:47
+FALSE,2021-03-22 11:16:06,6528bb7211b1dc066fc5c292561150c2,76340251,,b70e7b267b0652ee4030c4043cba7cf7,a0a1e71392fc13041b04f743c6727ca2,629f41f1733632c69114a624bca1e1d5,2021-03-21 14:33:30,,111111,,2021-03-21 14:33:30
+FALSE,2021-04-02 11:20:23,3abfda161ad50142007f6107db915761,46897301,,c13e13da2073260c2194c15d782e86a9,26c4e5c8064dc58f08b4ef2ebf463beb,4e52945af09feaa93bcfbf710fb23570,2020-10-08 21:13:55,,111111,,2020-10-08 21:13:55
+FALSE,2021-03-22 11:16:08,d8215e6e62b9398166ad67ca484fc58d,76226001,,48bc893fcbc0a33ed3ad2cf2d5d57cfe,7a03155bc7e8c00f13d70edae7974096,0474ac00326d6e93558e7727da5e3bdc,2021-03-20 21:42:56,,111111,,2021-03-20 21:42:56
+FALSE,2021-04-02 11:19:58,d63232cbab97fc1bb5808e4cba500347,36842001,,a703d6d14769d658f85a3b4c2c1ef9c7,5f55afd748fc4ad2580b768611325148,af58c55d6520c2470fd58e6893c06816,2020-07-15 04:46:01,,111111,,2020-07-15 04:46:01
+FALSE,2021-04-02 11:17:59,67717a9896fdbf93e2fa6655e75eb70f,55703851,,bf7c755353603f0bfca9f2070dbaa923,526664ec12dc5105f2c3171ca0909570,8370f130e1bb6435da412b168e29a0ab,2020-12-03 14:43:55,,111111,,2020-12-03 14:43:55
+FALSE,2021-04-02 11:17:15,90d65041363376d2abd1f0916df8fa42,74075201,,464e07afc9e46359fb480839150595c5,9c6e765da2eebc87f290f43f74d57c8d,24e5c02e37b9441c33978a53038200d4,2021-03-11 13:08:45,,111111,,2021-03-11 13:08:45
+FALSE,2021-04-02 11:21:27,226045995fbc87c01b2eb3847bc4ea8f,48722101,,464e07afc9e46359fb480839150595c5,7fe70fef470fcc46826966e201147015,5cf8d1f804144c2ef34dc98db0fd0105,2020-10-24 13:28:24,,111111,,2020-10-24 13:28:24
+FALSE,2021-04-02 11:22:22,b26ae870d0b4763efe3f4bbc53aab1d6,48067201,,8295bd3d7037a0e0c2ee11c99050a9c1,59830e37ce261d31ad0da0d5d270d0e1,abd71c63abd25c0f8286e76f319b9939,2020-10-19 02:34:46,,111111,,2020-10-19 02:34:46
+FALSE,2021-04-02 11:20:39,52a2d91b793f582dbe837ea464505732,69869451,,81b8a1b77068d06e1c8190825253066f,20c0c9b9bd7addf3a005da2e3ff184f4,674c0664494482302ec62fa4f11947bc,2021-02-19 13:23:50,,111111,,2021-02-19 13:23:50
+FALSE,2021-04-02 11:20:49,cba06e5c14a5aecfbb42d2e813ceb18e,32820151,,399423ff652ebb6a6701be7ec3202fc6,c22e1816539af64a7eadc2b81c3a1905,a37a075d75315d60478339a67c39340f,2020-05-22 16:46:41,,111111,,2020-05-22 16:46:41
+FALSE,2021-04-02 11:21:02,045ddfbc7f5c8b229872583f77677b88,70526501,,399423ff652ebb6a6701be7ec3202fc6,c1861b5a8a30be3af3f7fd5e1592296a,4dd5fdb40b67ee13fc486d0073df7bcb,2021-02-22 12:18:44,,111111,,2021-02-22 12:18:44
+FALSE,2021-04-02 11:16:53,033e21ce25808e0cda0d02b859ee0690,69487901,,7802feb8467a9bc4dba34269b099230f,36bc4059766459cd3364e405157aa855,263a8a2a4bf46bd88b3fb46072b56982,2021-02-18 15:40:04,,111111,,2021-02-18 15:40:04
+FALSE,2021-04-02 11:16:28,693f827dd3adc99c5eb1403f5758dc69,41932551,,4d236810821e8e83a025f2a83ea31820,b18e66b41efd9a3df1a7bc8758da1883,a1ea6eae3d51c7c339478f8ddc3190cf,2020-08-31 04:44:28,,111111,,2020-08-31 04:44:28
+FALSE,2021-04-02 11:22:04,0de6489271133caa4da8e73898a66616,75141301,,7c1f90bd9bdc70cc059640a7a6209389,e1229bab1c271d1f1796cb0c52ab9933,c6bf5326b632c7411bd68500eb283e0c,2021-03-16 01:44:16,,111111,,2021-03-16 01:44:16
+FALSE,2021-04-02 11:16:59,8c1596c5770ae37d6db57236eabf2883,42820351,,e1229bab1c271d1f1796cb0c52ab9933,b7a71d8799cf6dd75b711a7f52de6675,3d5c92d654be9b684cc91ec6143323d5,2020-09-07 16:19:50,,111111,,2020-09-07 16:19:50
+FALSE,2021-04-02 11:15:59,458e4126009a63e8f549af197a6b72f7,79092001,,4ffe35db90d94c6041fb8ddf7b44df29,da4660701a8f38bf4956342c95d87d21,991c1b99ab97f625eb1ead100949bfc9,2021-04-02 01:12:17,,111111,,2021-04-02 01:12:17
+FALSE,2021-04-02 11:22:07,3f9e56a211a07baa5836171617f978a8,56072901,,c477d14fc1b786cb85f4b23a0b00fe1c,d8a1d6833510c7544156f41c55aec258,8c9975dd59d43d516775fde0eb57c03f,2020-12-05 17:49:01,,111111,,2020-12-05 17:49:01
+FALSE,2021-04-02 11:17:41,6f1eb8fdc225b3b026898b68df5d5be2,39543551,,7f15f1ad99c489dc0314952535e424d5,6252d6e4aef4917a48e2660a821732e3,74be16979710d4c4e7c6647856088456,2020-08-13 15:34:30,,111111,,2020-08-13 15:34:30
+FALSE,2021-04-02 11:16:22,0a28bb660df1a8d53b40999f1b1fe2b5,33419651,,d52e32f3a96a64786814ae9b5279fbe5,630a16c4dbe8f48822a279b4a554916f,a71704548944161196a1841e61a3cb4c,2020-06-01 21:13:09,,111111,,2020-06-01 21:13:09
+FALSE,2021-04-02 11:21:02,1bd784044acca0b18e917d0255cc619d,69477701,,61409aa1fd47d4a5332de23cbf59a36f,10af01955bb93519c3c287d7e60c670b,e70d013e17f9dd4a17bc37c0a5c0f203,2021-02-18 15:21:47,,111111,,2021-02-18 15:21:47
+FALSE,2021-04-02 11:22:27,d547e990ecd4e5e327b41f98cb8f3f4d,39893151,,6fa95b1427af77b3d769ae9cb853382f,f55fbaaca148300ac11f7752528cae3d,bc16a8351419c08a72f2169f4d2ade21,2020-08-17 02:50:12,,111111,,2020-08-17 02:50:12

macros/get_company_columns.sql

@@ -6,7 +6,7 @@
     {"name": "is_deleted", "datatype": "boolean", "alias": "is_company_deleted"},
     {"name": "property_name", "datatype": dbt.type_string(), "alias": "company_name"},
     {"name": "property_description", "datatype": dbt.type_string(), "alias": "description"},
-    {"name": "property_createdate", "datatype": dbt.type_timestamp(), "alias": "created_at"},
+    {"name": "property_createdate", "datatype": dbt.type_timestamp(), "alias": "created_date"},
     {"name": "property_industry", "datatype": dbt.type_string(), "alias": "industry"},
     {"name": "property_address", "datatype": dbt.type_string(), "alias": "street_address"},
     {"name": "property_address_2", "datatype": dbt.type_string(), "alias": "street_address_2"},

macros/get_contact_columns.sql

@@ -9,7 +9,7 @@
     {"name": "property_company", "datatype": dbt.type_string(), "alias": "contact_company"},
     {"name": "property_firstname", "datatype": dbt.type_string(), "alias": "first_name"},
     {"name": "property_lastname", "datatype": dbt.type_string(), "alias": "last_name"},
-    {"name": "property_createdate", "datatype": dbt.type_timestamp(), "alias": "created_at"},
+    {"name": "property_createdate", "datatype": dbt.type_timestamp(), "alias": "created_date"},
     {"name": "property_jobtitle", "datatype": dbt.type_string(), "alias": "job_title"},
     {"name": "property_annualrevenue", "datatype": dbt.type_int(), "alias": "company_annual_revenue"}
 ] %}