@things-factory/dataset 5.0.0-alpha.34 → 5.0.0-alpha.37

package/server/controllers/create-data-sample.ts

@@ -77,19 +77,21 @@ export async function createDataSample(
   }, {})
 
   const collectedAt = dataSample.collectedAt || new Date()
-  // workDate ex) 2022-04-04
-  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
 
-  const dateFormat = 'YYYY-MM-DD'
+  const timezone = dataSet.timezone || domain.timezone || 'UTC'
+  const format = 'YYYY-MM-DD'
+
+  // workDate ex) 2022-04-04
+  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })
+  
   // local time dataSet timezone or domain timezone or default 'UTC'
-  const timezone = dataSet['timezone'] || domain['timezone'] || 'UTC'
   
   // const collectedAt = dataSample.collectedAt || new Date()
   const localDateTz = moment(collectedAt).tz(timezone)
   const defaultPartitionKeys = {
     domain: domain.subdomain,
     datasetid: dataSample.dataSet.id, /* It should not be 'data_set_id' as column name duplicated for Glue */
-    date: localDateTz.format(dateFormat), /* local time date */
+    date: localDateTz.format(format), /* local time date */
     workdate: workDate, /* working date */
     workshift: workShift
   }

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

@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataSet } from '../data-set/data-set'
 import { DataItem } from './data-item'
@@ -25,8 +25,14 @@ export class DataItemQuery {
   async dataItems(@Args() params: ListParam, @Ctx() context: any): Promise<DataItemList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataItem).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataItem),
+      params,
+      domain,
+      alias: 'dataitem'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }

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

@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataSample } from '../data-sample/data-sample'
 import { DataSet } from '../data-set/data-set'
@@ -26,8 +26,14 @@ export class DataOocQuery {
   async dataOocs(@Args() params: ListParam, @Ctx() context: any): Promise<DataOocList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataOoc).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataOoc),
+      params,
+      domain,
+      alias: 'dataooc'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }

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

@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from
 import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataSet } from '../data-set/data-set'
 import { DataSample } from './data-sample'
@@ -25,8 +25,14 @@ export class DataSampleQuery {
   async dataSamples(@Args() params: ListParam, @Ctx() context: any): Promise<DataSampleList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataSample).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSample),
+      params,
+      domain,
+      alias: 'datasample'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }

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

@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
 import { getRepository } from 'typeorm'
 
 import { Appliance, User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataSet } from '../data-set/data-set'
 import { DataSensor } from './data-sensor'
@@ -23,8 +23,14 @@ export class DataSensorQuery {
   async dataSensors(@Args() params: ListParam, @Ctx() context: any): Promise<DataSensorList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataSensor).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSensor),
+      params,
+      domain,
+      alias: 'datasensor'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }

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

@@ -1,9 +1,9 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Equal, getRepository } from 'typeorm'
+import { getRepository } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
 import { DataSample } from '../data-sample/data-sample'
@@ -29,47 +29,67 @@ export class DataSetQuery {
   async dataSets(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataSet).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
   async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
-    const { domain } = context.state
+    var { domain, user } = context.state
 
-    /* TODO. 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
-
-    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
-    where.active = Equal(true)
+    /* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
+    user = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
-    const [items, total] = await getRepository(DataSet).findAndCount({
-      where,
-      order,
-      skip,
-      take
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
     })
 
+    queryBuilder.andWhere(`dataset.active = :active`, { active: true })
+    queryBuilder.andWhere(`dataset.entry_role_id IN (:...roles)`, { roles })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
     return { items, total }
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
   async dataSetsForReport(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
-    const { domain } = context.state
-
-    /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+    var { domain, user } = context.state
 
-    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
-    where.active = Equal(true)
+    /* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+    user = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
-    const [items, total] = await getRepository(DataSet).findAndCount({
-      where,
-      order,
-      skip,
-      take
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
     })
 
+    queryBuilder.andWhere(`dataset.active = :active`, { active: true })
+    queryBuilder.andWhere(`dataset.supervisory_role_id IN (:...roles)`, { roles })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
     return { items, total }
   }
 
@@ -136,14 +156,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domainId, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || ((await getRepository(Domain).findOne(domainId)) as Domain).timezone || 'UTC'
     })
 
     return interval.next().toDate()
@@ -151,14 +171,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domainId, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || ((await getRepository(Domain).findOne(domainId)) as Domain).timezone || 'UTC'
     })
 
     return interval.prev().toDate()

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

@@ -75,6 +75,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   active?: boolean
 
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+
   @Field({ nullable: true })
   useCase?: string
 

package/translations/en.json

@@ -38,8 +38,16 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "title.data-entry-form": "data entry form",
   "title.data-entry list": "data entry list",
   "title.data-item list": "data item list",

package/translations/ko.json

@@ -38,8 +38,16 @@
   "field.use-case": "사용 사례",
   "field.work-date": "작업기준일",
   "field.work-shift": "교대근무조",
+  "label.acceptables": "허용값",
+  "label.critical limits": "허용 한계범위",
+  "label.minimum value": "최소값",
+  "label.maximum value": "최대값",
+  "label.pass limits": "통과 허용범위",
+  "label.target limits": "관리 목표범위",
+  "text.automatically collected": "자동 수집",
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
+  "text.manually collected": "수동 수집",
   "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
   "title.data-monitor-view": "데이타 모니터",

package/translations/ms.json

@@ -38,8 +38,16 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-monitor-view": "data monitor view",

package/translations/zh.json

@@ -38,8 +38,16 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-monitor-view": "data monitor view",