@things-factory/dataset 6.2.29 → 6.2.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.29",
+  "version": "6.2.31",
   "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.27",
-    "@things-factory/aws-base": "^6.2.27",
-    "@things-factory/board-service": "^6.2.27",
+    "@things-factory/auth-base": "^6.2.31",
+    "@things-factory/aws-base": "^6.2.31",
+    "@things-factory/board-service": "^6.2.31",
     "@things-factory/env": "^6.2.27",
-    "@things-factory/organization": "^6.2.27",
-    "@things-factory/scheduler-client": "^6.2.27",
-    "@things-factory/shell": "^6.2.27",
-    "@things-factory/work-shift": "^6.2.27",
-    "@things-factory/worklist": "^6.2.27",
+    "@things-factory/organization": "^6.2.31",
+    "@things-factory/scheduler-client": "^6.2.31",
+    "@things-factory/shell": "^6.2.31",
+    "@things-factory/work-shift": "^6.2.31",
+    "@things-factory/worklist": "^6.2.31",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "4c35448744c3fd288a014a4f9923004797bf4724"
+  "gitHead": "0e904fde521867b12fb95fc24f98ca5e6bd53e6e"
 }

package/server/activities/activity-data-collect-assign.ts

@@ -0,0 +1,98 @@
+import { NewDataSample } from 'service/data-sample/data-sample-type'
+import { In } from 'typeorm'
+
+import {
+  Activity,
+  ActivityInstance,
+  ActivityInstanceStatus,
+  UpdateActivityInstanceStateAddendum
+} from '@things-factory/worklist'
+
+import { createDataSample } from '../controllers/create-data-sample'
+
+async function callback(
+  activityInstance: ActivityInstance,
+  addendum: UpdateActivityInstanceStateAddendum,
+  context: ResolverContext
+) {
+  const { domain, tx } = 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
+
+    if (activity) {
+      const dataSample: NewDataSample = {
+        dataSet: {
+          id: input.dataSetId
+        },
+        data
+      }
+
+      await createDataSample(dataSample, context)
+    } else {
+      console.error('Collect Assign Data Activity not installed.')
+    }
+  }
+}
+
+export const ActivityDataCollectAssign = {
+  name: 'Collect Assign Data',
+  description: 'Tasks assigned for data collection',
+  release: '1.0.0',
+  provider: 'hatiolab.com',
+  category: 'quality',
+  activityType: 'user',
+  priority: 1,
+  searchKeys: [
+    {
+      name: 'dataSetName',
+      description: 'DataSet name',
+      inputKey: 'dataSetName',
+      tKey: 'data-set-name'
+    }
+  ],
+  startingType: '',
+  multiple: 'single',
+  model: [
+    {
+      name: 'dataSetId',
+      description: 'DataSet Id.',
+      tag: 'dataSetId',
+      hidden: true,
+      mandatory: true,
+      inout: 'in',
+      type: 'string',
+      options: {},
+      unit: null,
+      quantifier: [1],
+      spec: {}
+    },
+    {
+      name: 'dataSetName',
+      description: 'DataSet name',
+      tag: 'dataSetName',
+      hidden: true,
+      mandatory: true,
+      inout: 'in',
+      type: 'string',
+      options: {},
+      unit: null,
+      quantifier: [1],
+      spec: {}
+    }
+  ],
+  uiType: 'custom-element',
+  uiSource: 'activity-data-collect-assign-edit',
+  viewType: 'custom-element',
+  viewSource: 'activity-data-collect-assign-view',
+  reportType: 'custom-element',
+  reportSource: 'activity-data-collect-assign-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

@@ -2,10 +2,10 @@ import {
   Activity,
   ActivityInstance,
   ActivityInstanceStatus,
-  ActivityThread,
   UpdateActivityInstanceStateAddendum
 } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
+
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 
 async function callback(
@@ -36,7 +36,7 @@ async function callback(
       })
 
       const dataSet = dataOoc.dataSet
-      const { assignees, approvalLine } = dataSet
+      const { assignees, approvalLine, outlierApprovalLine } = dataSet
 
       /* dataOoc Review 결과를 dataOoc 엔티티에 반영한다. */
       dataOoc = await tx.getRepository(DataOoc).save({
@@ -59,7 +59,8 @@ async function callback(
             instruction: correctiveInstruction
           },
           assignees,
-          approvalLine
+          approvalLine,
+          outlierApprovalLine
         }
 
         await issue(activityInstance, context)

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

@@ -1,20 +1,19 @@
 import moment from 'moment-timezone'
 import { In } from 'typeorm'
 
+import { Attachment, createAttachment } from '@things-factory/attachment-base'
 import { Role } from '@things-factory/auth-base'
-import { getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 import { logger } from '@things-factory/env'
+import { getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
+import { Activity } from '@things-factory/worklist'
+import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 import { DataSample } from '../service/data-sample/data-sample'
 import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
-import { Activity } from '@things-factory/worklist'
-import { Attachment, createAttachment } from '@things-factory/attachment-base'
-
-import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
 // See README.md at ## Data Samples
 process.env.TZ = 'UTC'
@@ -230,7 +229,8 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
             dataOocId: dataOoc.id
           },
           assignees,
-          approvalLine: []
+          approvalLine: [],
+          outlierApprovalLine: []
         }
 
         await issue(activityInstance, context)
@@ -262,6 +262,64 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     } catch (err) {
       logger.error('Notification', err)
     }
+  } else {
+    const activity = (await tx.getRepository(Activity).findOneBy({
+      domain: { id: domain.id },
+      name: 'Collect Assign Data'
+    })) as Activity
+
+    if (activity) {
+      const assignee =
+        dataSet.supervisoryRoleId &&
+        (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+
+      const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
+
+      /* 해당 dataset의 supervisor로 하여금, OOC를 리뷰하고 instruction을 작성해서, OOC 해결을 위한 태스크를 dataset assignees에게 지시하도록 한다. */
+      if (assignees && assignees instanceof Array && assignees.length > 0) {
+        result.dataItems = dataItems
+        const activityInstance = {
+          name: `[Data Collect 검토] ${dataSet.name}`,
+          description: dataSet.description,
+          activityId: activity.id,
+          dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+          input: {
+            dataSample: result
+          },
+          assignees,
+          approvalLine: [],
+          outlierApprovalLine: []
+        }
+
+        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.`
+        )
+      }
+    } else {
+      console.error('Data Collect Review Activity not installed.')
+    }
+
+    try {
+      pubsub.publish('data-set', {
+        dataSet,
+        supervisoryRoleId: dataSet.supervisoryRoleId
+      })
+
+      pubsub.publish('notification', {
+        notification: {
+          domain,
+          type: 'info',
+          title: `[Data Collect Review] ${dataSet.name}`,
+          body: `Data Collect Review occurred on '${dataSet.name}'`,
+          url: getRedirectSubdomainPath(context, domain.subdomain, `/data-set/${dataSet.id}`),
+          timestamp: collectedAt
+        }
+      })
+    } catch (err) {
+      logger.error('Notification', err)
+    }
   }
 
   return result

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

@@ -2,13 +2,13 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
 import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
-import { Application, CallbackBase, registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
 import { ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
+import { Application, CallbackBase, registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
 import { AssigneeItem } from '@things-factory/worklist'
 
-import { DataSet, DataSetSummaryPeriodType } from './data-set'
-import { DataSetPatch, NewDataSet } from './data-set-type'
 import { getDataSummaryCrontabSchedule } from '../../controllers/generate-data-summary'
+import { DataSet } from './data-set'
+import { DataSetPatch, NewDataSet } from './data-set-type'
 
 const crypto = require('crypto')
 
@@ -45,6 +45,40 @@ function getApprovalLineValue(patch: NewDataSet | DataSetPatch): ApprovalLineIte
     })
 }
 
+function getOutlierApprovalLineValue(patch: NewDataSet | DataSetPatch): ApprovalLineItem[] {
+  const { outlierApprovalLine } = patch
+
+  if (!('outlierApprovalLine' in patch)) {
+    /* approvalLine이 언급되지 않았다면, 업데이트하지 않는다. */
+    return
+  }
+
+  if (!outlierApprovalLine || !(outlierApprovalLine instanceof Array)) {
+    /* approvalLine의 값이 없거나 배열이 아니라면, 클리어시킨다. */
+    return null
+  }
+
+  return outlierApprovalLine
+    .map(m => {
+      return {
+        type: m.type,
+        approver: m.approver
+      } as ApprovalLineItem
+    })
+    .filter(m => m.type)
+    .filter(m => {
+      switch (m.type) {
+        case OrgMemberTargetType.Employee:
+        case OrgMemberTargetType.Department:
+        case OrgMemberTargetType.Role:
+          return !!m.approver?.id
+        default:
+          return true
+      }
+    })
+}
+
+
 function getAssigneesValue(patch: NewDataSet | DataSetPatch): AssigneeItem[] {
   const { assignees } = patch
 
@@ -91,6 +125,7 @@ export class DataSetMutation {
       ...dataSet,
       approvalLine: getApprovalLineValue(dataSet),
       assignees: getAssigneesValue(dataSet),
+      outlierApprovalLineValue: getOutlierApprovalLineValue(dataSet),
       version: 1,
       domain,
       creator: user,
@@ -123,6 +158,7 @@ export class DataSetMutation {
       ...dataSet,
       ...patch,
       approvalLine: getApprovalLineValue(patch),
+      outlierApprovalLineValue: getOutlierApprovalLineValue(patch),
       assignees: getAssigneesValue(patch),
       updater: user
     })
@@ -155,6 +191,7 @@ export class DataSetMutation {
           ...newRecord,
           approvalLine: getApprovalLineValue(newRecord),
           assignees: getAssigneesValue(newRecord),
+          outlierApprovalLineValue: getOutlierApprovalLineValue(newRecord),
           domain,
           creator: user,
           updater: user
@@ -183,6 +220,7 @@ export class DataSetMutation {
           ...dataSet,
           ...updateRecord,
           approvalLine: getApprovalLineValue(updateRecord),
+          outlierApprovalLineValue: getOutlierApprovalLineValue(updateRecord),
           assignees: getAssigneesValue(updateRecord),
           updater: user
         })

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

@@ -2,8 +2,8 @@ import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
-import { ObjectRef, ScalarObject } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
+import { ObjectRef, ScalarObject } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
 
 import { DataItemPatch } from './data-item-type'
@@ -32,6 +32,9 @@ export class NewDataSet {
   @Field(type => ScalarObject, { nullable: true })
   approvalLine?: ApprovalLineItem[]
 
+  @Field(type => ScalarObject, { nullable: true })
+  outlierApprovalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   active?: boolean
 
@@ -104,6 +107,9 @@ export class DataSetPatch {
   @Field(type => ScalarObject, { nullable: true })
   approvalLine?: ApprovalLineItem[]
 
+  @Field(type => ScalarObject, { nullable: true })
+  outlierApprovalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   active?: boolean
 

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

@@ -12,8 +12,8 @@ import {
 } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
-import { Domain, ScalarObject } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
+import { Domain, ScalarObject } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
@@ -152,10 +152,17 @@ export class DataSet {
   @Column('simple-json', { nullable: true })
   @Field(type => [ApprovalLineItem], {
     nullable: true,
-    description: 'Approval line for handling OOC issues for that dataset'
+    description: 'Approval line for confrim of the dataset'
   })
   approvalLine?: ApprovalLineItem[]
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], {
+    nullable: true,
+    description: 'Approval line for handling OOC issues for that dataset'
+  })
+  outlierApprovalLine?: ApprovalLineItem[]
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string

package/translations/en.json

@@ -7,6 +7,7 @@
   "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.assignees": "assignees",
   "field.collected-at": "collected at",
   "field.corrected-at": "corrected at",

package/translations/ja.json

@@ -6,6 +6,7 @@
   "error.summary not supported": "指定されたデータセット({dataSetName})は{period}のレポートに対応していません",
   "field.appliance": "アプライアンス",
   "field.approval-line": "決済ライン",
+  "field.outlier-approval-line": "異常承認ライン",
   "field.assignees": "譲渡人リスト",
   "field.collected-at": "取集日時",
   "field.corrected-at": "措置時間",

package/translations/ko.json

@@ -6,6 +6,7 @@
   "error.summary not supported": "주어진 dataSet({dataSetName})은 {period}의 레포트가 지원되지 않습니다",
   "field.appliance": "어플라이언스",
   "field.approval-line": "결재라인",
+  "field.outlier-approval-line": "이상치 결재라인",
   "field.assignees": "할당자 목록",
   "field.collected-at": "수집일시",
   "field.corrected-at": "조치 시간",

package/translations/ms.json

@@ -6,6 +6,7 @@
   "error.summary not supported": "DataSet yang diberikan({dataSetName}) tidak menyokong laporan untuk {period}",
   "field.appliance": "appliance",
   "field.approval-line": "approval line",
+  "field.outlier-approval-line": "outlier approval line",
   "field.assignees": "assignees",
   "field.collected-at": "collected at",
   "field.corrected-at": "corrected at",

package/translations/zh.json

@@ -6,6 +6,7 @@
   "error.summary not supported": "给定的数据集({dataSetName})不支持{period}的报告",
   "field.appliance": "应用设备",
   "field.approval-line": "审批线",
+  "field.outlier-approval-line": "异常批准线",
   "field.assignees": "分配者列表",
   "field.collected-at": "收集时间",
   "field.corrected-at": "处理时间",