@things-factory/dataset 6.2.33 → 6.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.33",
+  "version": "6.2.34",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -37,19 +37,19 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.2.33",
-    "@things-factory/aws-base": "^6.2.33",
-    "@things-factory/board-service": "^6.2.33",
+    "@things-factory/auth-base": "^6.2.34",
+    "@things-factory/aws-base": "^6.2.34",
+    "@things-factory/board-service": "^6.2.34",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/organization": "^6.2.33",
-    "@things-factory/scheduler-client": "^6.2.33",
-    "@things-factory/shell": "^6.2.33",
-    "@things-factory/work-shift": "^6.2.33",
-    "@things-factory/worklist": "^6.2.33",
+    "@things-factory/organization": "^6.2.34",
+    "@things-factory/scheduler-client": "^6.2.34",
+    "@things-factory/shell": "^6.2.34",
+    "@things-factory/work-shift": "^6.2.34",
+    "@things-factory/worklist": "^6.2.34",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "9fe5ab84786e99bc45027820fc50d3c5eca9600f"
+  "gitHead": "c1bf972f4b3b088638923bbf62badb572e1e6401"
 }

package/server/activities/{activity-data-collect-assign.ts → activity-data-review.ts}

@@ -1,49 +1,32 @@
-import { NewDataSample } from 'service/data-sample/data-sample-type'
-import { In } from 'typeorm'
+import { ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
 
-import {
-  Activity,
-  ActivityInstance,
-  ActivityInstanceStatus,
-  UpdateActivityInstanceStateAddendum
-} from '@things-factory/worklist'
-
-import { createDataSample } from '../controllers/create-data-sample'
+import { DataOocStatus } from '../service/data-ooc/data-ooc'
+import { DataSample } from '../service/data-sample/data-sample'
 
 async function callback(
   activityInstance: ActivityInstance,
   addendum: UpdateActivityInstanceStateAddendum,
   context: ResolverContext
 ) {
-  const { domain, tx } = context.state
+  const { domain, tx, user } = context.state
   const { input, output, state } = activityInstance
 
   if (state == ActivityInstanceStatus.Ended) {
-    const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
-      name: 'Collect Assign Data'
-    })) as Activity
-
-    const data = output
+    var dataSample = await tx.getRepository(DataSample).findOne({
+      where: { domain: { id: domain.id }, id: input?.dataSample?.id }
+    })
 
-    if (activity) {
-      const dataSample: NewDataSample = {
-        dataSet: {
-          id: input.dataSetId
-        },
-        data
-      }
-
-      await createDataSample(dataSample, context)
-    } else {
-      console.error('Collect Assign Data Activity not installed.')
-    }
+    dataSample = await tx.getRepository(DataSample).save({
+      ...dataSample,
+      output,
+      state: DataOocStatus.REVIEWED
+    })
   }
 }
 
