@things-factory/dataset 6.0.91 → 6.0.93

package/package.json

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

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

@@ -5,7 +5,6 @@ import { getQueryBuilderFromListParams, getRepository, ListParam } from '@things
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 
 import { DataSummary } from '../service/data-summary/data-summary'
-import { DataSummaryList } from '../service/data-summary/data-summary-type'
 
 const STAT_FUNCTION_MAP = {
   sum: 'sum',
@@ -57,6 +56,7 @@ async function getTimesForPeriod(
 export async function queryDataSummaryByPeriod(
   period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
   dataSetName: string,
+  dataKeys: string[] | null,
   params: ListParam,
   context: ResolverContext
 ): Promise<DataSummary[]> {
@@ -80,7 +80,19 @@ export async function queryDataSummaryByPeriod(
     throw new Error(`given dataSet(${dataSetName}) is not allowed for getting summary for ${period}`)
   }
 
-  const dataKeyItems = dataSet.dataKeySet?.dataKeyItems || []
+  // dataKeys 가 설정되지 않았다면, dataSet의 dataKeySet을 그대로 적용한다는 의미임.
+  // dataKeys == [] 라면, dataKeySet을 적용하지 않는다는 의미임.
+  // dataKeys에는 dataKeySet의 dataKey 값을 따라야 한다.
+  const dataKeyItems = !dataSet.dataKeySet?.dataKeyItems
+    ? []
+    : dataKeys
+    ? dataKeys
+        .map(dataKey => {
+          return dataSet.dataKeySet.dataKeyItems.find(item => item.dataKey == dataKey)
+        })
+        .filter(Boolean)
+    : dataSet.dataKeySet.dataKeyItems
+
   const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)
   const dataItems = dataSet.dataItems.filter(item => item.stat)
 
@@ -138,7 +150,7 @@ export async function queryDataSummaryByPeriod(
     period == 'today'
       ? 'summary.date, summary.period'
       : ['this year', '12 months'].includes(period)
-      ? 'month, summary.date'
+      ? 'SUBSTRING(summary.date, 1, 7)'
       : 'summary.date'
   const groupByKeys = dataKeyItems
     .map((item, index) => {
@@ -162,23 +174,20 @@ export async function queryDataSummaryByPeriod(
       ? [{ sort: 'month', order: 'DESC' }]
       : [{ sort: 'summary.date', order: 'DESC' }]
 
-  const queryBuilder = getQueryBuilderFromListParams({
+  var queryBuilder = getQueryBuilderFromListParams({
     repository: getRepository(DataSummary),
     params,
     domain,
     alias: 'summary',
-    searchables: ['name', 'description'].concat(searchables)
+    searchables: searchables
   })
     .select('summary.dataSet')
-    .addSelect('ds.name', 'name')
-    .addSelect('ds.description', 'description')
-    .addSelect(selectKeys)
     .addSelect(selectData)
     .addSelect('SUM(summary.count)', 'count')
     .addSelect('SUM(summary.countOoc)', 'countOoc')
     .addSelect('SUM(summary.countOos)', 'countOos')
 
-  selectPeriod(queryBuilder)
+  queryBuilder = selectPeriod(queryBuilder)
     .innerJoin('summary.dataSet', 'ds', 'ds.id = :dataSetName', {
       dataSetName: dataSet.id
     })
@@ -186,14 +195,15 @@ 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)
-    .addGroupBy(groupByKeys)
+
+  if (dataKeyItems.length > 0) {
+    queryBuilder.addSelect(selectKeys).addGroupBy(groupByKeys)
+  }
 
   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

@@ -39,10 +39,11 @@ export class DataSummaryQuery {
   async dataSummaryByPeriod(
     @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,
     @Ctx() context: ResolverContext
   ): Promise<DynamicDataSummary[]> {
-    return await queryDataSummaryByPeriod(period, dataSetName, params, context)
+    return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, context)
   }
 
   @Directive('@privilege(category: "data-summary", privilege: "query", domainOwnerGranted: true)')