@things-factory/dataset 6.0.124 → 6.0.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.124",
+  "version": "6.0.125",
   "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.124",
-    "@things-factory/aws-base": "^6.0.124",
-    "@things-factory/board-service": "^6.0.124",
+    "@things-factory/auth-base": "^6.0.125",
+    "@things-factory/aws-base": "^6.0.125",
+    "@things-factory/board-service": "^6.0.125",
     "@things-factory/env": "^6.0.124",
-    "@things-factory/organization": "^6.0.124",
-    "@things-factory/scheduler-client": "^6.0.124",
-    "@things-factory/shell": "^6.0.124",
-    "@things-factory/work-shift": "^6.0.124",
-    "@things-factory/worklist": "^6.0.124",
+    "@things-factory/organization": "^6.0.125",
+    "@things-factory/scheduler-client": "^6.0.125",
+    "@things-factory/shell": "^6.0.125",
+    "@things-factory/work-shift": "^6.0.125",
+    "@things-factory/worklist": "^6.0.125",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "6841e3180fd0fb4ef7ee81c2a153cda80300e904"
+  "gitHead": "2d741c0c6ad8cf572560ac5bcc6fb7de470ede72"
 }

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

@@ -1,7 +1,13 @@
 import moment from 'moment-timezone'
 import { In } from 'typeorm'
 
-import { getQueryBuilderFromListParams, getRepository, ListParam, Sorting } from '@things-factory/shell'
+import {
+  getQueryBuilderFromListParams,
+  getRepository,
+  getTimesForPeriod,
+  ListParam,
+  Sorting
+} from '@things-factory/shell'
 
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 import { DataSummary } from '../service/data-summary/data-summary'
@@ -18,41 +24,6 @@ const STAT_FUNCTION_MAP = {
   mode: 'mode'
 }
 
-async function getTimesForPeriod(
-  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
-  context: ResolverContext
-): Promise<{ from: string; to: string }> {
-  const { domain } = context.state
-  const theDate = moment.tz(new Date(), domain.timezone)
-
-  if (period == 'today') {
-    const from = theDate.clone().format('YYYY-MM-DD')
-    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')
-
-    return { from, to }
-  } else if (period == 'this month') {
-    const from = theDate.clone().startOf('month').format('YYYY-MM-DD')
-    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')
-
-    return { from, to }
-  } else if (period == '30 days') {
-    const from = theDate.clone().subtract(30, 'day').format('YYYY-MM-DD')
-    const to = theDate.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD')
-
-    return { from, to }
-  } else if (period == 'this year') {
-    const from = theDate.clone().startOf('year').format('YYYY-MM-DD')
-    const to = theDate.clone().add(1, 'year').startOf('year').format('YYYY-MM-DD')
-
-    return { from, to }
-  } else if (period == '12 months') {
-    const from = theDate.clone().subtract(12, 'month').startOf('month').format('YYYY-MM-DD')
-    const to = theDate.clone().add(1, 'month').startOf('month').format('YYYY-MM-DD')
-
-    return { from, to }
-  }
-}
-
 export async function queryDataSummaryByPeriod(
   period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
   dataSetName: string,

package/server/service/data-sample/data-sample-query.ts

@@ -2,7 +2,13 @@ import { In } from 'typeorm'
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import {
+  Domain,
+  getQueryBuilderFromListParams,
+  getRepository,
+  getISOStringsForPeriod,
+  ListParam
+} from '@things-factory/shell'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSetHistory } from '../data-set-history/data-set-history'
@@ -104,6 +110,55 @@ export class DataSampleQuery {
     return { items, total }
   }
 
+  @Query(returns => DataSampleList, { description: 'To fetch multiple DataSamples by period' })
+  async dataSamplesByPeriod(
+    @Arg('period') period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
+    @Arg('dataSetName') dataSetName: string,
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSampleList> {
+    const { domain } = context.state
+    const { from, to } = await getISOStringsForPeriod(period, context)
+
+    const dataSet = await getRepository(DataSet).findOne({
+      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
+      relations: ['dataKeySet']
+    })
+
+    if (!dataSet) {
+      throw new Error(`dataSet not found by the given dataSetName(${dataSetName})`)
+    }
+
+    const { filters = [] } = params || {}
+    const alteredFilters = filters.concat([
+      {
+        name: 'collectedAt',
+        operator: 'between',
+        value: [from, to]
+      }
+    ])
+
+    const dataKeyItems = dataSet.dataKeySet?.dataKeyItems || []
+    const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSample),
+      params: {
+        ...params,
+        filters: alteredFilters
+      },
+      domain,
+      alias: 'sample',
+      searchables: ['name', 'description'].concat(searchables)
+    }).innerJoin('sample.dataSet', 'ds', 'ds.id = :dataSetId', {
+      dataSetId: dataSet.id
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
+  }
+
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSample: DataSample): Promise<DataItem[]> {
     const dataSetHistory: DataSetHistory =