Merge pull request #56 from fivetran/bugfix/abandoned-checkout-discou…

…nt-id discount_id issue
fivetran · Feb 23, 2023 · 25153c1 · 25153c1
2 parents f94eb30 + 4a54abe
commit 25153c1
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# dbt_shopify_source v0.8.1
+
+## Bug Fixes
+- Addresses [Issue #54](https://github.com/fivetran/dbt_shopify_source/issues/54), in which the deprecated `discount_id` field was used instead of `code` in `stg_shopify__abandoned_checkout_discount__code` ([PR #56](https://github.com/fivetran/dbt_shopify_source/pull/56)).
+
 # dbt_shopify_source v0.8.0
 
 Lots of new features ahead!! We've revamped the package to keep up-to-date with new additions to the Shopify connector and feedback from the community. 

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

diff --git a/docs/catalog.json b/docs/catalog.json
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: 'shopify_source_integration_tests'
-version: '0.8.0'
+version: '0.8.1'
 profile: 'integration_tests'
 config-version: 2
 

diff --git a/models/src_shopify.yml b/models/src_shopify.yml
@@ -1340,7 +1340,7 @@ sources:
           - name: created_at
             description: When the checkout discount application was created.
           - name: discount_id
-            description: ID of the discount.
+            description: ID of the discount. Deprecated, use `code` instead.
           - name: index
             description: Index (from 1) representing the application of the discount to the checkout. Use the latest (highest index)
           - name: type

diff --git a/models/stg_shopify.yml b/models/stg_shopify.yml
@@ -1554,7 +1554,6 @@ models:
           combination_of_columns:
             - checkout_id
             - code
-            - discount_id
             - source_relation
     columns:
       - name: _fivetran_synced
@@ -1570,7 +1569,7 @@ models:
       - name: created_at
         description: When the checkout discount application was created.
       - name: discount_id
-        description: ID of the discount.
+        description: ID of the discount. Deprecated, use `code` instead.
       - name: type
         description: The type of discount. Valid values - percentage, shipping, fixed_amount. (default - fixed_amount)
       - name: updated_at

diff --git a/models/stg_shopify__abandoned_checkout_discount_code.sql b/models/stg_shopify__abandoned_checkout_discount_code.sql
@@ -13,7 +13,6 @@ fields as (
                 staging_columns=get_abandoned_checkout_discount_code_columns()
             )
         }}
-        , row_number() over(partition by checkout_id, discount_id order by index desc) as n
 
         {{ fivetran_utils.source_relation(
             union_schema_variable='shopify_union_schemas', 
@@ -34,11 +33,13 @@ final as (
         {{ dbt_date.convert_timezone(column='cast(created_at as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as created_at,
         {{ dbt_date.convert_timezone(column='cast(updated_at as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as updated_at,
         {{ dbt_date.convert_timezone(column='cast(_fivetran_synced as ' ~ dbt.type_timestamp() ~ ')', target_tz=var('shopify_timezone', "UTC"), source_tz="UTC") }} as _fivetran_synced,
-        source_relation
+        source_relation, 
+        row_number() over(partition by checkout_id, upper(code) order by index desc) as index
 
     from fields
-    where n = 1
+
 )
 
 select *
 from final
+where index = 1