@things-factory/dataset 6.0.94 → 6.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.94",
+  "version": "6.0.96",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,19 +36,19 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.0.91",
-    "@things-factory/aws-base": "^6.0.91",
-    "@things-factory/board-service": "^6.0.91",
-    "@things-factory/env": "^6.0.91",
-    "@things-factory/organization": "^6.0.91",
-    "@things-factory/scheduler-client": "^6.0.91",
-    "@things-factory/shell": "^6.0.91",
-    "@things-factory/work-shift": "^6.0.91",
-    "@things-factory/worklist": "^6.0.91",
+    "@things-factory/auth-base": "^6.0.96",
+    "@things-factory/aws-base": "^6.0.96",
+    "@things-factory/board-service": "^6.0.96",
+    "@things-factory/env": "^6.0.96",
+    "@things-factory/organization": "^6.0.96",
+    "@things-factory/scheduler-client": "^6.0.96",
+    "@things-factory/shell": "^6.0.96",
+    "@things-factory/work-shift": "^6.0.96",
+    "@things-factory/worklist": "^6.0.96",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "87ca0acbca2c5b70a2b1961711b9078f2b824324"
+  "gitHead": "a9733ed107c937d32f5aa0af67daca582e93d0c6"
 }

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

@@ -1,6 +1,6 @@
 import moment from 'moment-timezone'
 
-import { Filter, getQueryBuilderFromListParams, getRepository } from '@things-factory/shell'
+import { getQueryBuilderFromListParams, getRepository, ListParam, Sorting } from '@things-factory/shell'
 
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 
@@ -57,8 +57,7 @@ export async function queryDataSummaryByPeriod(
   period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
   dataSetName: string,
   dataKeys: string[] | null,
-  filters: Filter[] | null,
-  desc: boolean = false,
+  params: ListParam,
   context: ResolverContext
 ): Promise<DataSummary[]> {
   const { domain, user, tx } = context.state
@@ -159,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 ? 'DESC' : 'ASC'
+            name: 'date',
+            desc
           },
           {
-            sort: 'summary.period',
-            order: desc ? 'DESC' : 'ASC'
+            name: 'period',
+            desc
           }
         ]
       : ['this year', '12 months'].includes(period)
-      ? [{ sort: 'month', order: desc ? 'DESC' : 'ASC' }]
-      : [{ sort: 'summary.date', order: desc ? 'DESC' : 'ASC' }]
+      ? [{ name: 'month', desc }]
+      : [{ name: 'date', desc }]
+
+  if (params?.sortings && params.sortings.length > 0) {
+    orderByPeriod = params.sortings
+  }
 
   var queryBuilder = getQueryBuilderFromListParams({
     repository: getRepository(DataSummary),
-    params: { filters },
+    params: {
+      ...params,
+      sortings: []
+    },
     domain,
     alias: 'summary',
     searchables: searchables
@@ -203,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-query.ts

@@ -1,5 +1,5 @@
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
-import { Domain, Filter, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from '../data-set/data-item-type'
@@ -40,11 +40,10 @@ export class DataSummaryQuery {
     @Arg('period') period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
     @Arg('dataSetName') dataSetName: string,
     @Arg('dataKeys', type => [String], { nullable: true }) dataKeys: string[] | null,
-    @Arg('filters', type => [Filter], { nullable: true }) filters: Filter[] | null,
-    @Arg('desc', type => Boolean, { nullable: true }) desc: boolean,
+    @Args() params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DynamicDataSummary[]> {
-    return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, filters, desc, context)
+    return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, context)
   }
 
   @Directive('@privilege(category: "data-summary", privilege: "query", domainOwnerGranted: true)')

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 = ''