@things-factory/dataset 5.0.0-alpha.33 → 5.0.0-alpha.36

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,27 +29,66 @@ 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
+
+    /* 조회한 사용자가 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 queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
+    })
 
-    /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+    queryBuilder.andWhere(`dataset.active = :active`, { active: true })
+    queryBuilder.andWhere(`dataset.entry_role_id IN (:...roles)`, { roles })
 
-    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
-    where.active = Equal(true)
+    const [items, total] = await queryBuilder.getManyAndCount()
 
-    const [items, total] = await getRepository(DataSet).findAndCount({
-      where,
-      order,
-      skip,
-      take
+    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> {
+    var { domain, user } = context.state
+
+    /* 조회한 사용자가 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 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 }
   }
@@ -117,14 +156,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domain, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || domain.timezone || 'UTC'
     })
 
     return interval.next().toDate()
@@ -132,14 +171,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domain, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || domain.timezone || 'UTC'
     })
 
     return interval.prev().toDate()

package/things-factory.config.js

@@ -23,6 +23,10 @@ export default {
     {
       tagname: 'data-entry-list-page',
       page: 'data-entry-list'
+    },
+    {
+      tagname: 'data-report-list-page',
+      page: 'data-report-list'
     }
   ],
   bootstrap

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",

package/yarn-error.log

@@ -1176,7 +1176,7 @@ Lockfile:
       "@babel/types" "^7.17.0"
       convert-source-map "^1.7.0"
       debug "^4.1.0"
-      gensync "^1.0.0-beta.2"
+      gensync "^1.0.0-beta.4"
       json5 "^2.1.2"
       semver "^6.3.0"
   
@@ -11884,9 +11884,9 @@ Lockfile:
     resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
     integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
   
-  gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
-    version "1.0.0-beta.2"
-    resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.4:
+    version "1.0.0-beta.4"
+    resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.4.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
     integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
   
   get-caller-file@^1.0.1: