@softwear/latestcollectioncore 1.0.63 → 1.0.65

package/dist/buildPropertyMappingFn.js

@@ -14,7 +14,7 @@ const mappingPairs = [
     { category: 'CustomSize', from: 'sizeSupplier', to: '_customsize' },
     { category: 'Size', from: 'sizeSupplier', to: 'size' },
     { category: 'Gender', from: 'articleGroupSupplier', to: '_gender', mustMatch: true },
-    { category: 'ERM', from: ['_gender', 'articleGroup'], to: '_erm-code', mustMatch: true },
+    { category: 'ERM', from: ['_gender', 'articleGroup'], to: '_erm-code', mustMatch: true, defaultMappingSource: 'ermmapping' },
 ];
 const evaluateFromExpr = function (sku, from) {
     if (typeof from == 'string')
@@ -22,34 +22,16 @@ const evaluateFromExpr = function (sku, from) {
     return from.map((field) => sku[field] || '').join('.');
 };
 function default_1(brands, strategy) {
-    // Helper function to convert all mapping rules for given category to an indexed object
-    const indexedMapping = function (propertyMapping, category) {
-        const filteredMappings = propertyMapping.filter((mapping) => mapping.category == category && mapping.from != undefined);
-        if (filteredMappings.length == 0)
-            return undefined;
-        return filteredMappings.reduce((acc, item) => {
-            acc[item.from] = item.to;
-            return acc;
-        }, {});
-    };
-    // Helper function to convert all mapping rules to an indexed object
-    const indexFn = function (propertyMapping) {
-        if (!propertyMapping)
-            return {};
-        const maps = {};
-        index_1.MAPPING_CATEGORIES.forEach((category) => {
-            const map = indexedMapping(propertyMapping, category);
-            if (map !== undefined)
-                maps[category] = map;
+    const indexedByBrandPropertyMapping = {};
+    brands.forEach(({ id, propertyMapping }) => {
+        if (!indexedByBrandPropertyMapping[id])
+            indexedByBrandPropertyMapping[id] = {};
+        propertyMapping === null || propertyMapping === void 0 ? void 0 : propertyMapping.forEach((mapping) => {
+            if (!indexedByBrandPropertyMapping[id][mapping.category])
+                indexedByBrandPropertyMapping[id][mapping.category] = {};
+            indexedByBrandPropertyMapping[id][mapping.category][mapping.from] = mapping.to;
         });
-        return maps;
-    };
-    const indexedByBrandPropertyMapping = brands.reduce((acc, item) => {
-        if (!acc[item.id])
-            acc[item.id] = {};
-        Object.assign(acc[item.id], indexFn(item.propertyMapping));
-        return acc;
-    }, {});
+    });
     if (strategy == 'clean')
         return function (sku) {
             const brand = sku.BRANDHASH || (0, index_1.hashBrand)(sku.brand);
@@ -72,7 +54,7 @@ function default_1(brands, strategy) {
             mappingPairs.forEach((pair) => {
                 var _a, _b, _c, _d, _e;
                 const from = evaluateFromExpr(sku, pair.from) || '';
-                const redirectedMappingSource = (_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~'];
+                const redirectedMappingSource = ((_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~']) || pair.defaultMappingSource;
                 const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {};
                 const to = ((_b = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _b === void 0 ? void 0 : _b[from]) || ((_c = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _c === void 0 ? void 0 : _c['']) || ((_d = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _d === void 0 ? void 0 : _d[from]) || ((_e = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _e === void 0 ? void 0 : _e['']);
                 if (to == undefined)
@@ -88,7 +70,7 @@ function default_1(brands, strategy) {
             if (sku[pair.to])
                 return; // Do not replace sku-level-user-supplied values
             const from = evaluateFromExpr(sku, pair.from);
-            const redirectedMappingSource = (_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~'];
+            const redirectedMappingSource = ((_a = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _a === void 0 ? void 0 : _a['~~']) || pair.defaultMappingSource;
             const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {};
             const to = ((_b = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _b === void 0 ? void 0 : _b[from]) || ((_c = mapping === null || mapping === void 0 ? void 0 : mapping[pair.category]) === null || _c === void 0 ? void 0 : _c['']) || ((_d = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _d === void 0 ? void 0 : _d[from]) || ((_e = redirectedMapping === null || redirectedMapping === void 0 ? void 0 : redirectedMapping[pair.category]) === null || _e === void 0 ? void 0 : _e['']);
             if (!from && !to)

package/dist/types.d.ts

@@ -191,6 +191,11 @@ interface ProductI {
     warehouseLocation: string;
     year?: string;
 }
+interface PropertyMappingI {
+    category: string;
+    from: string;
+    to: string;
+}
 interface BrandSettingI {
     id: string;
     name: string;
@@ -211,7 +216,7 @@ interface BrandSettingI {
     whiteListTenants?: string[];
     associates?: object[];
     authGroups?: string[];
-    propertyMapping?: object[];
+    propertyMapping?: PropertyMappingI[];
     fashionCloudId?: string;
 }
 declare enum mappingStrategyE {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/buildPropertyMappingFn.ts

@@ -1,4 +1,4 @@
-import { hashBrand, SkuI, MAPPING_CATEGORIES, BrandSettingI, mappingStrategyE } from './index'
+import { hashBrand, SkuI, BrandSettingI, mappingStrategyE } from './index'
 
 // The order of the following mappingPairs is significant.
 // The ERM mapping relies on the Gender and ProductGroup mapping to have been evaluated first
@@ -13,40 +13,31 @@ const mappingPairs = [
   { category: 'CustomSize', from: 'sizeSupplier', to: '_customsize' },
   { category: 'Size', from: 'sizeSupplier', to: 'size' },
   { category: 'Gender', from: 'articleGroupSupplier', to: '_gender', mustMatch: true },
-  { category: 'ERM', from: ['_gender', 'articleGroup'], to: '_erm-code', mustMatch: true },
+  { category: 'ERM', from: ['_gender', 'articleGroup'], to: '_erm-code', mustMatch: true, defaultMappingSource: 'ermmapping' },
 ]
 
 const evaluateFromExpr = function (sku: SkuI, from: string | string[]): string {
   if (typeof from == 'string') return sku[from]
   return from.map((field) => sku[field] || '').join('.')
 }
-export default function (brands: Array<BrandSettingI>, strategy: mappingStrategyE): (sku: SkuI) => SkuI {
-  // Helper function to convert all mapping rules for given category to an indexed object
-  const indexedMapping = function (propertyMapping, category) {
-    const filteredMappings = propertyMapping.filter((mapping) => mapping.category == category && mapping.from != undefined)
 
-    if (filteredMappings.length == 0) return undefined
-    return filteredMappings.reduce((acc, item) => {
-      acc[item.from] = item.to
-      return acc
-    }, {})
-  }
-  // Helper function to convert all mapping rules to an indexed object
-  const indexFn = function (propertyMapping) {
-    if (!propertyMapping) return {}
-    const maps = {}
-    MAPPING_CATEGORIES.forEach((category) => {
-      const map = indexedMapping(propertyMapping, category)
-      if (map !== undefined) maps[category] = map
-    })
-    return maps
+interface propertyMappingI {
+  [brandId: string]: {
+    [category: string]: {
+      [from: string]: string
+    }
   }
-  const indexedByBrandPropertyMapping = brands.reduce((acc, item) => {
-    if (!acc[item.id]) acc[item.id] = {}
-    Object.assign(acc[item.id], indexFn(item.propertyMapping))
-    return acc
-  }, {})
+}
 
+export default function (brands: Array<BrandSettingI>, strategy: mappingStrategyE): (sku: SkuI) => SkuI {
+  const indexedByBrandPropertyMapping = {} as propertyMappingI
+  brands.forEach(({ id, propertyMapping }) => {
+    if (!indexedByBrandPropertyMapping[id]) indexedByBrandPropertyMapping[id] = {}
+    propertyMapping?.forEach((mapping) => {
+      if (!indexedByBrandPropertyMapping[id][mapping.category]) indexedByBrandPropertyMapping[id][mapping.category] = {}
+      indexedByBrandPropertyMapping[id][mapping.category][mapping.from] = mapping.to
+    })
+  })
   if (strategy == 'clean')
     return function (sku: SkuI): SkuI {
       const brand = sku.BRANDHASH || hashBrand(sku.brand)
@@ -65,7 +56,7 @@ export default function (brands: Array<BrandSettingI>, strategy: mappingStrategy
       const mapping = indexedByBrandPropertyMapping[brand]
       mappingPairs.forEach((pair) => {
         const from = evaluateFromExpr(sku, pair.from) || ''
-        const redirectedMappingSource = mapping?.[pair.category]?.['~~']
+        const redirectedMappingSource = mapping?.[pair.category]?.['~~'] || pair.defaultMappingSource
         const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {}
 
         const to = mapping?.[pair.category]?.[from] || mapping?.[pair.category]?.[''] || redirectedMapping?.[pair.category]?.[from] || redirectedMapping?.[pair.category]?.['']
@@ -79,7 +70,7 @@ export default function (brands: Array<BrandSettingI>, strategy: mappingStrategy
     mappingPairs.forEach((pair) => {
       if (sku[pair.to]) return // Do not replace sku-level-user-supplied values
       const from = evaluateFromExpr(sku, pair.from)
-      const redirectedMappingSource = mapping?.[pair.category]?.['~~']
+      const redirectedMappingSource = mapping?.[pair.category]?.['~~'] || pair.defaultMappingSource
       const redirectedMapping = redirectedMappingSource ? indexedByBrandPropertyMapping[redirectedMappingSource] : {}
 
       const to = mapping?.[pair.category]?.[from] || mapping?.[pair.category]?.[''] || redirectedMapping?.[pair.category]?.[from] || redirectedMapping?.[pair.category]?.['']

package/src/types.ts

@@ -204,6 +204,11 @@ interface ProductI {
   year?: string
 }
 
+interface PropertyMappingI {
+  category: string
+  from: string
+  to: string
+}
 interface BrandSettingI {
   id: string
   name: string
@@ -224,7 +229,7 @@ interface BrandSettingI {
   whiteListTenants?: string[]
   associates?: object[]
   authGroups?: string[]
-  propertyMapping?: object[]
+  propertyMapping?: PropertyMappingI[]
   fashionCloudId?: string
 }
 
@@ -233,6 +238,7 @@ enum mappingStrategyE {
   CLEAN = 'clean',
   MARK = 'markMissingMapping',
 }
+
 export {
   RowI,
   StockTransferSelectionI,

package/test/applyPropertyMapping.spec.js

@@ -107,6 +107,16 @@ const skus = [
     collection: '22zomer',
     _customsize: 'medium',
   },
+  {
+    id: '1234567890138',
+    articleGroupSupplier: '11111',
+    brand: 'gstar',
+    collectionSupplier: 'SUMMER 2022',
+    colorCodeSupplier: '200',
+    colorFamily: 'Blue',
+    size: 'L',
+    sizeSupplier: 'L',
+  },
 ]
 
 const articleGroupMapping = [
@@ -190,6 +200,36 @@ const fallbackMapping = [
     ],
   },
 ]
+
+const stackedMapping = [
+  {
+    id: 'gstar',
+    comment: 'LatestCollection level mapping',
+    propertyMapping: [
+      {
+        category: 'ProductGroup',
+        from: '12345',
+        to: 'LAT-articleGroupMapping',
+      },
+      {
+        category: 'ProductGroup',
+        from: '11111',
+        to: 'LAT-articleGroupMapping',
+      },
+    ],
+  },
+  {
+    id: 'gstar',
+    comment: 'Tenant level mapping',
+    propertyMapping: [
+      {
+        category: 'ProductGroup',
+        from: '12345',
+        to: 'TENANT-articleGroupMapping',
+      },
+    ],
+  },
+]
 describe('applyPropertyMapping', () => {
   it('returns empty array on an empty array', function () {
     expect(applyPropertyMapping([], []).length).to.equal(0)
@@ -345,4 +385,10 @@ describe('applyPropertyMapping', () => {
     expect(cleanedSkus[9]._customsize).to.equal(undefined)
     expect(cleanedSkus[9].collection).to.equal(undefined)
   })
+
+  it('applies mapping from different sources', function () {
+    const mappedSkus = applyPropertyMapping(deepCopy(skus), stackedMapping)
+    expect(mappedSkus[6].articleGroup).to.equal('TENANT-articleGroupMapping')
+    expect(mappedSkus[10].articleGroup).to.equal('LAT-articleGroupMapping')
+  })
 })