@things-factory/dataset 6.0.85 → 6.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.85",
+  "version": "6.0.86",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -50,5 +50,5 @@
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "98d3d1b2cde1c9d6cb717b5c8cdb6d585a2a744a"
+  "gitHead": "b6e098a058696832178dd425ec0893ca4c313b33"
 }

package/server/controllers/query-data-summary-by-period.ts

@@ -91,12 +91,17 @@ export async function queryDataSummaryByPeriod(
 
   const { from, to } = await getTimesForPeriod(period, context)
 
-  const selectPeriod =
-    period == 'today'
-      ? ['summary.date', 'summary.period']
-      : ['this year', '12 months'].includes(period)
-      ? ['SUBSTRING(summary.date, 1, 7) AS month']
-      : ['summary.date']
+  const selectPeriod = queryBuilder => {
+    if (period == 'today') {
+      queryBuilder.addSelect('summary.date', 'date').addSelect('summary.period', 'period')
+    } else if (['this year', '12 months'].includes(period)) {
+      queryBuilder.addSelect('SUBSTRING(summary.date, 1, 7) AS month')
+    } else {
+      queryBuilder.addSelect('summary.date', 'date')
+    }
+
+    return queryBuilder
+  }
   const selectKeys = dataKeyItems.map((item, index) => {
     const aliasName = `key0${index + 1}`
     const columnName = `summary.${aliasName}`
@@ -172,20 +177,22 @@ export async function queryDataSummaryByPeriod(
     .select('summary.dataSet')
     .addSelect('ds.name', 'name')
     .addSelect('ds.description', 'description')
-    .addSelect('summary.date', 'date')
-    .addSelect('summary.period', 'period')
-    .addSelect(selectPeriod)
     .addSelect(selectKeys)
     .addSelect(selectData)
     .addSelect('SUM(summary.count)', 'count')
     .addSelect('SUM(summary.countOoc)', 'countOoc')
     .addSelect('SUM(summary.countOos)', 'countOos')
+
+  selectPeriod(queryBuilder)
     .innerJoin('summary.dataSet', 'ds', 'ds.id = :dataSetName', {
       dataSetName: dataSet.id
     })
     .andWhere('summary.domain = :domain', { domain: domain.id })
     .andWhere('summary.date >= :from', { from })
     .andWhere('summary.date < :to', { to })
+    .addGroupBy('summary.dataSet')
+    .addGroupBy('ds.name')
+    .addGroupBy('ds.description')
     .addGroupBy(groupByPeriod)
     .addGroupBy(groupByKeys)