@things-factory/dataset 6.0.93 → 6.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.93",
+  "version": "6.0.95",
   "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": "7a17b2f5659c3e162d7f73b47a04f5caafb566e2"
+  "gitHead": "39d89a82867ab92c3f36cd8ec0cf7f60e3422de5"
 }

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

@@ -1,6 +1,6 @@
 import moment from 'moment-timezone'
 
-import { getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { getQueryBuilderFromListParams, getRepository, ListParam, Sorting } from '@things-factory/shell'
 
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 
@@ -158,25 +158,33 @@ export async function queryDataSummaryByPeriod(
     })
     .join(', ')
 
-  const orderByPeriod: { sort: string; order: 'DESC' | 'ASC' }[] =
+  const desc = false
+  var orderByPeriod: Sorting[] =
     period == 'today'
       ? [
           {
-            sort: 'summary.date',
-            order: 'DESC'
+            name: 'date',
+            desc
           },
           {
-            sort: 'summary.period',
-            order: 'DESC'
+            name: 'period',
+            desc
           }
         ]
       : ['this year', '12 months'].includes(period)
-      ? [{ sort: 'month', order: 'DESC' }]
-      : [{ sort: 'summary.date', order: 'DESC' }]
+      ? [{ name: 'month', desc }]
+      : [{ name: 'date', desc }]
+
+  if (params?.sortings && params.sortings.length > 0) {
+    orderByPeriod = params.sortings
+  }
 
   var queryBuilder = getQueryBuilderFromListParams({
     repository: getRepository(DataSummary),
-    params,
+    params: {
+      ...params,
+      sortings: []
+    },
     domain,
     alias: 'summary',
     searchables: searchables
@@ -202,8 +210,8 @@ export async function queryDataSummaryByPeriod(
   }
 
   orderByPeriod.map(orderBy => {
-    const { sort, order } = orderBy
-    queryBuilder.orderBy(sort, order)
+    const { name: sort, desc } = orderBy
+    queryBuilder.addOrderBy(sort, desc ? 'DESC' : 'ASC')
   })
 
   const items = await queryBuilder.getRawMany()

package/server/service/data-summary/data-summary-type.ts

@@ -27,12 +27,6 @@ export class DataSummaryPatch {
 
 @ObjectType()
 export class DynamicDataSummary {
-  @Field({ nullable: true })
-  name?: string
-
-  @Field({ nullable: true })
-  description?: string
-
   @Field({ nullable: true })
   month?: string = ''