@things-factory/dataset 6.0.92 → 6.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.92",
+  "version": "6.0.94",
   "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": "6b20d32f29809cd6c99fd22296f809816a6c954d"
+  "gitHead": "87ca0acbca2c5b70a2b1961711b9078f2b824324"
 }

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 { Filter, getQueryBuilderFromListParams, getRepository } from '@things-factory/shell'
 
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 
@@ -57,7 +57,8 @@ export async function queryDataSummaryByPeriod(
   period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
   dataSetName: string,
   dataKeys: string[] | null,
-  params: ListParam,
+  filters: Filter[] | null,
+  desc: boolean = false,
   context: ResolverContext
 ): Promise<DataSummary[]> {
   const { domain, user, tx } = context.state
@@ -150,7 +151,7 @@ export async function queryDataSummaryByPeriod(
     period == 'today'
       ? 'summary.date, summary.period'
       : ['this year', '12 months'].includes(period)
-      ? 'month'
+      ? 'SUBSTRING(summary.date, 1, 7)'
       : 'summary.date'
   const groupByKeys = dataKeyItems
     .map((item, index) => {
@@ -163,27 +164,25 @@ export async function queryDataSummaryByPeriod(
       ? [
           {
             sort: 'summary.date',
-            order: 'DESC'
+            order: desc ? 'DESC' : 'ASC'
           },
           {
             sort: 'summary.period',
-            order: 'DESC'
+            order: desc ? 'DESC' : 'ASC'
           }
         ]
       : ['this year', '12 months'].includes(period)
-      ? [{ sort: 'month', order: 'DESC' }]
-      : [{ sort: 'summary.date', order: 'DESC' }]
+      ? [{ sort: 'month', order: desc ? 'DESC' : 'ASC' }]
+      : [{ sort: 'summary.date', order: desc ? 'DESC' : 'ASC' }]
 
   var queryBuilder = getQueryBuilderFromListParams({
     repository: getRepository(DataSummary),
-    params,
+    params: { filters },
     domain,
     alias: 'summary',
-    searchables: ['name', 'description'].concat(searchables)
+    searchables: searchables
   })
     .select('summary.dataSet')
-    .addSelect('ds.name', 'name')
-    .addSelect('ds.description', 'description')
     .addSelect(selectData)
     .addSelect('SUM(summary.count)', 'count')
     .addSelect('SUM(summary.countOoc)', 'countOoc')
@@ -197,8 +196,6 @@ export async function queryDataSummaryByPeriod(
     .andWhere('summary.date >= :from', { from })
     .andWhere('summary.date < :to', { to })
     .addGroupBy('summary.dataSet')
-    .addGroupBy('ds.name')
-    .addGroupBy('ds.description')
     .addGroupBy(groupByPeriod)
 
   if (dataKeyItems.length > 0) {
@@ -207,7 +204,7 @@ export async function queryDataSummaryByPeriod(
 
   orderByPeriod.map(orderBy => {
     const { sort, order } = orderBy
-    queryBuilder.addOrderBy(sort, order)
+    queryBuilder.orderBy(sort, order)
   })
 
   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, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { Domain, Filter, 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,10 +40,11 @@ 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,
-    @Args() params: ListParam,
+    @Arg('filters', type => [Filter], { nullable: true }) filters: Filter[] | null,
+    @Arg('desc', type => Boolean, { nullable: true }) desc: boolean,
     @Ctx() context: ResolverContext
   ): Promise<DynamicDataSummary[]> {
-    return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, context)
+    return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, filters, desc, context)
   }
 
   @Directive('@privilege(category: "data-summary", privilege: "query", domainOwnerGranted: true)')