Merge c88cdd8 into f0381e3

commercetools · Mar 24, 2020 · e0b2bbd · e0b2bbd
2 parents f0381e3 + c88cdd8
commit e0b2bbd
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/src/coffee/sync/utils/product.coffee b/src/coffee/sync/utils/product.coffee
@@ -118,7 +118,7 @@ class ProductUtils extends BaseUtils
   # match variant against variants in list - match first by sku, then by key and then by id
   findVariantInList: (variant, variantList, attributeToMatchBy) ->
     if (attributeToMatchBy)
-      return @matchesBy(attributeToMatchBy)
+      return variantList.find((oldVariant) => @matchesBy(variant, oldVariant, attributeToMatchBy))
     else
       return variantList.find((oldVariant) => @matchesBySku(variant, oldVariant)) or
         variantList.find((oldVariant) => @matchesByKey(variant, oldVariant)) or

diff --git a/src/spec/sync/utils/product.spec.coffee b/src/spec/sync/utils/product.spec.coffee
@@ -501,6 +501,58 @@ describe 'ProductUtils', ->
       foundVariant = @utils.findVariantInList(variant, variantList, 'sku')
       expect(foundVariant).not.toBeDefined()
 
+    it 'should match variants with sku', ->
+      variant = {
+        id: 2,
+        sku: 'sku2'
+      }
+      variantList = [
+        {
+          id: 1,
+          sku: 'sku1'
+        },
+        {
+          id: 3,
+          sku: 'sku2'
+        }
+      ]
+      foundVariant = @utils.findVariantInList(variant, variantList, 'sku')
+      expect(foundVariant).toEqual({ id: 3, sku: 'sku2' })
+
+    it 'should match variants with keys', ->
+      variant = {
+        id: 2,
+        key: 'key2'
+      }
+      variantList = [
+        {
+          id: 1,
+          key: 'key1'
+        },
+        {
+          id: 3,
+          key: 'key2'
+        }
+      ]
+      foundVariant = @utils.findVariantInList(variant, variantList, 'key')
+      expect(foundVariant).toEqual({ id: 3, key: 'key2' })
+
+    it 'should match variants with ids', ->
+      variant = {
+        id: 2
+      }
+      variantList = [
+        {
+          id: 1
+        },
+        {
+          id: 2
+        }
+      ]
+      foundVariant = @utils.findVariantInList(variant, variantList, 'id')
+      expect(foundVariant).toEqual({ id: 2 })
+
+
   describe ':: buildVariantPriceActions', ->
 
     it 'should return an empty array when no price diff is provided', ->