From bd4f0507cee458a51893600adf0c01bc8bcdc25d Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 8 Oct 2018 17:00:55 +0100
Subject: [PATCH] Adjustments for new Settings and ResetAbsent classes

---
 app/models/product_import/inventory_reset_strategy.rb | 10 +++++-----
 app/models/product_import/products_reset_strategy.rb  | 10 +++++-----
 spec/models/product_import/settings_spec.rb           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/models/product_import/inventory_reset_strategy.rb b/app/models/product_import/inventory_reset_strategy.rb
index c22cb6218a..a8647ce250 100644
--- a/app/models/product_import/inventory_reset_strategy.rb
+++ b/app/models/product_import/inventory_reset_strategy.rb
@@ -4,10 +4,10 @@ module ProductImport
       @excluded_items_ids = excluded_items_ids
     end
 
-    def reset(supplier_ids)
-      @supplier_ids = supplier_ids
+    def reset(enterprise_ids)
+      @enterprise_ids = enterprise_ids
 
-      if supplier_ids.present?
+      if enterprise_ids.present?
         relation.update_all(count_on_hand: 0)
       else
         0
@@ -16,10 +16,10 @@ module ProductImport
 
     private
 
-    attr_reader :excluded_items_ids, :supplier_ids
+    attr_reader :excluded_items_ids, :enterprise_ids
 
     def relation
-      relation = VariantOverride.where(hub_id: supplier_ids)
+      relation = VariantOverride.where(hub_id: enterprise_ids)
       return relation if excluded_items_ids.blank?
 
       relation.where('id NOT IN (?)', excluded_items_ids)
diff --git a/app/models/product_import/products_reset_strategy.rb b/app/models/product_import/products_reset_strategy.rb
index 80dd6a448c..c1ce9af695 100644
--- a/app/models/product_import/products_reset_strategy.rb
+++ b/app/models/product_import/products_reset_strategy.rb
@@ -4,10 +4,10 @@ module ProductImport
       @excluded_items_ids = excluded_items_ids
     end
 
-    def reset(supplier_ids)
-      @supplier_ids = supplier_ids
+    def reset(enterprise_ids)
+      @enterprise_ids = enterprise_ids
 
-      if supplier_ids.present?
+      if enterprise_ids.present?
         relation.update_all(count_on_hand: 0)
       else
         0
@@ -16,13 +16,13 @@ module ProductImport
 
     private
 
-    attr_reader :excluded_items_ids, :supplier_ids
+    attr_reader :excluded_items_ids, :enterprise_ids
 
     def relation
       relation = Spree::Variant
         .joins(:product)
         .where(
-          spree_products: { supplier_id: supplier_ids },
+          spree_products: { supplier_id: enterprise_ids },
           spree_variants: { is_master: false, deleted_at: nil }
         )
 
diff --git a/spec/models/product_import/settings_spec.rb b/spec/models/product_import/settings_spec.rb
index a7f823b2d8..b485127f0b 100644
--- a/spec/models/product_import/settings_spec.rb
+++ b/spec/models/product_import/settings_spec.rb
@@ -15,7 +15,7 @@ describe ProductImport::Settings do
 
     context 'when there are settings' do
       let(:entry) do
-        instance_double(ProductImport::SpreadsheetEntry, supplier_id: 1)
+        instance_double(ProductImport::SpreadsheetEntry, enterprise_id: 1)
       end
       let(:import_settings) { { settings: {} } }