@softwear/latestcollectioncore 1.0.196 → 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/consts.d.ts

@@ -4,21 +4,25 @@ declare const SUBSCRIPTION_LIMITS: {
         readonly maxBarcodes: 1000;
         readonly maxDownloadBarcodes: 1000;
         readonly maxCustomers: 0;
+        readonly maxDataRetentionYears: 3;
     };
     readonly basiq: {
         readonly maxBarcodes: 100000;
         readonly maxDownloadBarcodes: 10000;
         readonly maxCustomers: 1000;
+        readonly maxDataRetentionYears: 3;
     };
     readonly pro: {
         readonly maxBarcodes: 200000;
         readonly maxDownloadBarcodes: 20000;
         readonly maxCustomers: 10000;
+        readonly maxDataRetentionYears: 5;
     };
     readonly ultimate: {
         readonly maxBarcodes: 500000;
         readonly maxDownloadBarcodes: 50000;
         readonly maxCustomers: 100000;
+        readonly maxDataRetentionYears: 7;
     };
 };
 declare const latestCollectionGLN: "8719332204995";

package/dist/consts.js

@@ -22,21 +22,25 @@ const SUBSCRIPTION_LIMITS = {
         maxBarcodes: 1000,
         maxDownloadBarcodes: 1000,
         maxCustomers: 0,
+        maxDataRetentionYears: 3,
     },
     basiq: {
         maxBarcodes: 100000,
         maxDownloadBarcodes: 10000,
         maxCustomers: 1000,
+        maxDataRetentionYears: 3,
     },
     pro: {
         maxBarcodes: 200000,
         maxDownloadBarcodes: 20000,
         maxCustomers: 10000,
+        maxDataRetentionYears: 5,
     },
     ultimate: {
         maxBarcodes: 500000,
         maxDownloadBarcodes: 50000,
         maxCustomers: 100000,
+        maxDataRetentionYears: 7,
     },
 };
 exports.SUBSCRIPTION_LIMITS = SUBSCRIPTION_LIMITS;

package/dist/dataRetention.d.ts

@@ -0,0 +1,4 @@
+export declare function getMaxDataRetentionYears(subscription: string): number;
+export declare function getEarliestAllowedYear(maxRetentionYears: number, thisYear?: number): number;
+export declare function isYearWithinDataRetention(year: number | string, maxRetentionYears: number, thisYear?: number): boolean;
+export declare function isDateWithinDataRetention(date: string, maxRetentionYears: number, thisYear?: number): boolean;

package/dist/dataRetention.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDateWithinDataRetention = exports.isYearWithinDataRetention = exports.getEarliestAllowedYear = exports.getMaxDataRetentionYears = void 0;
+const consts_1 = require("./consts");
+function getMaxDataRetentionYears(subscription) {
+    var _a;
+    const limits = consts_1.SUBSCRIPTION_LIMITS[subscription];
+    return (_a = limits === null || limits === void 0 ? void 0 : limits.maxDataRetentionYears) !== null && _a !== void 0 ? _a : consts_1.SUBSCRIPTION_LIMITS.basiq.maxDataRetentionYears;
+}
+exports.getMaxDataRetentionYears = getMaxDataRetentionYears;
+function getEarliestAllowedYear(maxRetentionYears, thisYear = new Date().getFullYear()) {
+    return thisYear - maxRetentionYears + 1;
+}
+exports.getEarliestAllowedYear = getEarliestAllowedYear;
+function isYearWithinDataRetention(year, maxRetentionYears, thisYear = new Date().getFullYear()) {
+    const parsedYear = parseInt(String(year), 10);
+    if (Number.isNaN(parsedYear))
+        return true;
+    return parsedYear >= getEarliestAllowedYear(maxRetentionYears, thisYear);
+}
+exports.isYearWithinDataRetention = isYearWithinDataRetention;
+function isDateWithinDataRetention(date, maxRetentionYears, thisYear = new Date().getFullYear()) {
+    if (!date)
+        return true;
+    return isYearWithinDataRetention(parseInt(date.substring(0, 4), 10), maxRetentionYears, thisYear);
+}
+exports.isDateWithinDataRetention = isDateWithinDataRetention;

package/dist/index.d.ts

@@ -25,5 +25,6 @@ export * from './pdf';
 export type { GenPdfAlert, GenPdfOptions, PdfFontDefinition, PdfFontVariant, PdfImageAsset } from './reports';
 export * from './types';
 export * from './consts';
+export * from './dataRetention';
 export { default as lcAxios, createAxiosInstance, axiosRetry, exponentialDelay, isAxiosError, } from './lcAxios';
 export type { AxiosRequestConfig, AxiosResponse, AxiosPromise, AxiosError, AxiosTransformer, AxiosRetryOptions, AxiosRequestConfigAny, } from './lcAxios';

package/dist/index.js

@@ -69,6 +69,7 @@ Object.defineProperty(exports, "shouldSuppressZeroField", { enumerable: true, ge
 __exportStar(require("./pdf"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./consts"), exports);
+__exportStar(require("./dataRetention"), exports);
 var lcAxios_1 = require("./lcAxios");
 Object.defineProperty(exports, "lcAxios", { enumerable: true, get: function () { return __importDefault(lcAxios_1).default; } });
 Object.defineProperty(exports, "createAxiosInstance", { enumerable: true, get: function () { return lcAxios_1.createAxiosInstance; } });

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.196",
+  "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/consts.ts

@@ -18,21 +18,25 @@ const SUBSCRIPTION_LIMITS = {
     maxBarcodes: 1000,
     maxDownloadBarcodes: 1000,
     maxCustomers: 0,
+    maxDataRetentionYears: 3,
   },
   basiq: {
     maxBarcodes: 100000,
     maxDownloadBarcodes: 10000,
     maxCustomers: 1000,
+    maxDataRetentionYears: 3,
   },
   pro: {
     maxBarcodes: 200000,
     maxDownloadBarcodes: 20000,
     maxCustomers: 10000,
+    maxDataRetentionYears: 5,
   },
   ultimate: {
     maxBarcodes: 500000,
     maxDownloadBarcodes: 50000,
     maxCustomers: 100000,
+    maxDataRetentionYears: 7,
   },
 } as const
 const latestCollectionGLN = '8719332204995' as const

package/src/dataRetention.ts

@@ -0,0 +1,23 @@
+import { SUBSCRIPTION_LIMITS } from './consts'
+
+type SubscriptionKey = keyof typeof SUBSCRIPTION_LIMITS
+
+export function getMaxDataRetentionYears(subscription: string): number {
+  const limits = SUBSCRIPTION_LIMITS[subscription as SubscriptionKey]
+  return limits?.maxDataRetentionYears ?? SUBSCRIPTION_LIMITS.basiq.maxDataRetentionYears
+}
+
+export function getEarliestAllowedYear(maxRetentionYears: number, thisYear = new Date().getFullYear()): number {
+  return thisYear - maxRetentionYears + 1
+}
+
+export function isYearWithinDataRetention(year: number | string, maxRetentionYears: number, thisYear = new Date().getFullYear()): boolean {
+  const parsedYear = parseInt(String(year), 10)
+  if (Number.isNaN(parsedYear)) return true
+  return parsedYear >= getEarliestAllowedYear(maxRetentionYears, thisYear)
+}
+
+export function isDateWithinDataRetention(date: string, maxRetentionYears: number, thisYear = new Date().getFullYear()): boolean {
+  if (!date) return true
+  return isYearWithinDataRetention(parseInt(date.substring(0, 4), 10), maxRetentionYears, thisYear)
+}

package/src/index.ts

@@ -25,6 +25,7 @@ export * from './pdf'
 export type { GenPdfAlert, GenPdfOptions, PdfFontDefinition, PdfFontVariant, PdfImageAsset } from './reports'
 export * from './types'
 export * from './consts'
+export * from './dataRetention'
 export {
   default as lcAxios,
   createAxiosInstance,

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

package/test/dataRetention.spec.ts

@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest'
+import { getEarliestAllowedYear, getMaxDataRetentionYears, isDateWithinDataRetention, isYearWithinDataRetention } from '../src/dataRetention'
+
+describe('dataRetention', () => {
+  const thisYear = 2026
+
+  it('returns retention years per subscription', () => {
+    expect(getMaxDataRetentionYears('basiq')).toBe(3)
+    expect(getMaxDataRetentionYears('pro')).toBe(5)
+    expect(getMaxDataRetentionYears('ultimate')).toBe(7)
+    expect(getMaxDataRetentionYears('unknown')).toBe(3)
+  })
+
+  it('checks year and date access against retention', () => {
+    expect(getEarliestAllowedYear(3, thisYear)).toBe(2024)
+    expect(isYearWithinDataRetention(2024, 3, thisYear)).toBe(true)
+    expect(isYearWithinDataRetention(2023, 3, thisYear)).toBe(false)
+    expect(isDateWithinDataRetention('2023-12-31', 3, thisYear)).toBe(false)
+    expect(isDateWithinDataRetention('2024-01-01', 3, thisYear)).toBe(true)
+  })
+})