huginn_bigcommerce_product_agent 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 911e20cea1ee097a95874f55f2366599eaed196c55e8da885e4c4273fc99baa2
-  data.tar.gz: f9d92d1e656157743a633d32eb6ae97ebc7dc942e2d1ade910613a6775df77b2
+  metadata.gz: 80abf4633b57aeb958ec7f79f516f860fb099c20e6962de6e4cd0d8d0e1f3f5c
+  data.tar.gz: df57c8f677d590947fc4fce038740adc6d2aba7618acf60eca3c4a9bcaa5700a
 SHA512:
-  metadata.gz: 9b04f1cdb14008d9ab24cf33aef05f330804cb3d8f95ae4726e228f3ced6882759b987321c6cea4c24f4802592aeec284c8cb7439e3352b7469d8496fdfe0942
-  data.tar.gz: dc30b25ad1a9c020a47f8057362941da29b51f29bc0df6cc3e9c10ca456b92242ae5a2436b1554e2f1fc36a7941b0ddfa6852b0c5fc9a14ad0f4bff6ae42f4b1
+  metadata.gz: 817b6c0d76780bfab457aaf7a6b67693caf97d6d7c581361270adb1ff874cef268a63adf74b52846d7278c4ad02c9d095c230e7af7ffc77ac3572b73a121b505
+  data.tar.gz: a87ce903ed0c6c9c9e47fdb68acefcf1de788f8f6f754d02aa149793bed703846087a324b9c4004a99b5d3d9bf4de83de6dc223a5c59cf451093f4961dad5f22

data/lib/client/product.rb

@@ -26,8 +26,8 @@ module BigcommerceProductAgent
 
             def upsert(payload, params={})
                 begin
-                    if payload['id']
-                        return update(payload['id'], payload, params)
+                    if payload[:id]
+                        return update(payload[:id], payload, params)
                     else
                         return create(payload, params)
                     end

data/lib/huginn_bigcommerce_product_agent/bigcommerce_product_agent.rb

@@ -103,15 +103,6 @@ module Agents
         def handle_variants(event)
             product = event.payload
 
