Merge pull request #94 from fivetran/bugfix/uniqueness-test-adjustment

bugfix/uniqueness-test-adjustment
fivetran · Feb 6, 2023 · 123b3ef · 123b3ef
2 parents a218221 + e8c94a4
commit 123b3ef
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# dbt_hubspot v0.8.2
+## Bug Fixes
+- Following the release of `v0.8.0`, the end model uniqueness tests were not updated to account for the added flexibility of the inclusion of deleted records. As such the respective end model tests have been adjusted to test uniqueness only on non-deleted records. ([#94](https://github.com/fivetran/dbt_hubspot/pull/94))
+
+## Under the Hood
+- Addition of the dbt-expectations package to be used for more robust testing of uniqueness for end models. ([#94](https://github.com/fivetran/dbt_hubspot/pull/94))
+
 # dbt_hubspot v0.8.0
 
 ## 🚨 Breaking Changes 🚨:

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
         href="https://github.com/fivetran/dbt_hubspot/blob/main/LICENSE">
         <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
     <a alt="dbt-core">
-        `<img src="https://img.shields.io/badge/dbt_Core™_version->=1.3.0_,<2.0.0-orange.svg" /></a>` 
+        <img src="https://img.shields.io/badge/dbt_Core™_version->=1.3.0_,<2.0.0-orange.svg" /></a> 
     <a alt="Maintained?">
         <img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg" /></a>
     <a alt="PRs">
@@ -232,6 +232,12 @@ packages:
 
     - package: dbt-labs/spark_utils
       version: [">=0.3.0", "<0.4.0"]
+
+    - package: calogica/dbt_expectations
+      version: [">=0.8.0", "<0.9.0"]
+
+    - package: calogica/dbt_date
+      version: [">=0.7.0", "<0.8.0"]
 ```
 # 🙌 How is this package maintained and can I contribute?
 ## Package Maintenance

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'hubspot'
-version: '0.8.0'
+version: '0.8.2'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'hubspot_integration_tests'
-version: '0.8.0'
+version: '0.8.2'
 profile: 'integration_tests'
 config-version: 2
 vars:

diff --git a/models/marketing/email_events/email_events.yml b/models/marketing/email_events/email_events.yml
@@ -20,7 +20,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: returned_response
@@ -65,7 +66,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: geo_location
@@ -113,7 +115,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: returned_response
@@ -149,7 +152,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: returned_response
@@ -203,7 +207,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: from_email
@@ -245,7 +250,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: geo_location
@@ -293,7 +299,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: geo_location
@@ -338,7 +345,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: geo_location
@@ -389,7 +397,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: from_email
@@ -428,7 +437,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: ip_address
@@ -470,7 +480,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: is_bounced

diff --git a/models/marketing/marketing.yml b/models/marketing/marketing.yml
@@ -23,7 +23,8 @@ models:
       - name: event_id
         description: The ID of the event.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: from_email
@@ -218,7 +219,8 @@ models:
       - name: contact_id
         description: The ID of the contact.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_deleted, false)"
           - not_null
 
       - name: contact_company
@@ -332,7 +334,8 @@ models:
       - name: contact_list_id
         description: The ID of the contact list.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_contact_list_deleted, false)"
           - not_null
 
       - name: contact_list_name

diff --git a/models/sales/sales.yml b/models/sales/sales.yml
@@ -23,7 +23,8 @@ models:
       - name: deal_id
         description: The ID of the deal
         tests:
-          - not_null
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_deal_deleted, false)"
           - unique
 
       - name: deal_name
@@ -92,7 +93,8 @@ models:
       - name: deal_stage_id
         description: The unique deal stage identifier.
         tests:
-          - not_null
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_deal_pipeline_stage_deleted, false)"
           - unique
 
       - name: is_deal_pipeline_deleted
@@ -158,22 +160,14 @@ models:
       - name: deal_name
         description: The name you have given this deal.
 
-      - name: is_deal_pipeline_deleted
-        description: Whether the record was deleted from the deal pipeline table.
-
-      - name: is_deal_pipeline_stage_deleted
-        description: Whether the record was deleted from the deal pipeline stage table.
-
-      - name: is_deal_deleted
-        description: Whether the record was deleted from the deal table.
-
   - name: hubspot__companies
     description: Each record represents a company in Hubspot.
     columns:
       - name: company_id
         description: The ID of the company.
         tests:
-          - unique
+          - dbt_expectations.expect_column_values_to_be_unique:
+              row_condition: "not coalesce(is_company_deleted, false)"
           - not_null
 
       - name: portal_id

diff --git a/packages.yml b/packages.yml
@@ -1,3 +1,5 @@
 packages:
   - package: fivetran/hubspot_source
+    version: [">=0.8.0", "<0.9.0"]
+  - package: calogica/dbt_expectations
     version: [">=0.8.0", "<0.9.0"]