-export const ActivityDataCollectAssign = {
-  name: 'Collect Assign Data',
-  description: 'Tasks assigned for data collection',
+export const ActivityDataReview = {
+  name: 'Data Review',
+  description: 'Tasks for data review',
   release: '1.0.0',
   provider: 'hatiolab.com',
   category: 'quality',
@@ -88,11 +71,11 @@ export const ActivityDataCollectAssign = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'activity-data-collect-assign-edit',
+  uiSource: 'activity-data-review-edit',
   viewType: 'custom-element',
-  viewSource: 'activity-data-collect-assign-view',
+  viewSource: 'activity-data-review-view',
   reportType: 'custom-element',
-  reportSource: 'activity-data-collect-assign-view',
+  reportSource: 'activity-data-review-view',
   thumbnail: '/assets/images/data-collect.png',
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

package/server/activities/activity-ooc-review.ts

@@ -36,7 +36,7 @@ async function callback(
       })
 
       const dataSet = dataOoc.dataSet
-      const { assignees, approvalLine, outlierApprovalLine } = dataSet
+      const { assignees, outlierApprovalLine } = dataSet
 
       /* dataOoc Review 결과를 dataOoc 엔티티에 반영한다. */
       dataOoc = await tx.getRepository(DataOoc).save({
@@ -59,8 +59,7 @@ async function callback(
             instruction: correctiveInstruction
           },
           assignees,
-          approvalLine,
-          outlierApprovalLine
+          approvalLine: outlierApprovalLine
         }
 
         await issue(activityInstance, context)

package/server/activities/index.ts

@@ -1,10 +1,11 @@
 import { ActivityInstallations } from '@things-factory/worklist'
 
-import { ActivityOocReview } from './activity-ooc-review'
-import { ActivityOocResolve } from './activity-ooc-resolve'
 import { ActivityDataCollect } from './activity-data-collect'
+import { ActivityDataReview } from './activity-data-review'
+import { ActivityOocResolve } from './activity-ooc-resolve'
+import { ActivityOocReview } from './activity-ooc-review'
 
 /* activity templates installation */
-;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect].forEach(template => {
+;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect, ActivityDataReview].forEach(template => {
   ActivityInstallations.installActivityTemplate(template)
 })

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

@@ -262,10 +262,10 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     } catch (err) {
       logger.error('Notification', err)
     }
-  } else {
+  } else if(dataSet.requiresReview) {
     const activity = (await tx.getRepository(Activity).findOneBy({
       domain: { id: domain.id },
-      name: 'Collect Assign Data'
+      name: 'Data Review'
     })) as Activity
 
     if (activity) {
@@ -279,7 +279,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         result.dataItems = dataItems
         const activityInstance = {
-          name: `[Data Collect 검토] ${dataSet.name}`,
+          name: `[Data 검토] ${dataSet.name}`,
           description: dataSet.description,
           activityId: activity.id,
           dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
@@ -294,11 +294,11 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
         await issue(activityInstance, context)
       } else {
         console.error(
-          `Assignees are not set. So Data Collect Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
+          `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
         )
       }
     } else {
-      console.error('Data Collect Review Activity not installed.')
+      console.error('Data Review Activity not installed.')
     }
 
     try {
@@ -311,8 +311,8 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
         notification: {
           domain,
           type: 'info',
-          title: `[Data Collect Review] ${dataSet.name}`,
-          body: `Data Collect Review occurred on '${dataSet.name}'`,
+          title: `[Data Review] ${dataSet.name}`,
+          body: `Data Review occurred on '${dataSet.name}'`,
           url: getRedirectSubdomainPath(context, domain.subdomain, `/data-set/${dataSet.id}`),
           timestamp: collectedAt
         }

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

@@ -13,19 +13,19 @@ import { DataSetPatch, NewDataSet } from './data-set-type'
 const crypto = require('crypto')
 
 function getApprovalLineValue(patch: NewDataSet | DataSetPatch): ApprovalLineItem[] {
-  const { approvalLine } = patch
+  const { reviewApprovalLine } = patch
 
-  if (!('approvalLine' in patch)) {
-    /* approvalLine이 언급되지 않았다면, 업데이트하지 않는다. */
+  if (!('reviewApprovalLine' in patch)) {
+    /* reviewApprovalLine 언급되지 않았다면, 업데이트하지 않는다. */
     return
   }
 
-  if (!approvalLine || !(approvalLine instanceof Array)) {
+  if (!reviewApprovalLine || !(reviewApprovalLine instanceof Array)) {
     /* approvalLine의 값이 없거나 배열이 아니라면, 클리어시킨다. */
     return null
   }
 
-  return approvalLine
+  return reviewApprovalLine
     .map(m => {
       return {
         type: m.type,

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

@@ -1,13 +1,12 @@
-import { In } from 'typeorm'
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { In } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
-import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
-import { Application, getSchedules } from '@things-factory/scheduler-client'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
@@ -203,15 +202,15 @@ export class DataSetQuery {
   @FieldResolver(type => [ApprovalLineItem])
   async approvalLine(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<ApprovalLineItem[]> {
     const { domain, user } = context.state
-    const { approvalLine } = dataSet
+    const { reviewApprovalLine } = dataSet
 
-    if (!approvalLine || !(approvalLine instanceof Array)) {
+    if (!reviewApprovalLine || !(reviewApprovalLine instanceof Array)) {
       return null
     }
 
     var approvalLineItems = []
 
-    for (let item of approvalLine) {
+    for (let item of reviewApprovalLine) {
       // "value" deprecated. to be removed
       var { type, approver, value } = item
       var id = approver?.id || value

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

@@ -30,7 +30,7 @@ export class NewDataSet {
   assignees?: AssigneeItem[]
 
   @Field(type => ScalarObject, { nullable: true })
-  approvalLine?: ApprovalLineItem[]
+  reviewApprovalLine?: ApprovalLineItem[]
 
   @Field(type => ScalarObject, { nullable: true })
   outlierApprovalLine?: ApprovalLineItem[]
@@ -56,6 +56,9 @@ export class NewDataSet {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  requiresReview?: boolean
+
   @Field({ nullable: true })
   entryType?: DataSetEntryType
 
@@ -105,7 +108,7 @@ export class DataSetPatch {
   assignees?: AssigneeItem[]
 
   @Field(type => ScalarObject, { nullable: true })
-  approvalLine?: ApprovalLineItem[]
+  reviewApprovalLine?: ApprovalLineItem[]
 
   @Field(type => ScalarObject, { nullable: true })
   outlierApprovalLine?: ApprovalLineItem[]
@@ -131,6 +134,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  requiresReview?: boolean
+
   @Field({ nullable: true })
   entryType?: DataSetEntryType
 

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

@@ -154,7 +154,7 @@ export class DataSet {
     nullable: true,
     description: 'Approval line for confrim of the dataset'
   })
-  approvalLine?: ApprovalLineItem[]
+  reviewApprovalLine?: ApprovalLineItem[]
 
   @Column('simple-json', { nullable: true })
   @Field(type => [ApprovalLineItem], {
@@ -214,6 +214,10 @@ export class DataSet {
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  requiresReview?: boolean
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   scheduleId?: string

package/translations/en.json

@@ -1,13 +1,11 @@
 {
-  "label.group-by data-keys": "group by each data-keys",
   "button.corrected": "corrected",
   "button.request-archive": "request archive",
   "button.reviewed": "reviewed",
   "error.dataset not found": "Cannot find dataSet with the given name({dataSetName})",
   "error.summary not supported": "The given dataSet({dataSetName}) does not support reports for {period}",
   "field.appliance": "appliance",
-  "field.approval-line": "approval line",
-  "field.outlier-approval-line": "outlier approval line",
+  "field.review-approval-line": "review approval line",
   "field.assignees": "assignees",
   "field.collected-at": "collected at",
   "field.corrected-at": "corrected at",
@@ -49,6 +47,8 @@
   "field.ooc": "out of control limit",
   "field.oos": "out of critical limit",
   "field.options": "options",
+  "field.outlier-approval-line": "outlier approval line",
+  "field.requires-review": "requires review",
   "field.partition-keys": "partition keys",
   "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
@@ -78,6 +78,7 @@
   "label.critical-limits": "critical limits",
   "label.data-set-type": "type",
   "label.end-date": "end date",
+  "label.group-by data-keys": "group by each data-keys",
   "label.maximum value": "maximum value",
   "label.minimum value": "minimum value",
   "label.pass-limits": "pass limits",

package/translations/ja.json

@@ -5,8 +5,7 @@
   "error.dataset not found": "指定された名前の({dataSetName})データセットが見つかりません",
   "error.summary not supported": "指定されたデータセット({dataSetName})は{period}のレポートに対応していません",
   "field.appliance": "アプライアンス",
-  "field.approval-line": "決済ライン",
-  "field.outlier-approval-line": "異常承認ライン",
+  "field.review-approval-line": "決済ライン",
   "field.assignees": "譲渡人リスト",
   "field.collected-at": "取集日時",
   "field.corrected-at": "措置時間",
@@ -48,6 +47,8 @@
   "field.ooc": "管理限界離脱有無",
   "field.oos": "許容限界離脱有無",
   "field.options": "選択オプション",
+  "field.outlier-approval-line": "異常承認ライン",
+  "field.requires-review": "見直しが必要",
   "field.partition-keys": "パーティション キー",
   "field.prev-schedule": "以前の収集計画",
   "field.quota": "サンプル数",

package/translations/ko.json

@@ -5,8 +5,7 @@
   "error.dataset not found": "주어진 이름의({dataSetName}) dataSet을 찾을 수 없습니다",
   "error.summary not supported": "주어진 dataSet({dataSetName})은 {period}의 레포트가 지원되지 않습니다",
   "field.appliance": "어플라이언스",
-  "field.approval-line": "결재라인",
-  "field.outlier-approval-line": "이상치 결재라인",
+  "field.review-approval-line": "결재라인",
   "field.assignees": "할당자 목록",
   "field.collected-at": "수집일시",
   "field.corrected-at": "조치 시간",
@@ -48,6 +47,8 @@
   "field.ooc": "관리한계 이탈여부",
   "field.oos": "허용한계 이탈여부",
   "field.options": "선택옵션",
+  "field.outlier-approval-line": "이상치 결재라인",
+  "field.requires-review": "검토 요청",
   "field.partition-keys": "파티션 키",
   "field.prev-schedule": "이전 수집계획",
   "field.quota": "샘플수",