huginn_bigcommerce_product_agent 1.3.4 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e9dc2ed53e9e917bc0a35da06e11037cf4f0a4cec60c5713aae4414ce5ae23
-  data.tar.gz: 7bdfa35384ac7ea108a0b20872ffa9d46b977d0d5b48952c5eb3c23fcc69efc8
+  metadata.gz: 4d9046f3fa0d6c9e3f0c58720148502c622ec9662cecc03488d381f5c7730440
+  data.tar.gz: 15652aee1e058bffc5a15920574bd93c7eb89ba0391c267cb6912c270a1f0810
 SHA512:
-  metadata.gz: 516223ed77ca56c44d0988ed8c58256978da78ca7cd8d9a7699d54e923e08885f903acbe3f8dabc09f874aeabd93267b387da380f1c35672c0917e3c200ab9a7
-  data.tar.gz: d61416b643d805ba659783080091cfb95fadcd32c5d1fea40ea741dc286f6207c6fd50c1d940efbce06a3372ea3b26cd9b50f38174f4e27254503814650364b2
+  metadata.gz: b75f6cc9fbfabb4c0143b33146d1c736fd4680657642c29e755621e12a5d1d5efb6aa1aadc4d3ee6494dea17d1f6dab20d34a15aacf8ec992be8c79430d89fc3
+  data.tar.gz: 3fe2de4e3330ae759ef8e43b402a6a5ca7ac9e1ce21dac24c8ff2bbdb0e8680ca2fcde53f129d6ae5358a07d3f9e237eae08ae8b1c0fc1f378b3c880082d5239

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

@@ -28,7 +28,8 @@ module Agents
                 'custom_fields_map' => {},
                 'meta_fields_map' => {},
                 'meta_fields_namespace' => '',
-                'mode' => modes[0]
+                'mode' => modes[0],
+                'not_purchasable_format_list' => []
             }
         end
 
@@ -62,6 +63,10 @@ module Agents
             unless options['mode'].present? && modes.include?(options['mode'])
                 errors.add(:base, "mode is a required field and must be one of: #{modes.join(', ')}")
             end
+
+            if options['not_purchasable_format_list'].present? && !options['not_purchasable_format_list'].is_a?(Array)
+                errors.add(:base, 'not_purchasable_format_list must be an Array')
+            end
         end
 
         def working?
@@ -103,15 +108,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 +115,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 +143,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
                 # ##############################
@@ -180,6 +188,8 @@ module Agents
                         [option_value],
                         product_id,
                         bc_variant.nil? ? nil : bc_variant['id'],
+                        interpolated['not_purchasable_format_list'],
+                        bc_option_value
                     )
                 end
 

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',
-                    description: product['description'],
-                    price: variant && variant['offers'] && variant['offers'][0] ? variant['offers'][0]['price'] : '0',
+                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: 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),
+                    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

@@ -2,7 +2,7 @@ module BigcommerceProductAgent
     module Mapper
         class VariantMapper
 
-            def self.map(variant, option_values, product_id, variant_id=nil)
+            def self.map(variant, option_values, product_id, variant_id=nil, not_purchasable_format_list, bc_option_value)
                 mapped = {
                     product_id: product_id,
                     sku: variant['sku'],
@@ -29,6 +29,14 @@ module BigcommerceProductAgent
                     mapped[:id] = variant_id
                 end
 
+                unless not_purchasable_format_list.nil?
+                  not_purchasable_format_list.each do |format|
+                      if format == bc_option_value['label']
+                          mapped[:purchasing_disabled] = true
+                      end
+                  end
+                end
+
                 return mapped
             end
 

metadata

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