@softwear/latestcollectioncore 1.0.197 → 1.0.198

package/dist/articleStatus.d.ts

@@ -1,8 +1,4 @@
 import { TransactionI, RaGI, HrTimeframeI, TimeGranularityE, SkuI } from './types';
-/**
- * The propFunction for FiltreX needs some data that can't be passed as parameters. That's why the 'globalsRelations' variable is needed.
- * TODO: Functional: Experiment with curried functions
- */
 declare function propFunction(propertyName: string, getPropertyName: Function, obj: Record<string, any>): any;
 declare function whichShardsToProcess(dateRange: any, granularity: 'year' | 'month'): any[];
 /**

package/dist/articleStatus.js

@@ -29,16 +29,20 @@ let globalNrAggegationExpressions = 0; // tracks the # aggregations rows so we c
  * The propFunction for FiltreX needs some data that can't be passed as parameters. That's why the 'globalsRelations' variable is needed.
  * TODO: Functional: Experiment with curried functions
  */
+function resolvePath(obj, path) {
+    return path.reduce((o, key) => o === null || o === void 0 ? void 0 : o[key], obj);
+}
 function propFunction(propertyName, getPropertyName, obj) {
     var _a, _b;
     const positionOfDot = propertyName.indexOf('.');
     if (positionOfDot < 0)
         return obj[propertyName];
     const table = propertyName.substring(0, positionOfDot);
-    const field = propertyName.substring(positionOfDot + 1);
+    const path = propertyName.substring(positionOfDot + 1).split('.');
     if (table == 'transaction')
-        return obj[field];
-    return ((_b = (_a = globalRelations[table]) === null || _a === void 0 ? void 0 : _a[obj[globalJoinableTables[table]]]) === null || _b === void 0 ? void 0 : _b[field]) || '~ ?';
+        return resolvePath(obj, path);
+    const joinedRecord = (_a = globalRelations[table]) === null || _a === void 0 ? void 0 : _a[obj[globalJoinableTables[table]]];
+    return (_b = resolvePath(joinedRecord, path)) !== null && _b !== void 0 ? _b : '~ ?';
 }
 const lower = (s) => s.toLowerCase();
 const upper = (s) => s.toUpperCase();

package/dist/types.d.ts

@@ -230,6 +230,7 @@ interface BrandSettingI {
     orderMethods?: string[];
     propertyMapping?: PropertyMappingI[];
     fashionCloudId?: string;
+    tapprApiHost?: string;
     sizeSystemPrefix?: string;
     supplier?: string;
 }

package/package.json

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

package/src/articleStatus.ts

@@ -97,13 +97,18 @@ let globalNrAggegationExpressions = 0 // tracks the # aggregations rows so we ca
  * The propFunction for FiltreX needs some data that can't be passed as parameters. That's why the 'globalsRelations' variable is needed.
  * TODO: Functional: Experiment with curried functions
  */
+function resolvePath(obj: Record<string, any> | undefined, path: string[]): any {
+  return path.reduce((o, key) => o?.[key], obj)
+}
+
 function propFunction(propertyName: string, getPropertyName: Function, obj: Record<string, any>): any {
   const positionOfDot = propertyName.indexOf('.')
   if (positionOfDot < 0) return obj[propertyName]
   const table = propertyName.substring(0, positionOfDot)
-  const field = propertyName.substring(positionOfDot + 1)
-  if (table == 'transaction') return obj[field]
-  return globalRelations[table]?.[obj[globalJoinableTables[table]]]?.[field] || '~ ?'
+  const path = propertyName.substring(positionOfDot + 1).split('.')
+  if (table == 'transaction') return resolvePath(obj, path)
+  const joinedRecord = globalRelations[table]?.[obj[globalJoinableTables[table]]]
+  return resolvePath(joinedRecord, path) ?? '~ ?'
 }
 
 const lower = (s: string) => s.toLowerCase()

package/src/types.ts

@@ -244,6 +244,7 @@ interface BrandSettingI {
   orderMethods?: string[]
   propertyMapping?: PropertyMappingI[]
   fashionCloudId?: string
+  tapprApiHost?: string
   sizeSystemPrefix?: string
   supplier?: string
 }

package/test/articleStatus.spec.js

@@ -271,6 +271,61 @@ describe('articleStatus', () => {
       expect(result[2].vector[articleStatus.MARGIN]).toBe(50)
     })
 
+    it('should resolve nested property paths like customer.invoiceAddress.countrycode when grouping', () => {
+      const CUSTOMERS = {
+        '*zBXU': { invoiceAddress: { countrycode: 'NL' } },
+      }
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316409000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        ['customer.invoiceAddress.countrycode'],
+        SKUS,
+        {},
+        CUSTOMERS,
+        false,
+        '',
+        false
+      )
+
+      // Sales (custnr '*zBXU') resolve the nested path to 'NL',
+      // beginStock transactions have no custnr and fall back to '~ ?'
+      expect(Object.keys(rawAggregations)).toEqual(['** TOTAL **', '~ ?', 'NL'])
+      expect(rawAggregations['NL'][articleStatus.QTY_SOLD]).toBe(2)
+    })
+
+    it('should resolve nested property paths in filter expressions', () => {
+      const CUSTOMERS = {
+        '*zBXU': { invoiceAddress: { countrycode: 'NL' } },
+      }
+      const run = (countrycode) => {
+        const rawAggregations = {}
+        articleStatus.runQuery(
+          { beginTimeStamp: 1569316408000, endTimeStamp: 1569316409000 + msYear },
+          rawAggregations,
+          false,
+          TRANSACTIONS,
+          ['transaction.ean'],
+          SKUS,
+          {},
+          CUSTOMERS,
+          false,
+          'customer.invoiceAddress.countrycode == "' + countrycode + '"',
+          false
+        )
+        return rawAggregations
+      }
+
+      const matching = run('NL')
+      expect(Object.keys(matching)).toEqual(['** TOTAL **', '000558000143', '8700558000143'])
+      expect(matching['000558000143'][articleStatus.QTY_SOLD]).toBe(1)
+
+      const nonMatching = run('DE')
+      expect(Object.keys(nonMatching)).toEqual([])
+    })
+
     it('should calculate shelfStock correctly with type 10 (beginShelfStock) and type 94 (picklist)', () => {
       // Test scenario:
       // - beginStock (type 0): 100 units