huginn_bigcommerce_product_agent 1.3.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edc2db0f86f9193fa3463ca3a21db71bc52b06b007d1d00d81b934891eea499
-  data.tar.gz: f2635fda8a26cf5c0e7706c2be7794897769d0a99f3da2c243e61f96da069242
+  metadata.gz: 728526f71b899d714ffeaf9cca25b150326ba889dc17c732ace2c41b7b92782e
+  data.tar.gz: d237a9f1a6eb179f76679a7a870b56a7844239ee45f4fd32f56ba8a296201ca9
 SHA512:
-  metadata.gz: e730a73a5be204f43e0c54866f37e9e0e16542ad5357806d6dc1e69c41c0a3a9cd0ef9fb1c90b39982b3471dac0c61c23b0551ef60184ef9b66bfa878e0fa5f2
-  data.tar.gz: 628d7bd1ddf7dcfa831a3f34d0522c155eefcb99a90b39528a736251ed03d17480c30f9fa2a93def20af9aed0e6a6d31cea82333733a9ab10c910465c3e3284d
+  metadata.gz: 54e4aa00c7216da7c8d66ba4ea45cbcd1ec51339982686719505f2806761a91e601d807165c194975777e9b7ae0ee8327cde0d9ee966ccee264659d70b083ee1
+  data.tar.gz: 9e9ff91a64dbab6ac8e0a1b599a5415ce2744d39cf00e3ca12d697fddde434dcf9aa174ecd89b0e67333838bd03cfe8585797c6d9e50c73cd57b936eb3ed8b9a

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,25 @@ 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]
+            )
+            #save skus
+            digital_skus = []
+            physical_skus = []
+            if split[:digital] and split[:physical]
+                digital_skus.concat([wrapper_skus[:digital]])
+                digital_skus.concat(get_mapper(:ProductMapper).get_product_skus(split[:digital])).join(",")
+                physical_skus.concat([wrapper_skus[:physical]])
+                physical_skus.concat(get_mapper(:ProductMapper).get_product_skus(split[:physical])).join(",")
+            end
+
             # upsert wrapper products
             split.each do |type, product|
                 is_digital = type == :digital ? true : false
@@ -133,22 +148,26 @@ module Agents
                 variant_option_name = get_mapper(:OptionMapper).variant_option_name
                 bc_option = !bc_product.nil? ? bc_product['options'].select {|opt| opt['display_name'] === variant_option_name}.first : nil
 
+                search_skus = is_digital ? physical_skus : digital_skus
                 # ##############################
                 # 1. update wrapper product
                 # ##############################
-                upsert_result = upsert_product(wrapper_sku, product, bc_product, is_digital)
+                upsert_result = upsert_product(wrapper_sku, product, bc_product, is_digital, search_skus)
                 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 +199,8 @@ module Agents
                         [option_value],
                         product_id,
                         bc_variant.nil? ? nil : bc_variant['id'],
+                        interpolated['not_purchasable_format_list'],
+                        bc_option_value
                     )
                 end
 
@@ -327,7 +348,7 @@ module Agents
             return ::BigcommerceProductAgent::Mapper.const_get(class_name.to_sym)
         end
 
-        def upsert_product(sku, product, bc_product = nil, is_digital=false)
+        def upsert_product(sku, product, bc_product = nil, is_digital=false, search_skus=[])
             custom_fields_updates = get_mapper(:CustomFieldMapper).map(
                 interpolated['custom_fields_map'],
                 product,
@@ -340,7 +361,10 @@ module Agents
                 sku,
                 product,
                 product_id,
-                { custom_fields: custom_fields_updates[:upsert] },
+                {
+                    additional_search_terms: search_skus,
+                    custom_fields: custom_fields_updates[:upsert]
+                },
                 is_digital,
             )
 

data/lib/mapper/product_mapper.rb

@@ -25,10 +25,10 @@ module BigcommerceProductAgent
 
                 result = {
                     name: name,
-                    sku: variant ? variant['sku'] : default_sku,
+                    sku: product ? product['sku'] : default_sku,
                     is_default: product['isDefault'],
                     type: product['isDigital'] == true || is_digital ? 'digital' : 'physical',
-                    description: product['description'],
+                    description: product['description'] || '',
                     price: product['offers'] && product['offers'][0] ? product['offers'][0]['price'] : '0',
                     categories: self.get_categories(product),
                     available: 'available',
@@ -37,8 +37,8 @@ module BigcommerceProductAgent
                     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(','),
+                    meta_description: self.meta_description(product) || '',
+                    search_keywords: self.get_search_keywords(additional_data.delete(:additional_search_terms), product),
                     is_visible: variant ? false : true,
                 }
                 result[:upc] = product['gtin12'] if product['gtin12']
@@ -47,21 +47,16 @@ module BigcommerceProductAgent
             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
@@ -106,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
@@ -115,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
@@ -185,6 +182,11 @@ module BigcommerceProductAgent
                     end
                 end
             end
+
+            # get a list of search keywords for the products
+            def self.get_search_keywords(additional_search_terms, product)
+                return (self.meta_keywords(product) + additional_search_terms.split(",")).join(",")
+            end
         end
     end
 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.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Jacob Spizziri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler