feat(sync-actions): add changeMasterVariant action generation

.gitignore

@@ -8,6 +8,9 @@ node_modules
 .npm
 .released-packages
 
+# Integration tests dependencies cache
+integration-tests/package-lock.json
+
 # Build artifacts
 _book
 .changelog
@@ -19,4 +22,4 @@ coverage
 .DS_Store
 
 # IDE tools
-.idea
+.idea

packages/sync-actions/src/product-actions.js

@@ -61,9 +61,9 @@ export function actionsMapVariants (diff, oldObj, newObj) {
       ...newObject,
       action: 'addVariant',
     }),
-    [REMOVE_ACTIONS]: objectToRemove => ({
+    [REMOVE_ACTIONS]: ({ id }) => ({
       action: 'removeVariant',
-      id: objectToRemove.id,
+      id,
     }),
   })
 
@@ -137,29 +137,7 @@ export function actionsMapAttributes (
   sameForAllAttributeNames = [],
 ) {
   let actions = []
-  const { masterVariant, variants } = diff
-
-  if (masterVariant) {
-    const skuAction = _buildSkuActions(
-      masterVariant,
-      oldObj.masterVariant,
-    )
-    const keyAction = _buildKeyActions(
-      masterVariant,
-      oldObj.masterVariant,
-    )
-    if (skuAction) actions.push(skuAction)
-    if (keyAction) actions.push(keyAction)
-
-    const { attributes } = masterVariant
-    const attrActions = _buildVariantAttributesActions(
-      attributes,
-      oldObj.masterVariant,
-      newObj.masterVariant,
-      sameForAllAttributeNames,
-    )
-    actions = actions.concat(attrActions)
-  }
+  const { variants } = diff
 
   if (variants)
     forEach(variants, (variant, key) => {
@@ -172,6 +150,7 @@ export function actionsMapAttributes (
         if (keyAction) actions.push(keyAction)
 
         const { attributes } = variant
+
         const attrActions = _buildVariantAttributesActions(
           attributes,
           oldObj.variants[key],
@@ -196,16 +175,7 @@ export function actionsMapAttributes (
 
 export function actionsMapImages (diff, oldObj, newObj) {
   let actions = []
-  const { masterVariant, variants } = diff
-
-  if (masterVariant) {
-    const mActions = _buildVariantImagesAction(
-      masterVariant.images,
-      oldObj.masterVariant,
-      newObj.masterVariant,
-    )
-    actions = actions.concat(mActions)
-  }
+  const { variants } = diff
 
   if (variants)
     forEach(variants, (variant, key) => {
@@ -225,18 +195,7 @@ export function actionsMapPrices (diff, oldObj, newObj) {
   let changePriceActions = []
   let removePriceActions = []
 
-  const { masterVariant, variants } = diff
-
-  if (masterVariant) {
-    const [ a, c, r ] = _buildVariantPricesAction(
-      masterVariant.prices,
-      oldObj.masterVariant,
-      newObj.masterVariant,
-    )
-    addPriceActions = addPriceActions.concat(a)
-    changePriceActions = changePriceActions.concat(c)
-    removePriceActions = removePriceActions.concat(r)
-  }
+  const { variants } = diff
 
   if (variants)
     forEach(variants, (variant, key) => {
@@ -256,6 +215,27 @@ export function actionsMapPrices (diff, oldObj, newObj) {
     .concat(addPriceActions)
 }
 
+export function actionsMapMasterVariant (oldObj, newObj) {
+  const createChangeMasterVariantAction = variantId => ({
+    action: 'changeMasterVariant',
+    variantId,
+  })
+  const extractMasterVariantId = (fromObj) => {
+    const variants = Array.isArray(fromObj.variants) ? fromObj.variants : []
+
+    return variants[0] ? variants[0].id : undefined
+  }
+
+  const newMasterVariantId = extractMasterVariantId(newObj)
+  const oldMasterVariantId = extractMasterVariantId(oldObj)
+
+  // Old and new master master variant differ and a new master variant id exists
+  if (newMasterVariantId && oldMasterVariantId !== newMasterVariantId)
+    return [createChangeMasterVariantAction(newMasterVariantId)]
+
+  return []
+}
+
 
 /**
  * HELPER FUNCTIONS
@@ -542,7 +522,6 @@ function _buildVariantPricesAction (diffedPrices, oldVariant, newVariant) {
       }
     } else if (REGEX_UNDERSCORE_NUMBER.test(key)) {
       const index = key.substring(1)
-
       removePriceActions.push({
         action: 'removePrice', priceId: oldVariant.prices[index].id,
       })

packages/sync-actions/src/products.js

@@ -38,6 +38,8 @@ function createProductMapActions (mapActionGroup) {
     allActions.push(mapActionGroup('variants', () =>
       productActions.actionsMapVariants(diff, oldObj, newObj)))
 
+    allActions.push(productActions.actionsMapMasterVariant(oldObj, newObj))
+
     allActions.push(mapActionGroup('attributes', () =>
       productActions.actionsMapAttributes(diff, oldObj, newObj,
         sameForAllAttributeNames || [])))
@@ -58,10 +60,32 @@ function createProductMapActions (mapActionGroup) {
   }
 }
 
+function moveMasterVariantsIntoVariants (before, now) {
+  const move = obj => ({
+    ...obj,
+    masterVariant: undefined,
+    variants: [
+      obj.masterVariant,
+      ...obj.variants || [],
+    ],
+  })
+  const hasMasterVariant = obj => obj && obj.masterVariant
+
+  return [
+    hasMasterVariant(before) ? move(before) : before,
+    hasMasterVariant(now) ? move(now) : now,
+  ]
+}
+
 export default (config: Array<ActionGroup>): SyncAction => {
   const mapActionGroup = createMapActionGroup(config)
   const doMapActions = createProductMapActions(mapActionGroup)
-  const buildActions = createBuildActions(diffpatcher.diff, doMapActions)
+
+  const buildActions = createBuildActions(
+    diffpatcher.diff,
+    doMapActions,
+    moveMasterVariantsIntoVariants,
+  )
 
   return { buildActions }
 }

packages/sync-actions/src/utils/create-build-actions.js

@@ -1,13 +1,23 @@
-export default function createBuildActions (diff, doMapActions) {
+function applyOnBeforeDiff (before, now, fn) {
+  return fn && typeof fn === 'function' ? fn(before, now) : [before, now]
+}
+
+export default function createBuildActions (
+  differ, doMapActions, onBeforeDiff,
+) {
   return function buildActions (now, before, options = {}) {
     if (!now || !before)
       throw new Error('Missing either `newObj` or `oldObj` ' +
         'in order to build update actions')
 
-    // diff 'em
-    const diffed = diff(before, now)
+    const [
+      processedBefore, processedNow,
+    ] = applyOnBeforeDiff(before, now, onBeforeDiff)
+
+    const diffed = differ(processedBefore, processedNow)
+
     if (!diffed) return []
 
-    return doMapActions(diffed, now, before, options)
+    return doMapActions(diffed, processedNow, processedBefore, options)
   }
 }

packages/sync-actions/src/utils/create-build-array-actions.js

@@ -23,26 +23,42 @@ export default function createBuildArrayActions (key, config) {
 
     if (diff[key]) {
       const arrayDelta = diff[key]
+
       Object.keys(arrayDelta).forEach((index) => {
-        if (config[ADD_ACTIONS] && isCreateAction(arrayDelta, index))
-          addActions.push(
-            // When adding a new element you don't need the oldObj
-            config[ADD_ACTIONS](newObj[key][index]),
+        if (config[ADD_ACTIONS] && isCreateAction(arrayDelta, index)) {
+          const actionGenerator = config[ADD_ACTIONS]
+          // When adding a new element you don't need the oldObj
+          const action = actionGenerator(
+            newObj[key][index],
+            parseInt(index, 10),
           )
-        else if (config[CHANGE_ACTIONS] && isChangeAction(arrayDelta, index))
-          changeActions.push(
-            // When changing an existing element you need both old + new
-            config[CHANGE_ACTIONS](oldObj[key][index], newObj[key][index]),
+
+          if (action) addActions.push(action)
+        } else if (
+          config[CHANGE_ACTIONS] && isChangeAction(arrayDelta, index)
+        ) {
+          const actionGenerator = config[CHANGE_ACTIONS]
+          // When changing an existing element you need both old + new
+          const action = actionGenerator(
+            oldObj[key][index],
+            newObj[key][index],
+            parseInt(index, 10),
           )
-        else if (
+
+          if (action) changeActions.push(action)
+        } else if (
           config[REMOVE_ACTIONS] &&
           isRemoveAction(arrayDelta, index)
         ) {
           const realIndex = index.replace('_', '')
-          removeActions.push(
-            // When removing an existing element you don't need the newObj
-            config[REMOVE_ACTIONS](oldObj[key][realIndex]),
+          const actionGenerator = config[REMOVE_ACTIONS]
+          // When removing an existing element you don't need the newObj
+          const action = actionGenerator(
+            oldObj[key][realIndex],
+            parseInt(realIndex, 10),
           )
+
+          if (action) removeActions.push(action)
         }
       })
     }