From 6aeafde397562e6ddca0c90d9fa1be06d6f90c86 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Tue, 3 Jan 2023 17:35:46 -0800
Subject: [PATCH 01/10] inventory work

---
 .../shopify__inventory_level__aggregates.sql  |  87 +++++++++++++
 models/shopify__inventory_levels.sql          | 114 ++++++++++++++++++
 models/shopify__products.sql                  | 114 ++++++++++++++++--
 3 files changed, 308 insertions(+), 7 deletions(-)
 create mode 100644 models/intermediate/shopify__inventory_level__aggregates.sql
 create mode 100644 models/shopify__inventory_levels.sql

diff --git a/models/intermediate/shopify__inventory_level__aggregates.sql b/models/intermediate/shopify__inventory_level__aggregates.sql
new file mode 100644
index 0000000..1f49c54
--- /dev/null
+++ b/models/intermediate/shopify__inventory_level__aggregates.sql
@@ -0,0 +1,87 @@
+with order_line as (
+
+    select *
+    from {{ var('shopify_order_line') }}
+),
+
+order as (
+
+    select *
+    from {{ var('shopify_order') }}
+    where not coalesce(is_deleted, false)
+), 
+
+{% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
+refunds as (
+
+    select *
+    from {{ ref('shopify__orders__order_refunds') }}
+
+), refunds_aggregated as (
+    
+    select
+        order_line_id,
+        source_relation,
+        sum(quantity) as quantity,
+        sum(coalesce(subtotal, 0)) as subtotal
+
+    from refunds
+    group by 1,2
+),
+{% endif %}
+
+joined as (
+
+    select
+        order_line.order_line_id,
+        order_line.variant_id,
+        order_line.source_relation,
+        order.location_id,
+        order.order_id,
+        order.customer_id,
+        lower(order.email) as email,
+        order_line.pre_tax_price,
+        order_line.quantity,
+        order.created_timestamp as order_created_timestamp
+
+        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
+        , refunds_aggregated.subtotal as subtotal_sold_refunds
+        , refunds_aggregated.quantity as quantity_sold_refunds
+        {% endif %}
+
+    from order_line 
+    join order 
+        on order_line.order_id = order.order_id
+        and order_line.source_relation = order.source_relation
+
+    {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
+    left join refunds_aggregated
+        on refunds_aggregated.order_line_id = order_line.order_line_id
+        and refunds_aggregated.source_relation = order_line.source_relation
+    {% endif %}
+),
+
+aggregated as (
+
+    select
+        variant_id,
+        location_id,
+        source_relation,
+        sum(pre_tax_price) as subtotal_sold,
+        sum(quantity) as quantity_sold,
+        count(distinct order_id) as count_distinct_orders,
+        count(distinct customer_id) as count_distinct_customers,
+        count(distinct email) as count_distinct_customer_emails,
+        min(order_created_timestamp) as first_order_timestamp,
+        max(order_created_timestamp) as last_order_timestamp
+
+        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
+        , coalesce(subtotal_sold_refunds, 0) as subtotal_sold_refunds
+        , coalesce(quantity_sold_refunds, 0) as quantity_sold_refunds
+        {% endif %}
+
+    from joined
+)
+
+select *
+from aggregated
\ No newline at end of file
diff --git a/models/shopify__inventory_levels.sql b/models/shopify__inventory_levels.sql
new file mode 100644
index 0000000..ac2bb1e
--- /dev/null
+++ b/models/shopify__inventory_levels.sql
@@ -0,0 +1,114 @@
+with inventory_level as (
+
+    select *
+    from {{ var('shopify_inventory_level') }}
+), 
+
+inventory_item as (
+
+    select *
+    from {{ var('shopify_inventory_item') }}
+),
+
+location as (
+
+    select *
+    from {{ var('shopify_location') }}
+),
+
+product_variant as (
+-- join on sku
+    select *
+    from {{ var('shopify_product_variant') }}
+),
+
+product as (
+
+    select *
+    from {{ var('shopify_product') }}
+),
+
+inventory_level_aggregated as (
+
+    select *
+    from {{ ref('shopify__inventory_lvel__aggregates') }}
+),
+
+joined as (
+
+    select 
+        inventory_level.*,
+        inventory_item.sku,
+        inventory_item.is_deleted as is_inventory_item_deleted,
+        inventory_item.cost, -- 
+        inventory_item.country_code_of_origin,
+        inventory_item.province_code_of_origin,
+        inventory_item.is_shipping_required,
+        inventory_item.is_inventory_quantity_tracked,
+        inventory_item.created_at as inventory_item_created_at,
+        inventory_item.updated_at as inventory_item_updated_at,
+
+        location.name as location_name, 
+        location.is_deleted as is_location_deleted,
+        location.is_active as is_location_active,
+        location.address_1,
+        location.address_2,
+        location.city,
+        location.country,
+        location.country_code,
+        location.is_legacy as is_legacy_location,
+        location.province,
+        location.province_code,
+        location.phone,
+        location.zip,
+        location.created_at as location_created_at,
+
+        product_variant.title as variant_title,
+        product_variant.inventory_policy as variant_inventory_policy,
+        product_variant.price as variant_price,
+        product_variant.image_id as variant_image_id,
+        product_variant.fulfillment_service as variant_fulfillment_service,
+        product_variant.inventory_management as variant_inventory_management,
+        product_variant.is_taxable as is_product_variant_taxable,
+        product_variant.barcode as variant_barcode,
+        product_variant.grams as variant_grams, 
+        product_variant.inventory_quantity as variant_inventory_quantity,
+        product_variant.weight as variant_weight,
+        product_variant.weight_unit as weight_unit,
+        product_variant.option_1 as variant_option_1,
+        product_variant.option_2 as variant_option_2,
+        product_variant.option_3 as variant_option_3,
+        product_variant.tax_code as variant_tax_code,
+        product_variant.created_timestamp as variant_created_at,
+        product_variant.updated_timestamp as variant_updated_at,
+
+        coalesce(inventory_level_aggregated.subtotal_sold, 0) as subtotal_sold,
+        coalesce(inventory_level_aggregated.quantity_sold, 0) as quantity_sold,
+        coalesce(inventory_level_aggregated.count_distinct_orders, 0) as count_distinct_orders,
+        coalesce(inventory_level_aggregated.count_distinct_customers, 0) as count_distinct_customers,
+        coalesce(inventory_level_aggregated.count_distinct_customer_emails, 0) as count_distinct_customer_emails,
+        inventory_level_aggregated.first_order_timestamp,
+        inventory_level_aggregated.last_order_timestamp
+        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
+        , inventory_level_aggregated.subtotal_sold_refunds
+        , inventory_level_aggregated.quantity_sold_refunds
+        {% endif %}
+
+        {{ fivetran_utils.persist_pass_through_columns('product_variant_pass_through_columns', identifier='product_variant') }}
+
+    from inventory_level
+    join inventory_item 
+        on inventory_level.inventory_item_id = inventory_item.inventory_item_id 
+        and inventory_level.source_relation = inventory_item.source_relation 
+    join location 
+        on inventory_level.location_id = location.location_id 
+        and inventory_level.source_relation = location.source_relation 
+    join product_variant 
+        on inventory_item.inventory_item_id = product_variant.inventory_item_id 
+        and inventory_item.source_relation = product_variant.source_relation
+    left join inventory_level_aggregated
+        on inventory_level.location_id = inventory_level_aggregated.location_id
+        and product_variant.variant_id = inventory_level_aggregated.variant_id
+)
+
+select * from joined
\ No newline at end of file
diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index 9f63dcd..647691a 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -2,18 +2,54 @@ with products as (
 
     select *
     from {{ var('shopify_product') }}
+), 
 
-), order_lines as (
+order_lines as (
 
     select *
     from {{ ref('shopify__order_lines') }}
+), 
 
-), orders as (
+orders as (
 
     select *
     from {{ ref('shopify__orders')}}
+), 
 
-), order_lines_aggregated as (
+collection_product as (
+
+    select *
+    from {{ var('shopify_collection_product') }}
+),
+
+collection as (
+
+    select *
+    from {{ var('shopify_collection') }}
+
+    -- limit to only active collections
+    where not coalesce(is_deleted, false)
+),
+
+product_tag as (
+
+    select *
+    from {{ var('shopify_product_tag') }}
+),
+
+product_variant as (
+
+    select *
+    from {{ var('shopify_product_variant') }}
+),
+
+product_image as (
+
+    select *
+    from {{ var('product_image') }}
+),
+
+order_lines_aggregated as (
 
     select 
         order_lines.product_id, 
@@ -33,7 +69,53 @@ with products as (
         using (order_id, source_relation)
     group by 1,2
 
-), joined as (
+), 
+
+cellections_aggregated as (
+
+    select
+        collection_product.product_id,
+        collection_product.source_relation,
+        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter=', ') }} as collections
+    from collection_product 
+    join collection 
+        on collection_product.collection_id = collection.collection_id
+        and collection_product.source_relation = collection.source_relation
+    group by 1,2
+),
+
+tags_aggregated as (
+
+    select 
+        product_id,
+        source_relation,
+        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter=', ') }} as tags
+    
+    from product_tag
+    group by 1,2
+),
+
+variants_aggregated as (
+
+    select 
+        product_id,
+        count(variant_id) as count_variants
+
+    from product_variant
+    group by 1
+
+),
+
+images_aggregated as (
+
+    select 
+        product_id,
+        count(*) as count_images
+    from product_image
+    group by 1
+),
+
+joined as (
 
     select
         products.*,
@@ -46,11 +128,29 @@ with products as (
         {% endif %}
         
         order_lines_aggregated.first_order_timestamp,
-        order_lines_aggregated.most_recent_order_timestamp
+        order_lines_aggregated.most_recent_order_timestamp,
+
+        collections_aggregated.collections,
+        tags_aggregated.tags,
+        variants_aggregated.count_variants,
+        coalesce(images_aggregated.count_images, 0) > 0 as has_product_image
+
     from products
     left join order_lines_aggregated
-        using (product_id, source_relation)
-
+        on products.product_id = order_lines_aggregated.product_id
+        and products.source_relation = order_lines_aggregated.source_relation
+    left join collections_aggregated
+        on products.product_id = collections_aggregated.product_id
+        and products.source_relation = collections_aggregated.source_relation
+    left join tags_aggregated
+        on products.product_id = tags_aggregated.product_id
+        and products.source_relation = tags_aggregated.source_relation
+    left join variants_aggregated
+        on products.product_id = variants_aggregated.product_id
+        and products.source_relation = variants_aggregated.source_relation
+    left join images_aggregated
+        on products.product_id = images_aggregated.product_id
+        and products.source_relation = images_aggregated.source_relation
 )
 
 select *

From be9ad42c07278f34d1a8949d4f9a47575e3e6ab4 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Tue, 3 Jan 2023 17:53:59 -0800
Subject: [PATCH 02/10] things are working

---
 .../shopify__inventory_level__aggregates.sql  | 42 ++++++++++---------
 models/shopify__inventory_levels.sql          |  6 +--
 models/shopify__order_lines.sql               |  4 +-
 models/shopify__products.sql                  | 14 ++++---
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/models/intermediate/shopify__inventory_level__aggregates.sql b/models/intermediate/shopify__inventory_level__aggregates.sql
index 1f49c54..79bcf17 100644
--- a/models/intermediate/shopify__inventory_level__aggregates.sql
+++ b/models/intermediate/shopify__inventory_level__aggregates.sql
@@ -1,10 +1,10 @@
-with order_line as (
+with order_lines as (
 
     select *
     from {{ var('shopify_order_line') }}
 ),
 
-order as (
+orders as (
 
     select *
     from {{ var('shopify_order') }}
@@ -33,31 +33,31 @@ refunds as (
 joined as (
 
     select
-        order_line.order_line_id,
-        order_line.variant_id,
-        order_line.source_relation,
-        order.location_id,
-        order.order_id,
-        order.customer_id,
-        lower(order.email) as email,
-        order_line.pre_tax_price,
-        order_line.quantity,
-        order.created_timestamp as order_created_timestamp
+        order_lines.order_line_id,
+        order_lines.variant_id,
+        order_lines.source_relation,
+        orders.location_id,
+        orders.order_id,
+        orders.customer_id,
+        lower(orders.email) as email,
+        order_lines.pre_tax_price,
+        order_lines.quantity,
+        orders.created_timestamp as order_created_timestamp
 
         {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
         , refunds_aggregated.subtotal as subtotal_sold_refunds
         , refunds_aggregated.quantity as quantity_sold_refunds
         {% endif %}
 
-    from order_line 
-    join order 
-        on order_line.order_id = order.order_id
-        and order_line.source_relation = order.source_relation
+    from order_lines
+    join orders
+        on order_lines.order_id = orders.order_id
+        and order_lines.source_relation = orders.source_relation
 
     {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
     left join refunds_aggregated
-        on refunds_aggregated.order_line_id = order_line.order_line_id
-        and refunds_aggregated.source_relation = order_line.source_relation
+        on refunds_aggregated.order_line_id = order_lines.order_line_id
+        and refunds_aggregated.source_relation = order_lines.source_relation
     {% endif %}
 ),
 
@@ -76,11 +76,13 @@ aggregated as (
         max(order_created_timestamp) as last_order_timestamp
 
         {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
-        , coalesce(subtotal_sold_refunds, 0) as subtotal_sold_refunds
-        , coalesce(quantity_sold_refunds, 0) as quantity_sold_refunds
+        , sum(coalesce(subtotal_sold_refunds, 0)) as subtotal_sold_refunds
+        , sum(coalesce(quantity_sold_refunds, 0)) as quantity_sold_refunds
         {% endif %}
 
     from joined
+
+    {{ dbt_utils.group_by(n=3) }}
 )
 
 select *
diff --git a/models/shopify__inventory_levels.sql b/models/shopify__inventory_levels.sql
index ac2bb1e..83be80e 100644
--- a/models/shopify__inventory_levels.sql
+++ b/models/shopify__inventory_levels.sql
@@ -31,7 +31,7 @@ product as (
 inventory_level_aggregated as (
 
     select *
-    from {{ ref('shopify__inventory_lvel__aggregates') }}
+    from {{ ref('shopify__inventory_level__aggregates') }}
 ),
 
 joined as (
@@ -90,8 +90,8 @@ joined as (
         inventory_level_aggregated.first_order_timestamp,
         inventory_level_aggregated.last_order_timestamp
         {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
-        , inventory_level_aggregated.subtotal_sold_refunds
-        , inventory_level_aggregated.quantity_sold_refunds
+        , coalesce(inventory_level_aggregated.subtotal_sold_refunds, 0) as subtotal_sold_refunds
+        , coalesce(inventory_level_aggregated.quantity_sold_refunds, 0) as quantity_sold_refunds
         {% endif %}
 
         {{ fivetran_utils.persist_pass_through_columns('product_variant_pass_through_columns', identifier='product_variant') }}
diff --git a/models/shopify__order_lines.sql b/models/shopify__order_lines.sql
index 6fe4f71..8e22b0a 100644
--- a/models/shopify__order_lines.sql
+++ b/models/shopify__order_lines.sql
@@ -41,14 +41,14 @@ with order_lines as (
         product_variants.updated_timestamp as variant_updated_at,
         product_variants.inventory_item_id,
         product_variants.image_id,
-        product_variants.title as variant_title,
+
         product_variants.price as variant_price,
         product_variants.sku as variant_sku,
         product_variants.position as variant_position,
         product_variants.inventory_policy as variant_inventory_policy,
         product_variants.compare_at_price as variant_compare_at_price,
         product_variants.fulfillment_service as variant_fulfillment_service,
-        product_variants.inventory_management as variant_inventory_management,
+
         product_variants.is_taxable as variant_is_taxable,
         product_variants.barcode as variant_barcode,
         product_variants.grams as variant_grams,
diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index 647691a..c1bed9d 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -46,7 +46,7 @@ product_variant as (
 product_image as (
 
     select *
-    from {{ var('product_image') }}
+    from {{ var('shopify_product_image') }}
 ),
 
 order_lines_aggregated as (
@@ -71,12 +71,12 @@ order_lines_aggregated as (
 
 ), 
 
-cellections_aggregated as (
+collections_aggregated as (
 
     select
         collection_product.product_id,
         collection_product.source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter=', ') }} as collections
+        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter='", "') }} as collections
     from collection_product 
     join collection 
         on collection_product.collection_id = collection.collection_id
@@ -89,7 +89,7 @@ tags_aggregated as (
     select 
         product_id,
         source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter=', ') }} as tags
+        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter='", "') }} as tags
     
     from product_tag
     group by 1,2
@@ -99,10 +99,11 @@ variants_aggregated as (
 
     select 
         product_id,
+        source_relation,
         count(variant_id) as count_variants
 
     from product_variant
-    group by 1
+    group by 1,2
 
 ),
 
@@ -110,9 +111,10 @@ images_aggregated as (
 
     select 
         product_id,
+        source_relation,
         count(*) as count_images
     from product_image
-    group by 1
+    group by 1,2
 ),
 
 joined as (

From 9a85c9542d7912a34a2c9aa8410ab3a602bbd78f Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Wed, 4 Jan 2023 12:41:05 -0800
Subject: [PATCH 03/10] inventory level model

---
 dbt_project.yml                               |  2 +
 models/intermediate/intermediate.yml          |  7 +++
 .../shopify__inventory_level__aggregates.sql  | 18 ++++++-
 models/shopify.yml                            |  8 +++
 models/shopify__inventory_levels.sql          | 54 ++++++++++++-------
 packages.yml                                  |  8 +--
 6 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/dbt_project.yml b/dbt_project.yml
index 07d2125..64c5062 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -10,6 +10,8 @@ models:
       +materialized: ephemeral
       shopify__customer_email_rollup:
         +materialized: view # so we can use the dbt_utils.star macro
+      shopify__inventory_level__aggregates:
+        +materialized: table # just for testing. remove later
 vars:
   shopify:
     shopify_customer: "{{ ref('stg_shopify__customer') }}"
diff --git a/models/intermediate/intermediate.yml b/models/intermediate/intermediate.yml
index 9c5decb..1d2ffaa 100644
--- a/models/intermediate/intermediate.yml
+++ b/models/intermediate/intermediate.yml
@@ -25,4 +25,11 @@ models:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
             - email
+            - source_relation
+  - name: shopify__inventory_level__aggregates
+    tests:
+      - dbt_utils.unique_combination_of_columns:
+          combination_of_columns:
+            - variant_id
+            - location_id
             - source_relation
\ No newline at end of file
diff --git a/models/intermediate/shopify__inventory_level__aggregates.sql b/models/intermediate/shopify__inventory_level__aggregates.sql
index 79bcf17..ab247a9 100644
--- a/models/intermediate/shopify__inventory_level__aggregates.sql
+++ b/models/intermediate/shopify__inventory_level__aggregates.sql
@@ -4,6 +4,12 @@ with order_lines as (
     from {{ var('shopify_order_line') }}
 ),
 
+fulfillment as (
+
+    select *
+    from {{ var('shopify_fulfillment') }}
+),
+
 orders as (
 
     select *
@@ -36,13 +42,14 @@ joined as (
         order_lines.order_line_id,
         order_lines.variant_id,
         order_lines.source_relation,
-        orders.location_id,
+        coalesce(fulfillment.location_id, orders.location_id) as location_id,
         orders.order_id,
         orders.customer_id,
         lower(orders.email) as email,
         order_lines.pre_tax_price,
         order_lines.quantity,
-        orders.created_timestamp as order_created_timestamp
+        orders.created_timestamp as order_created_timestamp,
+        fulfillment.status as fulfillment_status
 
         {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
         , refunds_aggregated.subtotal as subtotal_sold_refunds
@@ -53,6 +60,9 @@ joined as (
     join orders
         on order_lines.order_id = orders.order_id
         and order_lines.source_relation = orders.source_relation
+    join fulfillment
+        on orders.order_id = fulfillment.order_id
+        and orders.source_relation = fulfillment.source_relation
 
     {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
     left join refunds_aggregated
@@ -75,6 +85,10 @@ aggregated as (
         min(order_created_timestamp) as first_order_timestamp,
         max(order_created_timestamp) as last_order_timestamp
 
+        {% for status in ['pending', 'open', 'success', 'cancelled', 'error', 'failure'] %}
+        , sum(case when fulfillment_status = '{{ status }}' then 1 else 0 end) as count_fulfillment_{{ status }}
+        {% endfor %}
+
         {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
         , sum(coalesce(subtotal_sold_refunds, 0)) as subtotal_sold_refunds
         , sum(coalesce(quantity_sold_refunds, 0)) as quantity_sold_refunds
diff --git a/models/shopify.yml b/models/shopify.yml
index 59bebef..bb93ada 100644
--- a/models/shopify.yml
+++ b/models/shopify.yml
@@ -555,3 +555,11 @@ models:
         description: The exchange rate between the home currency and the currency of sale at the time of the transaction.
       - name: currency_exchange_calculated_amount
         description: The total amount of the transaction with the currency exchange rate applied.
+
+  - name: shopify__inventory_levels
+    tests:
+      - dbt_utils.unique_combination_of_columns:
+          combination_of_columns:
+            - inventory_item_id
+            - location_id
+            - source_relation
\ No newline at end of file
diff --git a/models/shopify__inventory_levels.sql b/models/shopify__inventory_levels.sql
index 83be80e..8ab1e0f 100644
--- a/models/shopify__inventory_levels.sql
+++ b/models/shopify__inventory_levels.sql
@@ -17,7 +17,7 @@ location as (
 ),
 
 product_variant as (
--- join on sku
+
     select *
     from {{ var('shopify_product_variant') }}
 ),
@@ -34,13 +34,13 @@ inventory_level_aggregated as (
     from {{ ref('shopify__inventory_level__aggregates') }}
 ),
 
-joined as (
+joined_info as (
 
     select 
         inventory_level.*,
         inventory_item.sku,
         inventory_item.is_deleted as is_inventory_item_deleted,
-        inventory_item.cost, -- 
+        inventory_item.cost,
         inventory_item.country_code_of_origin,
         inventory_item.province_code_of_origin,
         inventory_item.is_shipping_required,
@@ -63,6 +63,7 @@ joined as (
         location.zip,
         location.created_at as location_created_at,
 
+        product_variant.variant_id,
         product_variant.title as variant_title,
         product_variant.inventory_policy as variant_inventory_policy,
         product_variant.price as variant_price,
@@ -80,19 +81,7 @@ joined as (
         product_variant.option_3 as variant_option_3,
         product_variant.tax_code as variant_tax_code,
         product_variant.created_timestamp as variant_created_at,
-        product_variant.updated_timestamp as variant_updated_at,
-
-        coalesce(inventory_level_aggregated.subtotal_sold, 0) as subtotal_sold,
-        coalesce(inventory_level_aggregated.quantity_sold, 0) as quantity_sold,
-        coalesce(inventory_level_aggregated.count_distinct_orders, 0) as count_distinct_orders,
-        coalesce(inventory_level_aggregated.count_distinct_customers, 0) as count_distinct_customers,
-        coalesce(inventory_level_aggregated.count_distinct_customer_emails, 0) as count_distinct_customer_emails,
-        inventory_level_aggregated.first_order_timestamp,
-        inventory_level_aggregated.last_order_timestamp
-        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
-        , coalesce(inventory_level_aggregated.subtotal_sold_refunds, 0) as subtotal_sold_refunds
-        , coalesce(inventory_level_aggregated.quantity_sold_refunds, 0) as quantity_sold_refunds
-        {% endif %}
+        product_variant.updated_timestamp as variant_updated_at
 
         {{ fivetran_utils.persist_pass_through_columns('product_variant_pass_through_columns', identifier='product_variant') }}
 
@@ -106,9 +95,36 @@ joined as (
     join product_variant 
         on inventory_item.inventory_item_id = product_variant.inventory_item_id 
         and inventory_item.source_relation = product_variant.source_relation
+
+),
+
+joined_aggregates as (
+
+    select 
+        joined_info.*,
+        coalesce(inventory_level_aggregated.subtotal_sold, 0) as subtotal_sold,
+        coalesce(inventory_level_aggregated.quantity_sold, 0) as quantity_sold,
+        coalesce(inventory_level_aggregated.count_distinct_orders, 0) as count_distinct_orders,
+        coalesce(inventory_level_aggregated.count_distinct_customers, 0) as count_distinct_customers,
+        coalesce(inventory_level_aggregated.count_distinct_customer_emails, 0) as count_distinct_customer_emails,
+        inventory_level_aggregated.first_order_timestamp,
+        inventory_level_aggregated.last_order_timestamp
+
+        {% for status in ['pending', 'open', 'success', 'cancelled', 'error', 'failure'] %}
+        , coalesce(count_fulfillment_{{ status }}, 0) as count_fulfillment_{{ status }}
+        {% endfor %}
+
+        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
+        , coalesce(inventory_level_aggregated.subtotal_sold_refunds, 0) as subtotal_sold_refunds
+        , coalesce(inventory_level_aggregated.quantity_sold_refunds, 0) as quantity_sold_refunds
+        {% endif %}
+
+    from joined_info
     left join inventory_level_aggregated
-        on inventory_level.location_id = inventory_level_aggregated.location_id
-        and product_variant.variant_id = inventory_level_aggregated.variant_id
+        on joined_info.location_id = inventory_level_aggregated.location_id
+        and joined_info.variant_id = inventory_level_aggregated.variant_id
+        and joined_info.source_relation = inventory_level_aggregated.source_relation
 )
 
-select * from joined
\ No newline at end of file
+select * 
+from joined_aggregates
\ No newline at end of file
diff --git a/packages.yml b/packages.yml
index 7e92a85..4146ceb 100644
--- a/packages.yml
+++ b/packages.yml
@@ -2,8 +2,8 @@ packages:
 # - package: fivetran/shopify_source
 #   version: [">=0.7.0", "<0.8.0"]
 
-  - git: https://github.com/fivetran/dbt_shopify_source.git
-    revision: feature/package-revamp
-    warn-unpinned: false
+  # - git: https://github.com/fivetran/dbt_shopify_source.git
+  #   revision: feature/revamp/transform-enhancements
+  #   warn-unpinned: false
 
-# - local: ../Shopify/dbt_shopify_source
+- local: ../Shopify/dbt_shopify_source

From 478ff48a6aa0e29b1a545329787749b133d9fb35 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Wed, 4 Jan 2023 12:51:14 -0800
Subject: [PATCH 04/10] usse github link for packages.yml

---
 packages.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages.yml b/packages.yml
index 4146ceb..7f1a843 100644
--- a/packages.yml
+++ b/packages.yml
@@ -2,8 +2,8 @@ packages:
 # - package: fivetran/shopify_source
 #   version: [">=0.7.0", "<0.8.0"]
 
-  # - git: https://github.com/fivetran/dbt_shopify_source.git
-  #   revision: feature/revamp/transform-enhancements
-  #   warn-unpinned: false
+  - git: https://github.com/fivetran/dbt_shopify_source.git
+    revision: feature/revamp/transform-enhancements
+    warn-unpinned: false
 
-- local: ../Shopify/dbt_shopify_source
+# - local: ../Shopify/dbt_shopify_source

From c5a8a7e5d58b083f15b49b9615eb13f42341cfb8 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:05:59 -0800
Subject: [PATCH 05/10] String agg:

---
 models/shopify__products.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index c1bed9d..fa602bf 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -76,7 +76,7 @@ collections_aggregated as (
     select
         collection_product.product_id,
         collection_product.source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter='", "') }} as collections
+        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter="', '") }} as collections
     from collection_product 
     join collection 
         on collection_product.collection_id = collection.collection_id
@@ -89,7 +89,7 @@ tags_aggregated as (
     select 
         product_id,
         source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter='", "') }} as tags
+        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter="', '") }} as tags
     
     from product_tag
     group by 1,2

From c68aea5f0943c65e2392462a246b4d7ff8876e1e Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:43:44 -0800
Subject: [PATCH 06/10] integration tests

---
 integration_tests/dbt_project.yml                      |  1 +
 .../seeds/shopify_order_adjustment_data.csv            | 10 +++++-----
 integration_tests/seeds/shopify_order_data.csv         |  6 +++---
 .../seeds/shopify_product_variant_data.csv             | 10 +++++-----
 integration_tests/seeds/shopify_refund_data.csv        | 10 +++++-----
 integration_tests/seeds/shopify_transaction_data.csv   | 10 +++++-----
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
index 50d3658..f18b08b 100644
--- a/integration_tests/dbt_project.yml
+++ b/integration_tests/dbt_project.yml
@@ -143,6 +143,7 @@ seeds:
         disjunctive: boolean
         published_at: timestamp
         updated_at: timestamp
+        title: "{{ 'string' if target.type in ('bigquery', 'spark', 'databricks') else 'varchar' }}"
     shopify_metafield_data:
       +column_types:
         value_type: "{{ 'string' if target.type in ('bigquery', 'spark', 'databricks') else 'varchar' }}"
diff --git a/integration_tests/seeds/shopify_order_adjustment_data.csv b/integration_tests/seeds/shopify_order_adjustment_data.csv
index 8f6edd9..191f585 100644
--- a/integration_tests/seeds/shopify_order_adjustment_data.csv
+++ b/integration_tests/seeds/shopify_order_adjustment_data.csv
@@ -1,6 +1,6 @@
 id,order_id,refund_id,amount,tax_amount,kind,reason,amount_set,tax_amount_set,_fivetran_synced
-109271056455,2712175083591,675617407047,-465,0,shipping_refund,Shipping refund,,,2020-11-14 07:52:56.522 +0000
-109277085767,2773486501959,675634708551,-95,0,shipping_refund,Shipping refund,,,2020-11-14 07:54:41.682 +0000
-109245956167,2771757826119,675548168263,-27,-1.6,shipping_refund,Shipping refund,,,2020-11-14 07:44:24.602 +0000
-109248118855,2771329908807,675555016775,-35,0,shipping_refund,Shipping refund,,,2020-11-14 07:45:11.536 +0000
-109275742279,2773429682247,675632644167,-515,0,refund_discrepancy,Refund discrepancy,,,2020-11-14 07:54:31.054 +0000
\ No newline at end of file
+109271056455,2712175083591,675617407047,-465,0,shipping_refund,Shipping refund,,,2020-11-14 07:52:56.522
+109277085767,2773486501959,675634708551,-95,0,shipping_refund,Shipping refund,,,2020-11-14 07:54:41.682
+109245956167,2771757826119,675548168263,-27,-1.6,shipping_refund,Shipping refund,,,2020-11-14 07:44:24.602
+109248118855,2771329908807,675555016775,-35,0,shipping_refund,Shipping refund,,,2020-11-14 07:45:11.536
+109275742279,2773429682247,675632644167,-515,0,refund_discrepancy,Refund discrepancy,,,2020-11-14 07:54:31.054
\ No newline at end of file
diff --git a/integration_tests/seeds/shopify_order_data.csv b/integration_tests/seeds/shopify_order_data.csv
index 83dbb5e..fb0c0ae 100644
--- a/integration_tests/seeds/shopify_order_data.csv
+++ b/integration_tests/seeds/shopify_order_data.csv
@@ -1,4 +1,4 @@
 id,note,email,taxes_included,currency,subtotal_price,total_tax,total_price,created_at,updated_at,name,shipping_address_name,shipping_address_first_name,shipping_address_last_name,shipping_address_company,shipping_address_phone,shipping_address_address_1,shipping_address_address_2,shipping_address_city,shipping_address_country,shipping_address_country_code,shipping_address_province,shipping_address_province_code,shipping_address_zip,shipping_address_latitude,shipping_address_longitude,billing_address_name,billing_address_first_name,billing_address_last_name,billing_address_company,billing_address_phone,billing_address_address_1,billing_address_address_2,billing_address_city,billing_address_country,billing_address_country_code,billing_address_province,billing_address_province_code,billing_address_zip,billing_address_latitude,billing_address_longitude,customer_id,location_id,user_id,number,order_number,financial_status,fulfillment_status,processed_at,processing_method,referring_site,cancel_reason,cancelled_at,closed_at,total_discounts,total_line_items_price,total_weight,source_name,browser_ip,buyer_accepts_marketing,token,cart_token,checkout_token,test,landing_site_base_url,_fivetran_synced
-2674098602081,71509c29301d2cc14e37ecb53f735608,021cb20b5c78751fc7ddc091b6b69b3e,TRUE,GBP,2.8,0,2.8,2020-09-11 19:35:42.000 ,2020-09-11 19:35:46.000 ,d1743fc58a1e4d78769eaac49994a994,8b121314a4d97bc9dc15bfba8518ec88,f0962b7a185488ecb752cedac1038349,aa35cb67c26e64bb81a1bf3f17e858ba,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,d6f4a399883df85d9d4b3a02bf6e738a,bc9b8576178dcd886639ba718f1d45c8,ac08c606d455cde42980f980524a8038,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,d41d8cd98f00b204e9800998ecf8427e,,00079ce435afddc28205639142773870,d97319f64674c02595f2989019970fc8,c08dae474c5d4d3326fd6764d2a0ebe6,8b121314a4d97bc9dc15bfba8518ec88,f0962b7a185488ecb752cedac1038349,aa35cb67c26e64bb81a1bf3f17e858ba,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,d6f4a399883df85d9d4b3a02bf6e738a,bc9b8576178dcd886639ba718f1d45c8,ac08c606d455cde42980f980524a8038,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,d41d8cd98f00b204e9800998ecf8427e,,00079ce435afddc28205639142773870,d97319f64674c02595f2989019970fc8,c08dae474c5d4d3326fd6764d2a0ebe6,3589760876641,,,4135,5135,paid,,2020-09-11 19:35:42.000 ,,,,,,2.8,5.6,0,294517,,TRUE,0f9c2880de17f71511eee5542c29b999,,,FALSE,,2020-09-12 00:15:10.199 
-2669516488801,,dce90c7b4e52e045e5975836aff49cf1,TRUE,GBP,2.8,0,3.79,2020-09-09 23:01:54.000 ,2020-09-10 15:38:26.000 ,4fcb884b5b46413bae526a6e7e49d706,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,3584045351009,,,4066,5066,paid,fulfilled,2020-09-09 23:01:53.000 ,direct,2cc983716a820bc713b793a6e8e73f42,,,2020-09-10 15:38:26.000 ,0,2.8,0,web,109.249.185.68,FALSE,fb489b3ccc0ae36ce47744d7595e9746,b1ff04883dfeab658cd5211050476729,7bdb994e1196de3e4f34586e357613f9,FALSE,8584e97b29b0802fb393fa453a8b6a7a,2020-09-11 00:14:33.536 
-2669509541985,,dce90c7b4e52e045e5975836aff49cf1,TRUE,GBP,4.4,0,5.39,2020-09-09 22:57:51.000 ,2020-09-10 15:38:25.000 ,9e346f2e912c60e16679f4a4c8d29422,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,3584045351009,,,4065,5065,paid,fulfilled,2020-09-09 22:57:50.000 ,direct,2cc983716a820bc713b793a6e8e73f42,,,2020-09-10 15:38:25.000 ,0,4.4,0,web,109.249.185.68,FALSE,e44b7f04610a8f4032530cc7f12663de,9600543f4d4613db59ac58a1009ecbb9,cf0a9fe2c7c606b86559007dbb890a62,FALSE,8584e97b29b0802fb393fa453a8b6a7a,2020-09-11 00:14:33.037 
\ No newline at end of file
+2674098602081,71509c29301d2cc14e37ecb53f735608,021cb20b5c78751fc7ddc091b6b69b3e,TRUE,GBP,2.8,0,2.8,2020-09-11 19:35:42.000,2020-09-11 19:35:46.000,d1743fc58a1e4d78769eaac49994a994,8b121314a4d97bc9dc15bfba8518ec88,f0962b7a185488ecb752cedac1038349,aa35cb67c26e64bb81a1bf3f17e858ba,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,d6f4a399883df85d9d4b3a02bf6e738a,bc9b8576178dcd886639ba718f1d45c8,ac08c606d455cde42980f980524a8038,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,d41d8cd98f00b204e9800998ecf8427e,,00079ce435afddc28205639142773870,d97319f64674c02595f2989019970fc8,c08dae474c5d4d3326fd6764d2a0ebe6,8b121314a4d97bc9dc15bfba8518ec88,f0962b7a185488ecb752cedac1038349,aa35cb67c26e64bb81a1bf3f17e858ba,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,d6f4a399883df85d9d4b3a02bf6e738a,bc9b8576178dcd886639ba718f1d45c8,ac08c606d455cde42980f980524a8038,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,d41d8cd98f00b204e9800998ecf8427e,,00079ce435afddc28205639142773870,d97319f64674c02595f2989019970fc8,c08dae474c5d4d3326fd6764d2a0ebe6,3589760876641,,,4135,5135,paid,,2020-09-11 19:35:42.000,,,,,,2.8,5.6,0,294517,,TRUE,0f9c2880de17f71511eee5542c29b999,,,FALSE,,2020-09-12 00:15:10.199 
+2669516488801,,dce90c7b4e52e045e5975836aff49cf1,TRUE,GBP,2.8,0,3.79,2020-09-09 23:01:54.000,2020-09-10 15:38:26.000,4fcb884b5b46413bae526a6e7e49d706,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,3584045351009,,,4066,5066,paid,fulfilled,2020-09-09 23:01:53.000,direct,2cc983716a820bc713b793a6e8e73f42,,,2020-09-10 15:38:26.000,0,2.8,0,web,109.249.185.68,FALSE,fb489b3ccc0ae36ce47744d7595e9746,b1ff04883dfeab658cd5211050476729,7bdb994e1196de3e4f34586e357613f9,FALSE,8584e97b29b0802fb393fa453a8b6a7a,2020-09-11 00:14:33.536 
+2669509541985,,dce90c7b4e52e045e5975836aff49cf1,TRUE,GBP,4.4,0,5.39,2020-09-09 22:57:51.000,2020-09-10 15:38:25.000,9e346f2e912c60e16679f4a4c8d29422,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,c8189c7add9755e66391b58ecc12b3e2,d3bae70c9d49bb7cb5a74cdd0eae7fc4,0dd89cff60965dff8f9ea2bc952a5474,d41d8cd98f00b204e9800998ecf8427e,d41d8cd98f00b204e9800998ecf8427e,1ff1de774005f8da13f42943881c655f,70111f8840ccbd8b1007cc3f387ced6b,1ac412baeba98370017c73df41c98a07,89f9c9f489be2a83cf57e53b9197d288,79cba1185463850dedba31f172f1dc5b,,,2357e65b582faa0a2da3603b16fa4a7f,75c29d6dd29594a652fcbd7c4c279a29,75468fbebc28e02ec5d4f54f4cbd4099,3584045351009,,,4065,5065,paid,fulfilled,2020-09-09 22:57:50.000,direct,2cc983716a820bc713b793a6e8e73f42,,,2020-09-10 15:38:25.000,0,4.4,0,web,109.249.185.68,FALSE,e44b7f04610a8f4032530cc7f12663de,9600543f4d4613db59ac58a1009ecbb9,cf0a9fe2c7c606b86559007dbb890a62,FALSE,8584e97b29b0802fb393fa453a8b6a7a,2020-09-11 00:14:33.037 
\ No newline at end of file
diff --git a/integration_tests/seeds/shopify_product_variant_data.csv b/integration_tests/seeds/shopify_product_variant_data.csv
index 18dcd0c..44dde0f 100644
--- a/integration_tests/seeds/shopify_product_variant_data.csv
+++ b/integration_tests/seeds/shopify_product_variant_data.csv
@@ -1,6 +1,6 @@
 id,product_id,inventory_item_id,title,price,sku,position,inventory_policy,compare_at_price,fulfillment_service,inventory_management,created_at,updated_at,taxable,barcode,grams,image_id,inventory_quantity,weight,weight_unit,old_inventory_quantity,requires_shipping,_fivetran_synced,option_2,tax_code,option_3,option_1
-39262114414663,6540108431431,41356021661767,my title here,111,,1,deny,,manual,,2021-03-08 16:30:15.000 +0000,2021-04-12 19:49:43.000 +0000,FALSE,,0,,0,0,lb,0,FALSE,2021-04-16 07:50:32.995 +0000,,,,my title here
-39273118957639,6544066379847,41367035936839,my title here,222,,1,deny,,manual,,2021-03-17 16:39:45.000 +0000,2021-04-12 19:46:59.000 +0000,FALSE,,0,,0,0,lb,0,FALSE,2021-04-16 07:50:29.241 +0000,,,,my title here
-39290169262151,6548438188103,41384094924871,my title here,5,,1,deny,,manual,inventory manager,2021-03-30 19:48:15.000 +0000,2021-03-30 19:48:15.000 +0000,TRUE,,0,,0,0,lb,0,TRUE,2021-04-16 07:50:32.720 +0000,,,,my title here
-39262115397703,6540109250631,41356022644807,my title here,333,,1,deny,,manual,,2021-03-08 16:31:31.000 +0000,2021-04-12 19:47:26.000 +0000,FALSE,,0,,-5,0,lb,-5,FALSE,2021-04-16 07:50:29.822 +0000,,,,my title here
-29217058947142,3879735590982,30309980143686,my other title,444,,1,deny,,manual,inventory manager,2019-06-25 18:32:03.000 +0000,2019-10-01 23:40:09.000 +0000,TRUE,,222,,0,1,lb,0,TRUE,2021-04-16 07:50:25.006 +0000,,TR9999,,my other title
\ No newline at end of file
+39262114414663,6540108431431,41356021661767,my title here,111,,1,deny,,manual,,2021-03-08 16:30:15.000,2021-04-12 19:49:43.000,FALSE,,0,,0,0,lb,0,FALSE,2021-04-16 07:50:32.995,,,,my title here
+39273118957639,6544066379847,41367035936839,my title here,222,,1,deny,,manual,,2021-03-17 16:39:45.000,2021-04-12 19:46:59.000,FALSE,,0,,0,0,lb,0,FALSE,2021-04-16 07:50:29.241,,,,my title here
+39290169262151,6548438188103,41384094924871,my title here,5,,1,deny,,manual,inventory manager,2021-03-30 19:48:15.000,2021-03-30 19:48:15.000,TRUE,,0,,0,0,lb,0,TRUE,2021-04-16 07:50:32.720,,,,my title here
+39262115397703,6540109250631,41356022644807,my title here,333,,1,deny,,manual,,2021-03-08 16:31:31.000,2021-04-12 19:47:26.000,FALSE,,0,,-5,0,lb,-5,FALSE,2021-04-16 07:50:29.822,,,,my title here
+29217058947142,3879735590982,30309980143686,my other title,444,,1,deny,,manual,inventory manager,2019-06-25 18:32:03.000,2019-10-01 23:40:09.000,TRUE,,222,,0,1,lb,0,TRUE,2021-04-16 07:50:25.006,,TR9999,,my other title
\ No newline at end of file
diff --git a/integration_tests/seeds/shopify_refund_data.csv b/integration_tests/seeds/shopify_refund_data.csv
index 3ed823d..7a7f50f 100644
--- a/integration_tests/seeds/shopify_refund_data.csv
+++ b/integration_tests/seeds/shopify_refund_data.csv
@@ -1,6 +1,6 @@
 id,created_at,processed_at,note,restock,user_id,_fivetran_synced,total_duties_set,order_id
-801704738887,2021-04-17 20:25:08.000 +0000,2021-04-17 20:25:08.000 +0000,,FALSE,40467791943,2021-04-18 08:05:22.056 +0000,,3726667481159
-801695039559,2021-04-17 15:45:21.000 +0000,2021-04-17 15:45:21.000 +0000,,FALSE,40467791943,2021-04-18 07:52:19.104 +0000,,3725521846343
-801704181831,2021-04-17 20:15:01.000 +0000,2021-04-17 20:15:01.000 +0000,,FALSE,40467791943,2021-04-18 08:05:22.522 +0000,,3726619476039
-801703428167,2021-04-17 19:56:51.000 +0000,2021-04-17 19:56:51.000 +0000,my refund note,FALSE,40467791943,2021-04-18 08:05:22.841 +0000,,3726370996295
-801707360327,2021-04-17 21:32:50.000 +0000,2021-04-17 21:32:50.000 +0000,,FALSE,40467791943,2021-04-18 08:02:24.256 +0000,,3726858289223
\ No newline at end of file
+801704738887,2021-04-17 20:25:08.000,2021-04-17 20:25:08.000,,FALSE,40467791943,2021-04-18 08:05:22.056,,3726667481159
+801695039559,2021-04-17 15:45:21.000,2021-04-17 15:45:21.000,,FALSE,40467791943,2021-04-18 07:52:19.104,,3725521846343
+801704181831,2021-04-17 20:15:01.000,2021-04-17 20:15:01.000,,FALSE,40467791943,2021-04-18 08:05:22.522,,3726619476039
+801703428167,2021-04-17 19:56:51.000,2021-04-17 19:56:51.000,my refund note,FALSE,40467791943,2021-04-18 08:05:22.841,,3726370996295
+801707360327,2021-04-17 21:32:50.000,2021-04-17 21:32:50.000,,FALSE,40467791943,2021-04-18 08:02:24.256,,3726858289223
\ No newline at end of file
diff --git a/integration_tests/seeds/shopify_transaction_data.csv b/integration_tests/seeds/shopify_transaction_data.csv
index 7808885..bef96b7 100644
--- a/integration_tests/seeds/shopify_transaction_data.csv
+++ b/integration_tests/seeds/shopify_transaction_data.csv
@@ -1,6 +1,6 @@
 id,order_id,refund_id,amount,authorization,created_at,processed_at,device_id,gateway,source_name,message,currency,location_id,parent_id,payment_avs_result_code,kind,currency_exchange_id,currency_exchange_adjustment,currency_exchange_original_amount,currency_exchange_final_amount,currency_exchange_currency,error_code,status,test,user_id,_fivetran_synced,payment_credit_card_bin,payment_cvv_result_code,payment_credit_card_number,payment_credit_card_company,receipt
-2667417567303,2181743870023,,415,abcd999999,2020-02-27 16:05:37.000 +0000,2020-02-27 16:05:37.000 +0000,,gateway_here,source_name,message_here,USD,,,Z,sale,,,,,,,success,FALSE,,2020-10-28 20:33:09.797 +0000,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": null }  }] }}
-2572210896967,2089104834631,,415,abcd888888,2020-01-12 20:06:37.000 +0000,2020-01-12 20:06:37.000 +0000,,gateway_here,source_name,message_here,USD,,,Y,sale,,,,,,,success,FALSE,,2020-10-28 17:05:27.756 +0000,,,,,
-2664325611591,2179107356743,,415,abcd77777,2020-02-26 00:12:37.000 +0000,2020-02-26 00:12:37.000 +0000,,gateway_here,source_name,message_here,USD,,,,sale,,,,,,,success,FALSE,,2020-10-28 20:23:50.344 +0000,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": "0.523" }  }] }}
-2595729735751,2114590769223,,15.95,abcd66666,2020-01-26 11:04:41.000 +0000,2020-01-26 11:04:41.000 +0000,,gateway_here,source_name,message_here,USD,,,Y,sale,,,,,,,success,FALSE,,2020-10-28 18:10:27.604 +0000,,,,,
-2705030512711,2214516916295,,212.12,abcd5555,2020-03-18 00:17:24.000 +0000,2020-03-18 00:17:24.000 +0000,,gateway_here,source_name,message_here,USD,,,,sale,,,,,,,success,FALSE,,2020-10-28 22:14:02.944 +0000,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": "0.96581" }  }] }}
\ No newline at end of file
+2667417567303,2181743870023,,415,abcd999999,2020-02-27 16:05:37.000,2020-02-27 16:05:37.000,,gateway_here,source_name,message_here,USD,,,Z,sale,,,,,,,success,FALSE,,2020-10-28 20:33:09.797,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": null }  }] }}
+2572210896967,2089104834631,,415,abcd888888,2020-01-12 20:06:37.000,2020-01-12 20:06:37.000,,gateway_here,source_name,message_here,USD,,,Y,sale,,,,,,,success,FALSE,,2020-10-28 17:05:27.756,,,,,
+2664325611591,2179107356743,,415,abcd77777,2020-02-26 00:12:37.000,2020-02-26 00:12:37.000,,gateway_here,source_name,message_here,USD,,,,sale,,,,,,,success,FALSE,,2020-10-28 20:23:50.344,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": "0.523" }  }] }}
+2595729735751,2114590769223,,15.95,abcd66666,2020-01-26 11:04:41.000,2020-01-26 11:04:41.000,,gateway_here,source_name,message_here,USD,,,Y,sale,,,,,,,success,FALSE,,2020-10-28 18:10:27.604,,,,,
+2705030512711,2214516916295,,212.12,abcd5555,2020-03-18 00:17:24.000,2020-03-18 00:17:24.000,,gateway_here,source_name,message_here,USD,,,,sale,,,,,,,success,FALSE,,2020-10-28 22:14:02.944,,,,,{ "charges": { "data": [ { "balance_transaction": { "exchange_rate": "0.96581" }  }] }}
\ No newline at end of file

From acdeae0122c9ad82012464b3a5e0360e61d5d9b1 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Thu, 5 Jan 2023 15:02:05 -0800
Subject: [PATCH 07/10] Update models/shopify__products.sql

Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com>
---
 models/shopify__products.sql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index fa602bf..9563a66 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -26,9 +26,7 @@ collection as (
 
     select *
     from {{ var('shopify_collection') }}
-
-    -- limit to only active collections
-    where not coalesce(is_deleted, false)
+    where not coalesce(is_deleted, false) -- limit to only active collections
 ),
 
 product_tag as (

From 5b05c67f00e2cfb3fcb3a186c344d8988228bb2c Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Thu, 5 Jan 2023 17:13:22 -0800
Subject: [PATCH 08/10] joe feedback:

---
 dbt_project.yml                               |   2 +
 .../shopify__inventory_level__aggregates.sql  |  15 +-
 .../shopify__orders__order_refunds.sql        |   2 -
 .../shopify__products__with_aggregates.sql    | 110 ++++++++++++
 models/shopify.yml                            | 161 +++++++++++++++++-
 models/shopify__inventory_levels.sql          |  26 ++-
 models/shopify__orders.sql                    |  11 +-
 models/shopify__products.sql                  | 104 +----------
 8 files changed, 296 insertions(+), 135 deletions(-)
 create mode 100644 models/intermediate/shopify__products__with_aggregates.sql

diff --git a/dbt_project.yml b/dbt_project.yml
index 64c5062..f703bba 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -12,6 +12,8 @@ models:
         +materialized: view # so we can use the dbt_utils.star macro
       shopify__inventory_level__aggregates:
         +materialized: table # just for testing. remove later
+      shopify__products__with_aggregates:
+        +materialized: table # just for testing. remove later
 vars:
   shopify:
     shopify_customer: "{{ ref('stg_shopify__customer') }}"
diff --git a/models/intermediate/shopify__inventory_level__aggregates.sql b/models/intermediate/shopify__inventory_level__aggregates.sql
index ab247a9..82e6c66 100644
--- a/models/intermediate/shopify__inventory_level__aggregates.sql
+++ b/models/intermediate/shopify__inventory_level__aggregates.sql
@@ -17,7 +17,6 @@ orders as (
     where not coalesce(is_deleted, false)
 ), 
 
-{% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
 refunds as (
 
     select *
@@ -34,7 +33,6 @@ refunds as (
     from refunds
     group by 1,2
 ),
-{% endif %}
 
 joined as (
 
@@ -49,12 +47,9 @@ joined as (
         order_lines.pre_tax_price,
         order_lines.quantity,
         orders.created_timestamp as order_created_timestamp,
-        fulfillment.status as fulfillment_status
-
-        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
-        , refunds_aggregated.subtotal as subtotal_sold_refunds
-        , refunds_aggregated.quantity as quantity_sold_refunds
-        {% endif %}
+        fulfillment.status as fulfillment_status, 
+        refunds_aggregated.subtotal as subtotal_sold_refunds, 
+        refunds_aggregated.quantity as quantity_sold_refunds
 
     from order_lines
     join orders
@@ -64,11 +59,9 @@ joined as (
         on orders.order_id = fulfillment.order_id
         and orders.source_relation = fulfillment.source_relation
 
-    {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
     left join refunds_aggregated
         on refunds_aggregated.order_line_id = order_lines.order_line_id
         and refunds_aggregated.source_relation = order_lines.source_relation
-    {% endif %}
 ),
 
 aggregated as (
@@ -89,10 +82,8 @@ aggregated as (
         , sum(case when fulfillment_status = '{{ status }}' then 1 else 0 end) as count_fulfillment_{{ status }}
         {% endfor %}
 
-        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
         , sum(coalesce(subtotal_sold_refunds, 0)) as subtotal_sold_refunds
         , sum(coalesce(quantity_sold_refunds, 0)) as quantity_sold_refunds
-        {% endif %}
 
     from joined
 
diff --git a/models/intermediate/shopify__orders__order_refunds.sql b/models/intermediate/shopify__orders__order_refunds.sql
index d91e387..cd775ee 100644
--- a/models/intermediate/shopify__orders__order_refunds.sql
+++ b/models/intermediate/shopify__orders__order_refunds.sql
@@ -1,5 +1,3 @@
-{{ config(enabled=fivetran_utils.enabled_vars(['shopify__using_order_line_refund','shopify__using_refund'])) }}
-
 with refunds as (
 
     select *
diff --git a/models/intermediate/shopify__products__with_aggregates.sql b/models/intermediate/shopify__products__with_aggregates.sql
new file mode 100644
index 0000000..c4da9d2
--- /dev/null
+++ b/models/intermediate/shopify__products__with_aggregates.sql
@@ -0,0 +1,110 @@
+with products as (
+
+    select *
+    from {{ var('shopify_product') }}
+), 
+
+collection_product as (
+
+    select *
+    from {{ var('shopify_collection_product') }}
+),
+
+collection as (
+
+    select *
+    from {{ var('shopify_collection') }}
+    where not coalesce(is_deleted, false) -- limit to only active collections
+),
+
+product_tag as (
+
+    select *
+    from {{ var('shopify_product_tag') }}
+),
+
+product_variant as (
+
+    select *
+    from {{ var('shopify_product_variant') }}
+),
+
+product_image as (
+
+    select *
+    from {{ var('shopify_product_image') }}
+),
+
+
+collections_aggregated as (
+
+    select
+        collection_product.product_id,
+        collection_product.source_relation,
+        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter="', '") }} as collections
+    from collection_product 
+    join collection 
+        on collection_product.collection_id = collection.collection_id
+        and collection_product.source_relation = collection.source_relation
+    group by 1,2
+),
+
+tags_aggregated as (
+
+    select 
+        product_id,
+        source_relation,
+        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter="', '") }} as tags
+    
+    from product_tag
+    group by 1,2
+),
+
+variants_aggregated as (
+
+    select 
+        product_id,
+        source_relation,
+        count(variant_id) as count_variants
+
+    from product_variant
+    group by 1,2
+
+),
+
+images_aggregated as (
+
+    select 
+        product_id,
+        source_relation,
+        count(*) as count_images
+    from product_image
+    group by 1,2
+),
+
+joined as (
+
+    select
+        products.*,
+        collections_aggregated.collections,
+        tags_aggregated.tags,
+        variants_aggregated.count_variants,
+        coalesce(images_aggregated.count_images, 0) > 0 as has_product_image
+
+    from products
+    left join collections_aggregated
+        on products.product_id = collections_aggregated.product_id
+        and products.source_relation = collections_aggregated.source_relation
+    left join tags_aggregated
+        on products.product_id = tags_aggregated.product_id
+        and products.source_relation = tags_aggregated.source_relation
+    left join variants_aggregated
+        on products.product_id = variants_aggregated.product_id
+        and products.source_relation = variants_aggregated.source_relation
+    left join images_aggregated
+        on products.product_id = images_aggregated.product_id
+        and products.source_relation = images_aggregated.source_relation
+)
+
+select *
+from joined
\ No newline at end of file
diff --git a/models/shopify.yml b/models/shopify.yml
index bb93ada..11e77ac 100644
--- a/models/shopify.yml
+++ b/models/shopify.yml
@@ -557,9 +557,168 @@ models:
         description: The total amount of the transaction with the currency exchange rate applied.
 
   - name: shopify__inventory_levels
+    description: >
+      Model representing the current status of an inventory level in Shopify. Inventory Levels are unique pairings of 
+      inventory items (which have a 1:1 relationship with product variants) and locations. 
+      
+      Inventory Level = Inventory item @ a Location.
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
             - inventory_item_id
             - location_id
-            - source_relation
\ No newline at end of file
+            - source_relation
+    columns:
+      - name: _fivetran_synced
+        description: "{{ doc('_fivetran_synced') }}"
+      - name: available_quantity
+        description: The available quantity of an inventory item at the inventory level's associated location. Returns null if the inventory item is not tracked.
+      - name: inventory_item_id
+        description: The ID of the inventory item associated with the inventory level.
+        tests:
+          - not_null
+      - name: location_id
+        description: The ID of the location that the inventory level belongs to.
+        tests:
+          - not_null
+      - name: updated_at
+        description: The date and time (ISO 8601 format) when the inventory level was last modified.
+      - name: is_inventory_item_deleted
+        description: "{{ doc('_fivetran_deleted') }}"
+      - name: sku
+        description: The unique SKU (stock keeping unit) of the inventory item.
+      - name: cost
+        description: The unit cost of the inventory item. The shop's default currency is used.
+      - name: province_code_of_origin
+        description: The province code (ISO 3166-2 alpha-2) of where the item came from. The province code is only used if the shipping provider for the inventory item is Canada Post.
+      - name: country_code_of_origin
+        description: The country code (ISO 3166-1 alpha-2) of where the item came from.
+      - name: is_shipping_required
+        description: Boolean representing whether a customer needs to provide a shipping address when placing an order containing the inventory item.
+      - name: is_inventory_quantity_tracked
+        description: Boolean representing whether inventory levels are tracked for the item. If true, then the inventory quantity changes are tracked by Shopify.
+      - name: inventory_item_created_at
+        description: The date and time (ISO 8601 format) when the inventory item was created.
+      - name: inventory_item_updated_at
+        description: The date and time (ISO 8601 format) when the inventory item was last modified.
+      - name: is_location_deleted
+        description: "{{ doc('_fivetran_deleted') }}"
+      - name: is_location_active
+        description: >
+          Boolean representing whether the location is active. If true, then the location can be used to sell products, stock inventory, and fulfill orders.
+      - name: address_1
+        description: The location's street address.
+      - name: address_2
+        description: The optional second line of the location's street address.
+      - name: city
+        description: The city the location is in.
+      - name: country
+        description: The country the location is in (two-letter code).
+      - name: country_code
+        description: The two-letter code (ISO 3166-1 alpha-2 format) corresponding to country the location is in.
+      - name: location_created_at
+        description: The date and time (ISO 8601 format) when the location was created.
+      - name: is_legacy_location
+        description: >
+          Boolean representing whether this is a fulfillment service location. If true, then the location is a fulfillment service location. 
+          If false, then the location was created by the merchant and isn't tied to a fulfillment service.
+      - name: location_name
+        description: The name of the location.
+      - name: phone
+        description: The phone number of the location. This value can contain special characters, such as - or +.
+      - name: province
+        description: The province, state, or district of the location.
+      - name: province_code
+        description: The province, state, or district code (ISO 3166-2 alpha-2 format) of the location.
+      - name: location_updated_at
+        description: The date and time (ISO 8601 format) when the location was last updated.
+      - name: zip
+        description: The zip or postal code.
+      - name: variant_barcode
+        description: The barcode, UPC, or ISBN number for the product.
+      - name: variant_created_at
+        description: The date and time (ISO 8601 format) when the product variant was created.
+      - name: variant_fulfillment_service
+        description: The fulfillment service associated with the product variant.
+      - name: variant_grams
+        description: The weight of the product variant in grams.
+      - name: variant_id
+        description: The unique numeric identifier for the product variant.
+      - name: variant_image_id
+        description: The unique numeric identifier for a product's image. The image must be associated to the same product as the variant.
+      - name: variant_inventory_management
+        description: The fulfillment service that tracks the number of items in stock for the product variant.
+      - name: variant_inventory_policy
+        description: Whether customers are allowed to place an order for the product variant when it's out of stock.
+      - name: variant_inventory_quantity
+        description: An aggregate of inventory across all locations. To adjust inventory at a specific location, use the InventoryLevel resource.
+      - name: variant_option_1
+        description: "The custom properties that a shop owner uses to define product variants. You can define three options for a product variant: option1, option2, option3."
+      - name: variant_option_2
+        description: "The custom properties that a shop owner uses to define product variants. You can define three options for a product variant: option1, option2, option3."
+      - name: variant_option_3
+        description: "The custom properties that a shop owner uses to define product variants. You can define three options for a product variant: option1, option2, option3."
+      - name: variant_price
+        description: The price of the product variant.
+      - name: product_id
+        description: The unique numeric identifier for the product.
+      - name: is_variant_taxable
+        description: Whether a tax is charged when the product variant is sold.
+      - name: variant_tax_code
+        description: This parameter applies only to the stores that have the Avalara AvaTax app installed. Specifies the Avalara tax code for the product variant.
+      - name: variant_title
+        description: The title of the product variant. The title field is a concatenation of the option1, option2, and option3 fields. You can only update title indirectly using the option fields.
+      - name: variant_updated_at
+        description: The date and time when the product variant was last modified. Gets returned in ISO 8601 format.
+      - name: variant_weight
+        description: The weight of the product variant in the unit system specified with weight_unit.
+      - name: variant_weight_unit
+        description: "The unit of measurement that applies to the product variant's weight. If you don't specify a value for weight_unit, then the shop's default unit of measurement is applied. Valid values: g, kg, oz, and lb."
+      - name: subtotal_sold
+        description: Total amount (monetary) sold from the inventory level. Includes refunds.
+      - name: quantity_sold
+        description: Total quantity sold from the inventory level. Includes refunds.
+      - name: count_distinct_orders
+        description: The number of distinct orders placed from this inventory level. 
+      - name: count_distinct_customers
+        description: The number of distinct customers (based on customer_id) that have placed orders against this inventory level.
+      - name: count_distinct_customer_emails
+        description: The number of distinct customer emails that have placed orders against this inventory level.
+      - name: first_order_timestamp
+        description: The timetamp of the first order against this inventory level.
+      - name: last_order_timestamp
+        description: The timetamp of the first order against this inventory level.
+      - name: subtotal_sold_refunds
+        description: The monetary amount of inventory level goods that have been refunded.
+      - name: quantity_sold_refunds 
+        description: The quantity of inventory level goods that have been refunded.
+      - name: net_subtotal_sold
+        description: Net monetary amount sold from the inventory level. Excludes refunds.
+      - name: net_quantity_sold
+        description: Net quantity sold from this inventory levle. Excludes refunds.
+      - name: count_fulfillment_pending
+        description: >
+          Count of currently pending fulfillments for this inventory level.
+          "Pending" = Shopify has created the fulfillment and is waiting for the third-party fulfillment service to transition it to 'open' or 'success'.
+      - name: count_fulfillment_open
+        description: >
+          Count of currently open fulfillments for this inventory level.
+          "Open" = The fulfillment has been acknowledged by the service and is in processing.
+      - name: count_fulfillment_success
+        description: >
+          Count of successful fulfillments for this inventory level.
+          "Success" = The fulfillment was successful.
+      - name: count_fulfillment_cancelled
+        description: >
+          Count of cancelled fulfillments for this inventory level.
+          "Cancelled" = The fulfillment was cancelled.
+      - name: count_fulfillment_error
+        description: >
+          Count of fulfillments for this inventory level that encountered an error.
+          "Error" = There was an error with the fulfillment request.
+      - name: count_fulfillment_failure
+        description: >
+          Count of fulfillments for this inventory level that failed.
+          "Failure" = The fulfillment request failed.
+      - name: source_relation
+        description: The schema or database this record came from, if you are unioning multiple connectors. Null if not.
\ No newline at end of file
diff --git a/models/shopify__inventory_levels.sql b/models/shopify__inventory_levels.sql
index 8ab1e0f..910e093 100644
--- a/models/shopify__inventory_levels.sql
+++ b/models/shopify__inventory_levels.sql
@@ -62,20 +62,22 @@ joined_info as (
         location.phone,
         location.zip,
         location.created_at as location_created_at,
+        location.updated_at as location_updated_at,
 
         product_variant.variant_id,
+        product_variant.product_id,
         product_variant.title as variant_title,
         product_variant.inventory_policy as variant_inventory_policy,
         product_variant.price as variant_price,
         product_variant.image_id as variant_image_id,
         product_variant.fulfillment_service as variant_fulfillment_service,
         product_variant.inventory_management as variant_inventory_management,
-        product_variant.is_taxable as is_product_variant_taxable,
+        product_variant.is_taxable as is_variant_taxable,
         product_variant.barcode as variant_barcode,
         product_variant.grams as variant_grams, 
         product_variant.inventory_quantity as variant_inventory_quantity,
         product_variant.weight as variant_weight,
-        product_variant.weight_unit as weight_unit,
+        product_variant.weight_unit as variant_weight_unit,
         product_variant.option_1 as variant_option_1,
         product_variant.option_2 as variant_option_2,
         product_variant.option_3 as variant_option_3,
@@ -108,23 +110,29 @@ joined_aggregates as (
         coalesce(inventory_level_aggregated.count_distinct_customers, 0) as count_distinct_customers,
         coalesce(inventory_level_aggregated.count_distinct_customer_emails, 0) as count_distinct_customer_emails,
         inventory_level_aggregated.first_order_timestamp,
-        inventory_level_aggregated.last_order_timestamp
+        inventory_level_aggregated.last_order_timestamp,
+        coalesce(inventory_level_aggregated.subtotal_sold_refunds, 0) as subtotal_sold_refunds,
+        coalesce(inventory_level_aggregated.quantity_sold_refunds, 0) as quantity_sold_refunds
 
         {% for status in ['pending', 'open', 'success', 'cancelled', 'error', 'failure'] %}
         , coalesce(count_fulfillment_{{ status }}, 0) as count_fulfillment_{{ status }}
         {% endfor %}
 
-        {%- if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) -%}
-        , coalesce(inventory_level_aggregated.subtotal_sold_refunds, 0) as subtotal_sold_refunds
-        , coalesce(inventory_level_aggregated.quantity_sold_refunds, 0) as quantity_sold_refunds
-        {% endif %}
-
     from joined_info
     left join inventory_level_aggregated
         on joined_info.location_id = inventory_level_aggregated.location_id
         and joined_info.variant_id = inventory_level_aggregated.variant_id
         and joined_info.source_relation = inventory_level_aggregated.source_relation
+),
+
+final as (
+
+    select 
+        *,
+        subtotal_sold - subtotal_sold_refunds as net_subtotal_sold,
+        quantity_sold - quantity_sold_refunds as net_quantity_sold
+    from joined_aggregates
 )
 
 select * 
-from joined_aggregates
\ No newline at end of file
+from final
\ No newline at end of file
diff --git a/models/shopify__orders.sql b/models/shopify__orders.sql
index 8c3684c..6e80b81 100644
--- a/models/shopify__orders.sql
+++ b/models/shopify__orders.sql
@@ -24,7 +24,6 @@ with orders as (
     group by 1,2
 {% endif %}
 
-{% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
 ), refunds as (
 
     select *
@@ -38,7 +37,6 @@ with orders as (
         sum(total_tax) as refund_total_tax
     from refunds
     group by 1,2
-{% endif %}
 
 ), joined as (
 
@@ -51,28 +49,23 @@ with orders as (
         order_adjustments_aggregates.order_adjustment_tax_amount,
         {% endif %}
 
-        {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
         refund_aggregates.refund_subtotal,
         refund_aggregates.refund_total_tax,
-        {% endif %}
+
         (orders.total_price
             {% if var('shopify__using_order_adjustment', true) %}
             + coalesce(order_adjustments_aggregates.order_adjustment_amount,0) + coalesce(order_adjustments_aggregates.order_adjustment_tax_amount,0) 
             {% endif %}
-            {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
-            - coalesce(refund_aggregates.refund_subtotal,0) - coalesce(refund_aggregates.refund_total_tax,0)
-            {% endif %} ) as order_adjusted_total,
+            - coalesce(refund_aggregates.refund_subtotal,0) - coalesce(refund_aggregates.refund_total_tax,0)) as order_adjusted_total,
         order_lines.line_item_count
     from orders
     left join order_lines
         on orders.order_id = order_lines.order_id
         and orders.source_relation = order_lines.source_relation
 
-    {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
     left join refund_aggregates
         on orders.order_id = refund_aggregates.order_id
         and orders.source_relation = refund_aggregates.source_relation
-    {% endif %}
     {% if var('shopify__using_order_adjustment', true) %}
     left join order_adjustments_aggregates
         on orders.order_id = order_adjustments_aggregates.order_id
diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index 9563a66..567a51b 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -1,7 +1,7 @@
 with products as (
 
     select *
-    from {{ var('shopify_product') }}
+    from {{ ref('shopify__products__with_aggregates') }}
 ), 
 
 order_lines as (
@@ -16,37 +16,6 @@ orders as (
     from {{ ref('shopify__orders')}}
 ), 
 
-collection_product as (
-
-    select *
-    from {{ var('shopify_collection_product') }}
-),
-
-collection as (
-
-    select *
-    from {{ var('shopify_collection') }}
-    where not coalesce(is_deleted, false) -- limit to only active collections
-),
-
-product_tag as (
-
-    select *
-    from {{ var('shopify_product_tag') }}
-),
-
-product_variant as (
-
-    select *
-    from {{ var('shopify_product_variant') }}
-),
-
-product_image as (
-
-    select *
-    from {{ var('shopify_product_image') }}
-),
-
 order_lines_aggregated as (
 
     select 
@@ -55,10 +24,8 @@ order_lines_aggregated as (
         sum(order_lines.quantity) as quantity_sold,
         sum(order_lines.pre_tax_price) as subtotal_sold,
 
-        {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
         sum(order_lines.quantity_net_refunds) as quantity_sold_net_refunds,
         sum(order_lines.subtotal_net_refunds) as subtotal_sold_net_refunds,
-        {% endif %}
 
         min(orders.created_timestamp) as first_order_timestamp,
         max(orders.created_timestamp) as most_recent_order_timestamp
@@ -69,88 +36,21 @@ order_lines_aggregated as (
 
 ), 
 
-collections_aggregated as (
-
-    select
-        collection_product.product_id,
-        collection_product.source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='collection.title', delimiter="', '") }} as collections
-    from collection_product 
-    join collection 
-        on collection_product.collection_id = collection.collection_id
-        and collection_product.source_relation = collection.source_relation
-    group by 1,2
-),
-
-tags_aggregated as (
-
-    select 
-        product_id,
-        source_relation,
-        {{ fivetran_utils.string_agg(field_to_agg='value', delimiter="', '") }} as tags
-    
-    from product_tag
-    group by 1,2
-),
-
-variants_aggregated as (
-
-    select 
-        product_id,
-        source_relation,
-        count(variant_id) as count_variants
-
-    from product_variant
-    group by 1,2
-
-),
-
-images_aggregated as (
-
-    select 
-        product_id,
-        source_relation,
-        count(*) as count_images
-    from product_image
-    group by 1,2
-),
-
 joined as (
 
     select
         products.*,
         coalesce(order_lines_aggregated.quantity_sold,0) as quantity_sold,
         coalesce(order_lines_aggregated.subtotal_sold,0) as subtotal_sold,
-
-        {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
         coalesce(order_lines_aggregated.quantity_sold_net_refunds,0) as quantity_sold_net_refunds,
         coalesce(order_lines_aggregated.subtotal_sold_net_refunds,0) as subtotal_sold_net_refunds,
-        {% endif %}
-        
         order_lines_aggregated.first_order_timestamp,
-        order_lines_aggregated.most_recent_order_timestamp,
-
-        collections_aggregated.collections,
-        tags_aggregated.tags,
-        variants_aggregated.count_variants,
-        coalesce(images_aggregated.count_images, 0) > 0 as has_product_image
+        order_lines_aggregated.most_recent_order_timestamp
 
     from products
     left join order_lines_aggregated
         on products.product_id = order_lines_aggregated.product_id
         and products.source_relation = order_lines_aggregated.source_relation
-    left join collections_aggregated
-        on products.product_id = collections_aggregated.product_id
-        and products.source_relation = collections_aggregated.source_relation
-    left join tags_aggregated
-        on products.product_id = tags_aggregated.product_id
-        and products.source_relation = tags_aggregated.source_relation
-    left join variants_aggregated
-        on products.product_id = variants_aggregated.product_id
-        and products.source_relation = variants_aggregated.source_relation
-    left join images_aggregated
-        on products.product_id = images_aggregated.product_id
-        and products.source_relation = images_aggregated.source_relation
 )
 
 select *

From 56bc8c6dcda7d52eb6b580a4c7ecf69883bfed42 Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:58:08 -0800
Subject: [PATCH 09/10] joe feedback

---
 .buildkite/scripts/run_models.sh                 |  6 ++----
 DECISIONLOG.md                                   | 16 +++++++++++++++-
 README.md                                        | 12 +-----------
 dbt_project.yml                                  |  6 +++---
 ...ql => int_shopify__customer_email_rollup.sql} |  0
 ...=> int_shopify__emails__order_aggregates.sql} |  0
 ...int_shopify__inventory_level__aggregates.sql} |  2 +-
 ...=> int_shopify__products_with_aggregates.sql} |  0
 models/intermediate/intermediate.yml             |  6 +++---
 models/shopify__customer_emails.sql              |  6 +++---
 models/shopify__inventory_levels.sql             |  2 +-
 models/shopify__order_lines.sql                  |  8 +-------
 models/shopify__orders.sql                       |  8 --------
 models/shopify__products.sql                     |  2 +-
 14 files changed, 31 insertions(+), 43 deletions(-)
 rename models/intermediate/{shopify__customer_email_rollup.sql => int_shopify__customer_email_rollup.sql} (100%)
 rename models/intermediate/{shopify__emails__order_aggregates.sql => int_shopify__emails__order_aggregates.sql} (100%)
 rename models/intermediate/{shopify__inventory_level__aggregates.sql => int_shopify__inventory_level__aggregates.sql} (96%)
 rename models/intermediate/{shopify__products__with_aggregates.sql => int_shopify__products_with_aggregates.sql} (100%)

diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh
index 3828b34..3e08693 100644
--- a/.buildkite/scripts/run_models.sh
+++ b/.buildkite/scripts/run_models.sh
@@ -19,7 +19,5 @@ dbt deps
 dbt seed --target "$db" --full-refresh
 dbt run --target "$db" --full-refresh
 dbt test --target "$db"
-dbt run --vars '{shopify__using_order_adjustment: false, shopify__using_order_line_refund: false, shopify__using_refund: false}' --target "$db" --full-refresh
-dbt test --target "$db"
-dbt run --vars '{shopify__using_order_line_refund: false}' --target "$db" --full-refresh
-dbt run --vars '{shopify__using_refund: false}' --target "$db" --full-refresh
\ No newline at end of file
+dbt run --vars '{shopify_timezone: "America/New_York"}' --target "$db" --full-refresh
+dbt test --target "$db"
\ No newline at end of file
diff --git a/DECISIONLOG.md b/DECISIONLOG.md
index 95bebf6..a5e6ae2 100644
--- a/DECISIONLOG.md
+++ b/DECISIONLOG.md
@@ -1,7 +1,21 @@
 ## Decision Log
 
+In creating this package, which is meant for a wide range of use cases, we had to take opinionated stances on a few different questions we came across during development. We've consolidated significant choices we made here, and will continue to update as the package evolves. 
+
 ### Refund/Return Timestamp Mismatch
 
 In validating metrics with the Sales over Time reports in the Shopify UI, you may detect discrepancies in reported revenue. A known difference between this package's reporting and the Shopify UI is that Shopify's UI will report refunded revenue on the date that the _return was processed_ (see Shopify [docs](https://help.shopify.com/en/manual/reports-and-analytics/shopify-reports/report-types/sales-report)), whereas this package reports on the date the _order was placed_. So, if a customer placed an order amounting to $50 on November 30th, 2022 and fully returned it on December 1st, 2022, the package would report $0 net sales for this customer on November 30th, while Shopify would report $50 in sales on November 30th and -$50 on December 1st. 
 
-We felt that reporting on the order date made more sense in reality, but, if you feel differently, please reach out and create a Feature Request. To align with the Shopify method yourself, this would most likely involve aggregating `transactions` data (relying on the `kind` column to determine sales vs returns) instead of `orders`.
\ No newline at end of file
+We felt that reporting on the order date made more sense in reality, but, if you feel differently, please reach out and create a Feature Request. To align with the Shopify method yourself, this would most likely involve aggregating `transactions` data (relying on the `kind` column to determine sales vs returns) instead of `orders`.
+
+## Creating Empty Tables for Refunds, Order Line Refunds, and Order Adjustments 
+
+Source tables related to `refunds`, `order_line_refunds`, and `order_adjustments` are created in the Shopify schema dyanmically. For example, if your shop has not incurred any refunds, you will not have a `refund` table yet until you do refund an order. 
+
+Thus, the source package will create empty (1 row of all `NULL` fields) staging models if these source tables do not exist in your Shopify schema yet, and the transform package will work seamlessly with these empty models. Once `refund`, `order_line_refund`, or `order_adjustment` exists in your schema, the source and transform packages will automatically reference the new populated table(s). ([example](https://github.com/fivetran/dbt_shopify_source/blob/main/models/tmp/stg_shopify__refund_tmp.sql)). 
+
+> In previous versions of the package, you had to manually enable or disable transforms of `refund`, `order_line_refund`, or `order_adjustment` through variables. Because this required you to monitor your Shopify account/schema and update the variable(s) accordingly, we decided to pursue a more automated solution.
+
+## Keeping Deleted Entities 
+
+todo - not filtering out _fivetran_deleted in staging models. when joining these tables together in the transform package, bring in _fivetran_deleted as is_<foreign key table>_deleted
\ No newline at end of file
diff --git a/README.md b/README.md
index 83d8c82..7274fce 100644
--- a/README.md
+++ b/README.md
@@ -66,17 +66,7 @@ vars:
     shopify_union_databases: ['shopify_usa','shopify_canada'] # use this if the data is in different databases/projects but uses the same schema name
 ```
 
-## Step 4: Disable models for non-existent sources
-This package was designed with the intention that users have all relevant Shopify tables being synced by Fivetran. However, if you are a Shopify user that does not operate on `returns` or `adjustments` then you will not have the related source tables. As such, you may use the below variable configurations to disable the respective downstream models. All variables are `true` by default. Only add the below configuration to your root `dbt_project.yml` if you are wishing to disable the models:
-
-```yml
-# dbt_project.yml
-
-vars:
-  shopify__using_order_adjustment:  false  # true by default
-  shopify__using_order_line_refund: false  # true by default
-  shopify__using_refund:            false  # true by default
-```
+## Step 4: TODO - timezone converting, maybe should be optional
 
 ## (Optional) Step 5: Additional configurations
 <details><summary>Expand for configurations</summary>
diff --git a/dbt_project.yml b/dbt_project.yml
index f703bba..9a556b9 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -8,11 +8,11 @@ models:
     +materialized: table
     intermediate:
       +materialized: ephemeral
-      shopify__customer_email_rollup:
+      int_shopify__customer_email_rollup:
         +materialized: view # so we can use the dbt_utils.star macro
-      shopify__inventory_level__aggregates:
+      int_shopify__inventory_level__aggregates:
         +materialized: table # just for testing. remove later
-      shopify__products__with_aggregates:
+      int_shopify__products_with_aggregates:
         +materialized: table # just for testing. remove later
 vars:
   shopify:
diff --git a/models/intermediate/shopify__customer_email_rollup.sql b/models/intermediate/int_shopify__customer_email_rollup.sql
similarity index 100%
rename from models/intermediate/shopify__customer_email_rollup.sql
rename to models/intermediate/int_shopify__customer_email_rollup.sql
diff --git a/models/intermediate/shopify__emails__order_aggregates.sql b/models/intermediate/int_shopify__emails__order_aggregates.sql
similarity index 100%
rename from models/intermediate/shopify__emails__order_aggregates.sql
rename to models/intermediate/int_shopify__emails__order_aggregates.sql
diff --git a/models/intermediate/shopify__inventory_level__aggregates.sql b/models/intermediate/int_shopify__inventory_level__aggregates.sql
similarity index 96%
rename from models/intermediate/shopify__inventory_level__aggregates.sql
rename to models/intermediate/int_shopify__inventory_level__aggregates.sql
index 82e6c66..f879ffc 100644
--- a/models/intermediate/shopify__inventory_level__aggregates.sql
+++ b/models/intermediate/int_shopify__inventory_level__aggregates.sql
@@ -40,7 +40,7 @@ joined as (
         order_lines.order_line_id,
         order_lines.variant_id,
         order_lines.source_relation,
-        coalesce(fulfillment.location_id, orders.location_id) as location_id,
+        fulfillment.location_id, -- location id is stored in fulfillment rather than order
         orders.order_id,
         orders.customer_id,
         lower(orders.email) as email,
diff --git a/models/intermediate/shopify__products__with_aggregates.sql b/models/intermediate/int_shopify__products_with_aggregates.sql
similarity index 100%
rename from models/intermediate/shopify__products__with_aggregates.sql
rename to models/intermediate/int_shopify__products_with_aggregates.sql
diff --git a/models/intermediate/intermediate.yml b/models/intermediate/intermediate.yml
index 1d2ffaa..401b3b5 100644
--- a/models/intermediate/intermediate.yml
+++ b/models/intermediate/intermediate.yml
@@ -14,19 +14,19 @@ models:
             - order_id
             - source_relation
   - name: shopify__orders__order_refunds
-  - name: shopify__emails__order_aggregates
+  - name: int_shopify__emails__order_aggregates
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
             - email
             - source_relation
-  - name: shopify__customer_email_rollup
+  - name: int_shopify__customer_email_rollup
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
             - email
             - source_relation
-  - name: shopify__inventory_level__aggregates
+  - name: int_hopify__inventory_level__aggregates
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
diff --git a/models/shopify__customer_emails.sql b/models/shopify__customer_emails.sql
index 1e9be41..1b70210 100644
--- a/models/shopify__customer_emails.sql
+++ b/models/shopify__customer_emails.sql
@@ -1,13 +1,13 @@
 with customer_emails as (
 
     select 
-        {{ dbt_utils.star(from=ref('shopify__customer_email_rollup'), except=["orders_count", "total_spent"]) }}
-    from {{ ref('shopify__customer_email_rollup') }}
+        {{ dbt_utils.star(from=ref('int_shopify__customer_email_rollup'), except=["orders_count", "total_spent"]) }}
+    from {{ ref('int_shopify__customer_email_rollup') }}
 
 ), orders as (
 
     select *
-    from {{ ref('shopify__emails__order_aggregates' )}}
+    from {{ ref('int_shopify__emails__order_aggregates' )}}
 
 ), joined as (
 
diff --git a/models/shopify__inventory_levels.sql b/models/shopify__inventory_levels.sql
index 910e093..489e4ec 100644
--- a/models/shopify__inventory_levels.sql
+++ b/models/shopify__inventory_levels.sql
@@ -31,7 +31,7 @@ product as (
 inventory_level_aggregated as (
 
     select *
-    from {{ ref('shopify__inventory_level__aggregates') }}
+    from {{ ref('int_shopify__inventory_level__aggregates') }}
 ),
 
 joined_info as (
diff --git a/models/shopify__order_lines.sql b/models/shopify__order_lines.sql
index 8e22b0a..1b1f8de 100644
--- a/models/shopify__order_lines.sql
+++ b/models/shopify__order_lines.sql
@@ -8,7 +8,6 @@ with order_lines as (
     select *
     from {{ var('shopify_product_variant') }}
 
-{% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
 ), refunds as (
 
     select *
@@ -23,19 +22,16 @@ with order_lines as (
         sum(coalesce(subtotal, 0)) as subtotal
     from refunds
     group by 1,2
-{% endif %}
 
 ), joined as (
 
     select
         order_lines.*,
 
-        {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
         coalesce(refunds_aggregated.quantity,0) as refunded_quantity,
         coalesce(refunds_aggregated.subtotal,0) as refunded_subtotal,
         order_lines.quantity - coalesce(refunds_aggregated.quantity,0) as quantity_net_refunds,
         order_lines.pre_tax_price  - coalesce(refunds_aggregated.subtotal,0) as subtotal_net_refunds,
-        {% endif %}
         
         product_variants.created_timestamp as variant_created_at,
         product_variants.updated_timestamp as variant_updated_at,
@@ -60,14 +56,12 @@ with order_lines as (
         product_variants.option_3 as variant_option_3,
         product_variants.tax_code as variant_tax_code
         {# ,
-        use inventoryitem or order line itself
+        use inventoryitem or order line itself -- add later TODO
         product_variants.is_requiring_shipping as variant_is_requiring_shipping #}
     from order_lines
-    {% if fivetran_utils.enabled_vars(vars=["shopify__using_order_line_refund", "shopify__using_refund"]) %}
     left join refunds_aggregated
         on refunds_aggregated.order_line_id = order_lines.order_line_id
         and refunds_aggregated.source_relation = order_lines.source_relation
-    {% endif %}
     left join product_variants
         on product_variants.variant_id = order_lines.variant_id
         and product_variants.source_relation = order_lines.source_relation
diff --git a/models/shopify__orders.sql b/models/shopify__orders.sql
index 6e80b81..599e31c 100644
--- a/models/shopify__orders.sql
+++ b/models/shopify__orders.sql
@@ -8,7 +8,6 @@ with orders as (
     select *
     from {{ ref('shopify__orders__order_line_aggregates') }}
 
-{% if var('shopify__using_order_adjustment', true) %}
 ), order_adjustments as (
 
     select *
@@ -22,7 +21,6 @@ with orders as (
         sum(tax_amount) as order_adjustment_tax_amount
     from order_adjustments
     group by 1,2
-{% endif %}
 
 ), refunds as (
 
@@ -44,18 +42,14 @@ with orders as (
         orders.*,
         coalesce(cast({{ fivetran_utils.json_parse("total_shipping_price_set",["shop_money","amount"]) }} as {{ dbt.type_float() }}) ,0) as shipping_cost,
         
-        {% if var('shopify__using_order_adjustment', true) %}
         order_adjustments_aggregates.order_adjustment_amount,
         order_adjustments_aggregates.order_adjustment_tax_amount,
-        {% endif %}
 
         refund_aggregates.refund_subtotal,
         refund_aggregates.refund_total_tax,
 
         (orders.total_price
-            {% if var('shopify__using_order_adjustment', true) %}
             + coalesce(order_adjustments_aggregates.order_adjustment_amount,0) + coalesce(order_adjustments_aggregates.order_adjustment_tax_amount,0) 
-            {% endif %}
             - coalesce(refund_aggregates.refund_subtotal,0) - coalesce(refund_aggregates.refund_total_tax,0)) as order_adjusted_total,
         order_lines.line_item_count
     from orders
@@ -66,11 +60,9 @@ with orders as (
     left join refund_aggregates
         on orders.order_id = refund_aggregates.order_id
         and orders.source_relation = refund_aggregates.source_relation
-    {% if var('shopify__using_order_adjustment', true) %}
     left join order_adjustments_aggregates
         on orders.order_id = order_adjustments_aggregates.order_id
         and orders.source_relation = order_adjustments_aggregates.source_relation
-    {% endif %}
 
 ), windows as (
 
diff --git a/models/shopify__products.sql b/models/shopify__products.sql
index 567a51b..21a8c81 100644
--- a/models/shopify__products.sql
+++ b/models/shopify__products.sql
@@ -1,7 +1,7 @@
 with products as (
 
     select *
-    from {{ ref('shopify__products__with_aggregates') }}
+    from {{ ref('int_shopify__products_with_aggregates') }}
 ), 
 
 order_lines as (

From 060290dc2cd9fbf1a60203e6a1b8fd500ed85ada Mon Sep 17 00:00:00 2001
From: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:45:05 -0800
Subject: [PATCH 10/10] before merge updates

---
 dbt_project.yml | 5 +----
 packages.yml    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dbt_project.yml b/dbt_project.yml
index 9a556b9..2ecd785 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -10,10 +10,7 @@ models:
       +materialized: ephemeral
       int_shopify__customer_email_rollup:
         +materialized: view # so we can use the dbt_utils.star macro
-      int_shopify__inventory_level__aggregates:
-        +materialized: table # just for testing. remove later
-      int_shopify__products_with_aggregates:
-        +materialized: table # just for testing. remove later
+        
 vars:
   shopify:
     shopify_customer: "{{ ref('stg_shopify__customer') }}"
diff --git a/packages.yml b/packages.yml
index 7f1a843..7e92a85 100644
--- a/packages.yml
+++ b/packages.yml
@@ -3,7 +3,7 @@ packages:
 #   version: [">=0.7.0", "<0.8.0"]
 
   - git: https://github.com/fivetran/dbt_shopify_source.git
-    revision: feature/revamp/transform-enhancements
+    revision: feature/package-revamp
     warn-unpinned: false
 
 # - local: ../Shopify/dbt_shopify_source