-            wrapper_skus = {
-                physical: get_mapper(:ProductMapper).get_wrapper_sku_physical(product),
-                digital: get_mapper(:ProductMapper).get_wrapper_sku_digital(product),
-            }
-            bc_products = @product.get_by_skus(
-                wrapper_skus.map {|k,v| v},
-                %w[custom_fields options]
-            )
-
             split = get_mapper(:ProductMapper).split_digital_and_physical(
               product,
               interpolated['custom_fields_map']
@@ -119,6 +110,15 @@ module Agents
             physical = split[:physical]
             digital = split[:digital]
 
+            wrapper_skus = {
+                physical: get_mapper(:ProductMapper).get_wrapper_sku(physical),
+                digital: get_mapper(:ProductMapper).get_wrapper_sku(digital),
+            }
+
+            bc_products = @product.get_by_skus(
+                wrapper_skus.map {|k,v| v},
+                %w[custom_fields options]
+            )
             # upsert wrapper products
             split.each do |type, product|
                 is_digital = type == :digital ? true : false
@@ -138,17 +138,20 @@ module Agents
                 # ##############################
                 upsert_result = upsert_product(wrapper_sku, product, bc_product, is_digital)
                 bc_product = upsert_result[:product]
-                bc_products[wrapper_sku] = bc_product
-                product_id = bc_products[wrapper_sku]['id']
 
                 # clean up custom/meta fields. there are not batch operations so we might as well do them here.
                 custom_fields_delete = upsert_result[:custom_fields_delete].select {|field| field['name'] != 'related_product_id'}
                 clean_up_custom_fields(custom_fields_delete)
-                update_meta_fields(
+                meta_fields = update_meta_fields(
                     upsert_result[:meta_fields_upsert],
                     upsert_result[:meta_fields_delete],
                 )
 
+                bc_product['meta_fields'] = meta_fields
+
+                bc_products[wrapper_sku] = bc_product
+                product_id = bc_products[wrapper_sku]['id']
+
                 # ##############################
                 # 2. upsert option & option_values
                 # ##############################

data/lib/mapper/product_mapper.rb

@@ -3,51 +3,60 @@ module BigcommerceProductAgent
         class ProductMapper
 
             def self.map(product, variant, additional_data = {}, is_digital = false, default_sku='')
-                product = {
-                    name: variant.nil? ? product['name'] : "#{product['name']} (#{self.get_option(variant)})",
-                    sku: variant ? variant['sku'] : default_sku,
-                    is_default: variant && variant['isDefault'],
-                    type: (variant && variant['isDigital'] == true) || is_digital ? 'digital' : 'physical',
+                name = product['name']
+
+                if variant
+                    # variants inherit from and override parent product info
+                    name = "#{name} (#{self.get_option(variant)})"
+                    product = product.merge(variant)
+                else
+                    # wrapper product
+                    default_variant = self.get_variant_by_sku(product['sku'], product)
+                    if default_variant
+                        # pull up some properties from default variant (since bc doesn't display them otherwise)
+                        product = {
+                            "weight" => default_variant['weight'],
+                            "width" => default_variant['width'],
+                            "depth" => default_variant['depth'],
+                            "height" => default_variant['height'],
+                        }.merge(product)
+                    end
+                end
+
+                result = {
+                    name: name,
+                    sku: product ? product['sku'] : default_sku,
+                    is_default: product['isDefault'],
+                    type: product['isDigital'] == true || is_digital ? 'digital' : 'physical',
                     description: product['description'],
-                    price: variant && variant['offers'] && variant['offers'][0] ? variant['offers'][0]['price'] : '0',
+                    price: product['offers'] && product['offers'][0] ? product['offers'][0]['price'] : '0',
                     categories: self.get_categories(product),
                     available: 'available',
-                    weight: variant && variant['weight'] ? variant['weight']['value'] : '0',
-                    width: variant && variant['width'] ? variant['width']['value'] : '0',
-                    depth: variant && variant['depth'] ? variant['depth']['value'] : '0',
-                    height: variant && variant['height'] ? variant['height']['value'] : '0',
+                    weight: product['weight'] ? product['weight']['value'] : '0',
+                    width: product['width'] ? product['width']['value'] : '0',
+                    depth: product['depth'] ? product['depth']['value'] : '0',
+                    height: product['height'] ? product['height']['value'] : '0',
                     meta_keywords: self.meta_keywords(product),
                     meta_description: self.meta_description(product),
                     search_keywords: self.meta_keywords(product).join(','),
-                    is_visible: variant.nil? ? true : false,
-                }.merge(additional_data)
-
-
-                upc = variant ? variant['gtin12'] : product['gtin12']
+                    is_visible: variant ? false : true,
+                }
+                result[:upc] = product['gtin12'] if product['gtin12']
 
-                if upc
-                    product[:upc] = upc
-                end
-
-                return product
+                result.merge(additional_data)
             end
 
             def self.get_wrapper_sku(product)
-                "#{product['sku']}-W"
-            end
-
-            def self.get_wrapper_sku_physical(product)
-                self.get_wrapper_sku(product)
-            end
-
-            def self.get_wrapper_sku_digital(product)
-                "#{self.get_wrapper_sku_physical(product)}-DIGITAL"
+                if product
+                    "#{product['sku']}-W"
+                end
             end
 
             def self.payload(sku, product, product_id = nil, additional_data = {}, is_digital = false)
                 variant = self.get_variant_by_sku(sku, product)
                 payload = self.map(product, variant, additional_data, is_digital, sku)
-                payload['id'] = product_id unless product_id.nil?
+                payload[:id] = product_id unless product_id.nil?
+                payload[:sku] = self.get_wrapper_sku(product)
 
                 return payload
             end
@@ -92,6 +101,7 @@ module BigcommerceProductAgent
                 if digitals.length > 0
                     clone = Marshal.load(Marshal.dump(product))
                     clone['model'] = digitals
+                    clone['sku'] = clone['model'].select {|m| m['isDefault'] = true}.first['sku']
                     self.merge_additional_properties(clone, field_map)
                     result[:digital] = clone
                 end
@@ -101,6 +111,7 @@ module BigcommerceProductAgent
                 if physicals.length > 0
                     clone = Marshal.load(Marshal.dump(product))
                     clone['model'] = physicals
+                    clone['sku'] = clone['model'].select {|m| m['isDefault'] = true}.first['sku']
                     self.merge_additional_properties(clone, field_map)
                     result[:physical] = clone
                 end

data/lib/mapper/variant_mapper.rb

@@ -18,7 +18,7 @@ module BigcommerceProductAgent
                     fixed_cost_shipping_price: nil,
                     purchasing_disabled: false,
                     purchasing_disabled_message: '',
-                    upc: variant['gtin12'],
+                    upc: variant['isbn'] ? variant['isbn'] : variant['gtin12'],
                     inventory_level: nil,
                     inventory_warning_level: nil,
                     bin_picking_number: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_bigcommerce_product_agent
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Jacob Spizziri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler