@softwear/latestcollectioncore 1.0.95 → 1.0.97

package/dist/articleStatus.js

@@ -81,24 +81,32 @@ function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey
         aggregateVector = new Float64Array(VECTOR_LENGTH);
         rawAggregations[aggregateKey] = aggregateVector;
     }
-    const vector = transaction.vector;
+    const v = transaction.vector;
     if (transaction.type == '1' && transaction.time > aggregateVector[MAX_RECIEVE_TIMESTAMP])
         aggregateVector[MAX_RECIEVE_TIMESTAMP] = transaction.time;
     if (transaction.time <= beginTimestamp) {
-        addVectors(aggregateVector, vector, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END);
-        addVectors(aggregateVector, vector, QTY_CONSIGNMENT, COSTPRICE_CONSIGNMENT + 1);
+        addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END);
+        addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1);
         return;
     }
     if (transaction.time > endTimestamp)
         return;
-    addVectors(aggregateVector, vector, BEGIN_STOCK_VECTOR_END, vector.length);
+    addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length);
     // Calculate derived fields
-    aggregateVector[QTY_RETURN] += vector[QTY_SOLD] < 0 ? vector[QTY_SOLD] : 0;
-    aggregateVector[AMOUNT_RETURN] += vector[AMOUNT_SOLD_EXCL] < 0 ? vector[AMOUNT_SOLD_EXCL] : 0;
+    aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0;
+    aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0;
     aggregateVector[STOCK_TIME_PRODUCT] +=
-        (vector[QTY_RECIEVED] || 0 + vector[QTY_TRANSIT] || 0 + vector[QTY_CHANGE] || 0 - vector[QTY_SOLD] || 0) * (endTimestamp - transaction.time);
+        ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) *
+            (endTimestamp - transaction.time);
     aggregateVector[STOCKAMOUNT_TIME_PRODUCT] +=
-        (vector[AMOUNT_RECIEVED] || 0 + vector[AMOUNT_TRANSIT] || 0 + vector[AMOUNT_CHANGE] || 0 - vector[COSTPRICE_SOLD] || 0) * (endTimestamp - transaction.time);
+        ((v[AMOUNT_RECIEVED] || 0) +
+            (v[AMOUNT_TRANSIT] || 0) +
+            (v[AMOUNT_CHANGE] || 0) -
+            (v[COSTPRICE_SOLD] || 0) -
+            (v[COSTPRICE_B2B_SOLD] || 0) -
+            (v[COSTPRICE_B2B_RESOLD] || 0) +
+            (v[COSTPRICE_B2B_RETURN] || 0)) *
+            (endTimestamp - transaction.time);
 }
 function buildAggregationEvaluator(aggregationExpression) {
     return (0, filtrex_1.compileExpression)(aggregationExpression, filtrexOptions);
@@ -173,9 +181,9 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
         // Prepare joined values for derived fields
         if (transaction.type == '2') {
             const sku = globalRelations['sku'][transaction.ean];
-            const vector = transaction.vector;
-            vector[AMOUNT_SOLD_MAX] = ((sku === null || sku === void 0 ? void 0 : sku.price) || 0) * vector[QTY_SOLD];
-            vector[AMOUNT_SOLD_DISCOUNT] = vector[AMOUNT_SOLD_MAX] - vector[AMOUNT_SOLD];
+            const v = transaction.vector;
+            v[AMOUNT_SOLD_MAX] = ((sku === null || sku === void 0 ? void 0 : sku.price) || 0) * v[QTY_SOLD];
+            v[AMOUNT_SOLD_DISCOUNT] = v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD];
         }
         if (totals)
             addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows);
@@ -250,28 +258,22 @@ function whichShardsToProcess(dateRange, granularity) {
  * Calculate all derived columns on a given vector.
  */
 function postAgg(v, timeFrame) {
-    v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_B2B_SOLD] - v[QTY_B2B_RESOLD] + v[QTY_B2B_RETURN];
-    v[AMOUNT_END_STOCK] =
-        v[AMOUNT_STOCK] +
-            v[AMOUNT_RECIEVED] -
-            v[COSTPRICE_SOLD] +
-            v[AMOUNT_CHANGE] +
-            v[AMOUNT_TRANSIT] +
-            v[AMOUNT_REVALUATE] -
-            v[COSTPRICE_B2B_SOLD] -
-            v[COSTPRICE_B2B_RESOLD] +
-            v[COSTPRICE_B2B_RETURN];
+    const totalQtySold = v[QTY_SOLD] + v[QTY_B2B_SOLD] + v[QTY_B2B_RESOLD] - v[QTY_B2B_RETURN];
+    const totalAmountSold = v[AMOUNT_SOLD_EXCL] + v[AMOUNT_B2B_SOLD] + v[AMOUNT_B2B_RESOLD] - v[AMOUNT_B2B_RETURN];
+    const totalCostSold = v[COSTPRICE_SOLD] + v[COSTPRICE_B2B_SOLD] + v[COSTPRICE_B2B_RESOLD] - v[COSTPRICE_B2B_RETURN];
+    v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold;
+    v[AMOUNT_END_STOCK] = v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold;
     v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
     v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST];
-    v[SELLOUT_PERCENTAGE] = (v[QTY_SOLD] / (v[QTY_SOLD] + v[QTY_END_STOCK])) * 100;
-    v[ROI] = v[AMOUNT_SOLD_EXCL] - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT];
+    v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100;
+    v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT];
     v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame;
     v[VALUE_AVG_STOCK] = (v[AMOUNT_STOCK] * timeFrame + v[STOCKAMOUNT_TIME_PRODUCT]) / timeFrame;
-    v[QTY_TURNOVER_VELOCITY] = ((v[QTY_SOLD] / v[QTY_AVG_STOCK]) * msYear) / timeFrame;
-    v[AMOUNT_TURNOVER_VELOCITY] = ((v[COSTPRICE_SOLD] / v[VALUE_AVG_STOCK]) * msYear) / timeFrame;
-    v[PROFIT] = v[AMOUNT_SOLD_EXCL] - v[COSTPRICE_SOLD];
-    v[PROFITABILITY] = (v[PROFIT] / v[COSTPRICE_SOLD]) * v[QTY_TURNOVER_VELOCITY] * 100;
-    v[MARGIN] = (v[PROFIT] / v[AMOUNT_SOLD_EXCL]) * 100;
+    v[QTY_TURNOVER_VELOCITY] = ((totalQtySold / v[QTY_AVG_STOCK]) * msYear) / timeFrame;
+    v[AMOUNT_TURNOVER_VELOCITY] = ((totalCostSold / v[VALUE_AVG_STOCK]) * msYear) / timeFrame;
+    v[PROFIT] = totalAmountSold - totalCostSold;
+    v[PROFITABILITY] = (v[PROFIT] / totalCostSold) * v[QTY_TURNOVER_VELOCITY] * 100;
+    v[MARGIN] = (v[PROFIT] / totalAmountSold) * 100;
     v[RETURN_PERCENTAGE] = (v[QTY_RETURN] / v[QTY_RECIEVED]) * 100;
     v[QTY_SOLD_BEFORE_RETURNS] = v[QTY_SOLD] + Math.abs(v[QTY_RETURN]);
 }

package/package.json

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

package/src/articleStatus.ts

@@ -128,25 +128,33 @@ function addTransactionToAggregations(beginTimestamp: number, endTimestamp: numb
     aggregateVector = new Float64Array(VECTOR_LENGTH)
     rawAggregations[aggregateKey] = aggregateVector
   }
-  const vector = transaction.vector
+  const v = transaction.vector
   if (transaction.type == '1' && transaction.time > aggregateVector[MAX_RECIEVE_TIMESTAMP]) aggregateVector[MAX_RECIEVE_TIMESTAMP] = transaction.time
   if (transaction.time <= beginTimestamp) {
-    addVectors(aggregateVector, vector, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END)
-    addVectors(aggregateVector, vector, QTY_CONSIGNMENT, COSTPRICE_CONSIGNMENT + 1)
+    addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END)
+    addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1)
     return
   }
   if (transaction.time > endTimestamp) return
-  addVectors(aggregateVector, vector, BEGIN_STOCK_VECTOR_END, vector.length)
+  addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length)
 
   // Calculate derived fields
 
-  aggregateVector[QTY_RETURN] += vector[QTY_SOLD] < 0 ? vector[QTY_SOLD] : 0
-  aggregateVector[AMOUNT_RETURN] += vector[AMOUNT_SOLD_EXCL] < 0 ? vector[AMOUNT_SOLD_EXCL] : 0
+  aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0
+  aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0
 
   aggregateVector[STOCK_TIME_PRODUCT] +=
-    (vector[QTY_RECIEVED] || 0 + vector[QTY_TRANSIT] || 0 + vector[QTY_CHANGE] || 0 - vector[QTY_SOLD] || 0) * (endTimestamp - transaction.time)
+    ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) *
+    (endTimestamp - transaction.time)
   aggregateVector[STOCKAMOUNT_TIME_PRODUCT] +=
-    (vector[AMOUNT_RECIEVED] || 0 + vector[AMOUNT_TRANSIT] || 0 + vector[AMOUNT_CHANGE] || 0 - vector[COSTPRICE_SOLD] || 0) * (endTimestamp - transaction.time)
+    ((v[AMOUNT_RECIEVED] || 0) +
+      (v[AMOUNT_TRANSIT] || 0) +
+      (v[AMOUNT_CHANGE] || 0) -
+      (v[COSTPRICE_SOLD] || 0) -
+      (v[COSTPRICE_B2B_SOLD] || 0) -
+      (v[COSTPRICE_B2B_RESOLD] || 0) +
+      (v[COSTPRICE_B2B_RETURN] || 0)) *
+    (endTimestamp - transaction.time)
 }
 
 function buildAggregationEvaluator(aggregationExpression: string): Function {
@@ -233,9 +241,9 @@ function aggregator({
     // Prepare joined values for derived fields
     if (transaction.type == '2') {
       const sku = globalRelations['sku'][transaction.ean]
-      const vector = transaction.vector
-      vector[AMOUNT_SOLD_MAX] = (sku?.price || 0) * vector[QTY_SOLD]
-      vector[AMOUNT_SOLD_DISCOUNT] = vector[AMOUNT_SOLD_MAX] - vector[AMOUNT_SOLD]
+      const v = transaction.vector
+      v[AMOUNT_SOLD_MAX] = (sku?.price || 0) * v[QTY_SOLD]
+      v[AMOUNT_SOLD_DISCOUNT] = v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD]
     }
 
     if (totals) addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows)
@@ -315,28 +323,23 @@ function whichShardsToProcess(dateRange: any, granularity: 'year' | 'month'): an
  * Calculate all derived columns on a given vector.
  */
 function postAgg(v: any, timeFrame: number): void {
-  v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_B2B_SOLD] - v[QTY_B2B_RESOLD] + v[QTY_B2B_RETURN]
-  v[AMOUNT_END_STOCK] =
-    v[AMOUNT_STOCK] +
-    v[AMOUNT_RECIEVED] -
-    v[COSTPRICE_SOLD] +
-    v[AMOUNT_CHANGE] +
-    v[AMOUNT_TRANSIT] +
-    v[AMOUNT_REVALUATE] -
-    v[COSTPRICE_B2B_SOLD] -
-    v[COSTPRICE_B2B_RESOLD] +
-    v[COSTPRICE_B2B_RETURN]
+  const totalQtySold = v[QTY_SOLD] + v[QTY_B2B_SOLD] + v[QTY_B2B_RESOLD] - v[QTY_B2B_RETURN]
+  const totalAmountSold = v[AMOUNT_SOLD_EXCL] + v[AMOUNT_B2B_SOLD] + v[AMOUNT_B2B_RESOLD] - v[AMOUNT_B2B_RETURN]
+  const totalCostSold = v[COSTPRICE_SOLD] + v[COSTPRICE_B2B_SOLD] + v[COSTPRICE_B2B_RESOLD] - v[COSTPRICE_B2B_RETURN]
+
+  v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold
+  v[AMOUNT_END_STOCK] = v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold
   v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
   v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST]
-  v[SELLOUT_PERCENTAGE] = (v[QTY_SOLD] / (v[QTY_SOLD] + v[QTY_END_STOCK])) * 100
-  v[ROI] = v[AMOUNT_SOLD_EXCL] - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT]
+  v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100
+  v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT]
   v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame
   v[VALUE_AVG_STOCK] = (v[AMOUNT_STOCK] * timeFrame + v[STOCKAMOUNT_TIME_PRODUCT]) / timeFrame
-  v[QTY_TURNOVER_VELOCITY] = ((v[QTY_SOLD] / v[QTY_AVG_STOCK]) * msYear) / timeFrame
-  v[AMOUNT_TURNOVER_VELOCITY] = ((v[COSTPRICE_SOLD] / v[VALUE_AVG_STOCK]) * msYear) / timeFrame
-  v[PROFIT] = v[AMOUNT_SOLD_EXCL] - v[COSTPRICE_SOLD]
-  v[PROFITABILITY] = (v[PROFIT] / v[COSTPRICE_SOLD]) * v[QTY_TURNOVER_VELOCITY] * 100
-  v[MARGIN] = (v[PROFIT] / v[AMOUNT_SOLD_EXCL]) * 100
+  v[QTY_TURNOVER_VELOCITY] = ((totalQtySold / v[QTY_AVG_STOCK]) * msYear) / timeFrame
+  v[AMOUNT_TURNOVER_VELOCITY] = ((totalCostSold / v[VALUE_AVG_STOCK]) * msYear) / timeFrame
+  v[PROFIT] = totalAmountSold - totalCostSold
+  v[PROFITABILITY] = (v[PROFIT] / totalCostSold) * v[QTY_TURNOVER_VELOCITY] * 100
+  v[MARGIN] = (v[PROFIT] / totalAmountSold) * 100
   v[RETURN_PERCENTAGE] = (v[QTY_RETURN] / v[QTY_RECIEVED]) * 100
   v[QTY_SOLD_BEFORE_RETURNS] = v[QTY_SOLD] + Math.abs(v[QTY_RETURN])
 }

package/test/articleStatus.spec.js

@@ -2,6 +2,99 @@ const core = require('../dist/index')
 const { expect } = require('chai')
 
 const articleStatus = core.articleStatus
+const msYear = 24 * 3600 * 365 * 1000
+
+const TRANSACTIONS = [
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '000558000143',
+    wh: '50',
+    vector: [10, 10, 49.5, 10, 49.5, 0, 0, 0, 0, 0, 0, 0, 10, 49.5],
+    row: 0,
+  },
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '000558000143',
+    wh: '54',
+    vector: [1, 1, 4.95, 1, 4.95, 0, 0, 0, 0, 0, 0, 0, 1, 4.95],
+    row: 1,
+  },
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '000558000143',
+    wh: '55',
+    vector: [1, 1, 4.95, 1, 4.95, 0, 0, 0, 0, 0, 0, 0, 1, 4.95],
+    row: 2,
+  },
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '000558000143',
+    wh: '56',
+    vector: [1, 1, 4.95, 1, 4.95, 0, 0, 0, 0, 0, 0, 0, 1, 4.95],
+    row: 3,
+  },
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '000558000143',
+    wh: '57',
+    vector: [5, 5, 24.75, 5, 24.75, 0, 0, 0, 0, 0, 0, 0, 5, 24.75],
+    row: 4,
+  },
+  {
+    time: 1569316409000,
+    type: '2',
+    ean: '000558000143',
+    agent: '96',
+    wh: '52',
+    custnr: '*zBXU',
+    docnr: '52-216-2515',
+    vector: [1, -1, -4.95, -1, -4.95, 0, 0, 0, 1, 10.95, 9.05, 4.95],
+    row: 5,
+  },
+  {
+    time: 1546297200000,
+    type: '0',
+    ean: '8700558000143',
+    wh: '57',
+    vector: [10, 10, 100, 10, 100, 0, 0, 0, 0, 0, 0, 0, 10, 100],
+    row: 6,
+  },
+  {
+    time: 1569316409000,
+    type: '2',
+    ean: '8700558000143',
+    agent: '96',
+    wh: '57',
+    custnr: '*zBXU',
+    docnr: '52-216-2515',
+    vector: [1, -1, -10, -1, -10, 0, 0, 0, 1, 25, 20, 10],
+    row: 7,
+  },
+  {
+    time: 1569316409000,
+    type: '93',
+    ean: '8700558000143',
+    agent: '96',
+    wh: '52',
+    custnr: '*zBXU',
+    docnr: '52-216-2515',
+    vector: [1, -1, -10, -1, -10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20, 10],
+    row: 8,
+  },
+]
+SKUS = {
+  '000558000143': {
+    brand: 'Mexx',
+  },
+  8700558000143: {
+    brand: 'Gaastra',
+  },
+}
 describe('#articleStatus', () => {
   describe('#constants', () => {
     it('QTY_SOLD_BEFORE_RETURNS should be 64', () => {
@@ -11,4 +104,140 @@ describe('#articleStatus', () => {
       expect(articleStatus.AMOUNT_RETURN).to.equal(49)
     })
   })
+  describe('#runQuery', () => {
+    it('should calculate aggregations, totals and subtotals', () => {
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316409000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        ['transaction.ean'],
+        {},
+        {},
+        {},
+        true,
+        'transaction.ean=="000558000143"',
+        false
+      )
+
+      const result = []
+      Object.entries(rawAggregations).map((oneAggregatedRow) => {
+        const vector = [].slice.call(oneAggregatedRow[1]) // vector is now a normal Array instead of a Float64Array so can be extended with additional fields
+        articleStatus.postAgg(vector, msYear)
+        result.push({ key: oneAggregatedRow[0], vector })
+      })
+      expect(result[0].key).to.equal('** TOTAL **')
+      expect(JSON.stringify(result[0].vector[articleStatus.QTY_STOCK])).to.equal('18')
+      expect(JSON.stringify(result[0].vector[articleStatus.AMOUNT_STOCK])).to.equal('89.10000000000001')
+      expect(JSON.stringify(result[0].vector[articleStatus.QTY_END_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[0].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('84.15')
+      expect(JSON.stringify(result[0].vector[articleStatus.QTY_AVG_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[0].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('84.15000000000002')
+
+      expect(result[1].key).to.equal(' Σ')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_STOCK])).to.equal('18')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_STOCK])).to.equal('89.10000000000001')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_END_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('84.15')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_AVG_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[1].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('84.15000000000002')
+
+      expect(result[2].key).to.equal('000558000143')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_STOCK])).to.equal('18')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_STOCK])).to.equal('89.10000000000001')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_END_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('84.15')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_AVG_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[2].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('84.15000000000002')
+    })
+
+    it('should calculate aggregations', () => {
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316408000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        ['sku.brand'],
+        SKUS,
+        {},
+        {},
+        false,
+        '',
+        false
+      )
+
+      const result = []
+      Object.entries(rawAggregations).map((oneAggregatedRow) => {
+        const vector = [].slice.call(oneAggregatedRow[1]) // vector is now a normal Array instead of a Float64Array so can be extended with additional fields
+        articleStatus.postAgg(vector, msYear)
+        result.push({ key: oneAggregatedRow[0], vector })
+      })
+      expect(result[0].key).to.equal('** TOTAL **')
+      expect(JSON.stringify(result[0].vector[articleStatus.MARGIN])).to.equal('49.1335372069317')
+
+      expect(result[1].key).to.equal('Mexx')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_STOCK])).to.equal('18')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_STOCK])).to.equal('89.10000000000001')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_END_STOCK])).to.equal('17')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('84.15')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_AVG_STOCK])).to.equal('17.000000031709792')
+      expect(JSON.stringify(result[1].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('84.15000015696349')
+      expect(JSON.stringify(result[1].vector[articleStatus.MARGIN])).to.equal('45.30386740331492')
+
+      expect(result[2].key).to.equal('Gaastra')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_STOCK])).to.equal('10')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_STOCK])).to.equal('100')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_END_STOCK])).to.equal('8')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('80')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_AVG_STOCK])).to.equal('8.000000063419584')
+      expect(JSON.stringify(result[2].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('80.00000063419584')
+      expect(JSON.stringify(result[2].vector[articleStatus.MARGIN])).to.equal('50')
+    })
+
+    it('should calculate aggregations', () => {
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316408000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        ['sku.brand'],
+        SKUS,
+        {},
+        {},
+        false,
+        'transaction.wh=="57"',
+        false
+      )
+
+      const result = []
+      Object.entries(rawAggregations).map((oneAggregatedRow) => {
+        const vector = [].slice.call(oneAggregatedRow[1]) // vector is now a normal Array instead of a Float64Array so can be extended with additional fields
+        articleStatus.postAgg(vector, msYear)
+        result.push({ key: oneAggregatedRow[0], vector })
+      })
+      expect(result[0].key).to.equal('** TOTAL **')
+      expect(JSON.stringify(result[0].vector[articleStatus.MARGIN])).to.equal('50')
+
+      expect(result[1].key).to.equal('Mexx')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_STOCK])).to.equal('5')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_STOCK])).to.equal('24.75')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_END_STOCK])).to.equal('5')
+      expect(JSON.stringify(result[1].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('24.75')
+      expect(JSON.stringify(result[1].vector[articleStatus.QTY_AVG_STOCK])).to.equal('5')
+      expect(JSON.stringify(result[1].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('24.75')
+      expect(JSON.stringify(result[1].vector[articleStatus.MARGIN])).to.equal('null')
+
+      expect(result[2].key).to.equal('Gaastra')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_STOCK])).to.equal('10')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_STOCK])).to.equal('100')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_END_STOCK])).to.equal('9')
+      expect(JSON.stringify(result[2].vector[articleStatus.AMOUNT_END_STOCK])).to.equal('90')
+      expect(JSON.stringify(result[2].vector[articleStatus.QTY_AVG_STOCK])).to.equal('9.000000031709792')
+      expect(JSON.stringify(result[2].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('90.00000031709791')
+      expect(JSON.stringify(result[2].vector[articleStatus.MARGIN])).to.equal('50')
+    })
+  })
 })