@things-factory/dataset 8.0.0-alpha.29 → 8.0.0-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.0-alpha.29",
+  "version": "8.0.0-alpha.30",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -42,19 +42,19 @@
     "@operato/utils": "^8.0.0-alpha",
     "@things-factory/auth-base": "^8.0.0-alpha.29",
     "@things-factory/aws-base": "^8.0.0-alpha.29",
-    "@things-factory/board-service": "^8.0.0-alpha.29",
+    "@things-factory/board-service": "^8.0.0-alpha.30",
     "@things-factory/env": "^8.0.0-alpha.8",
-    "@things-factory/integration-base": "^8.0.0-alpha.29",
+    "@things-factory/integration-base": "^8.0.0-alpha.30",
     "@things-factory/organization": "^8.0.0-alpha.29",
     "@things-factory/personalization": "^8.0.0-alpha.29",
     "@things-factory/scheduler-client": "^8.0.0-alpha.29",
     "@things-factory/shell": "^8.0.0-alpha.29",
     "@things-factory/work-shift": "^8.0.0-alpha.29",
-    "@things-factory/worklist": "^8.0.0-alpha.29",
+    "@things-factory/worklist": "^8.0.0-alpha.30",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "a7592d7dc0886734d2798ee5756c51b0c0aa13fa"
+  "gitHead": "f01fac46630cf06e1697edc185dfb4cddcd61365"
 }

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

@@ -1,11 +1,20 @@
 import { In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
+import {
+  Activity,
+  ActivityInstance,
+  ActivityInstanceStatus,
+  UpdateActivityInstanceStateAddendum
+} from '@things-factory/worklist'
 import { NewDataSample } from 'service/data-sample/data-sample-type'
 import { createDataSample } from '../controllers/create-data-sample'
 
-async function callback(activityInstance: ActivityInstance, addendum: UpdateActivityInstanceStateAddendum, context: ResolverContext) {
+async function callback(
+  activityInstance: ActivityInstance,
+  addendum: UpdateActivityInstanceStateAddendum,
+  context: ResolverContext
+) {
   const { domain, tx } = context.state
   const { input, output, state } = activityInstance
 

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

@@ -1,10 +1,20 @@
 import { In } from 'typeorm'
-import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
+import {
+  Activity,
+  ActivityInstance,
+  ActivityInstanceStatus,
+  UpdateActivityInstanceStateAddendum
+} from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
+import { Role } from '@things-factory/auth-base'
 
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 
-async function callback(activityInstance: ActivityInstance, addendum: UpdateActivityInstanceStateAddendum, context: ResolverContext) {
+async function callback(
+  activityInstance: ActivityInstance,
+  addendum: UpdateActivityInstanceStateAddendum,
+  context: ResolverContext
+) {
   const { domain, user, tx } = context.state
   const { input, output, state, terminatedAt } = activityInstance
   const { causedBy } = addendum || {}
@@ -28,7 +38,7 @@ async function callback(activityInstance: ActivityInstance, addendum: UpdateActi
       })
 
       const dataSet = dataOoc.dataSet
-      const { assignees, outlierApprovalLine } = dataSet
+      const { resolverRoleId, outlierApprovalLine } = dataSet
 
       /* dataOoc Review 결과를 dataOoc 엔티티에 반영한다. */
       dataOoc = await tx.getRepository(DataOoc).save({
@@ -39,8 +49,15 @@ async function callback(activityInstance: ActivityInstance, addendum: UpdateActi
         state: DataOocStatus.REVIEWED
       })
 
-      /* 해당 dataset의 작업 담당자(assignees)에게 OOC 해결을 위한 태스크를 지시한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
+      const assigneeRole =
+        resolverRoleId &&
+        (await tx.getRepository(Role).findOneBy({
+          domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
+          id: resolverRoleId
+        }))
+
+      /* 해당 dataset의 작업 담당자(resolverRole)에게 OOC 해결을 위한 태스크를 지시한다. */
+      if (assigneeRole) {
         const activityInstance = {
           name: `[OOC 조치] ${dataSet.name}`,
           description: dataSet.description,
@@ -50,14 +67,18 @@ async function callback(activityInstance: ActivityInstance, addendum: UpdateActi
             dataOocId,
             instruction: correctiveInstruction
           },
-          assignees,
+          assigneeRole,
+          threadsMin: 1,
+          threadsMax: 1,
           approvalLine: outlierApprovalLine
         }
 
         dataOoc.resolveActivityInstance = await issue(activityInstance, context)
         await tx.getRepository(DataOoc).save(dataOoc)
       } else {
-        console.error(`Assignees are not set. So, Data OOC Resolve task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
+        console.error(
+          `Assignees are not set. So, Data OOC Resolve task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`
+        )
       }
     } else {
       console.error('OOC Resolve Activity not installed.')

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

@@ -260,17 +260,19 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     })) as Activity
 
     if (activity) {
-      const assignee =
+      const assigneeRole =
         dataSet.supervisoryRoleId &&
         (await tx.getRepository(Role).findOneBy({
           domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
           id: dataSet.supervisoryRoleId
         }))
 
-      const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
+      // const assignees = dataSet.supervisoryRoleId
+      //   ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assigneeRole }]
+      //   : []
 
       /* 해당 dataset의 supervisor로 하여금, OOC를 리뷰하고 instruction을 작성해서, OOC 해결을 위한 태스크를 dataset assignees에게 지시하도록 한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
+      if (assigneeRole) {
         const activityInstance = {
           name: `[OOC 검토] ${dataSet.name}`,
           description: dataSet.description,
@@ -279,7 +281,9 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           input: {
             dataOocId: dataOoc.id
           },
-          assignees,
+          assigneeRole,
+          threadsMin: 1,
+          threadsMax: 1,
           approvalLine: []
         }
 
@@ -362,19 +366,19 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
       })) as Activity
 
       if (activity) {
-        const assignee =
+        const assigneeRole =
           dataSet.supervisoryRoleId &&
           (await tx.getRepository(Role).findOneBy({
             domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
             id: dataSet.supervisoryRoleId
           }))
 
-        const assignees = dataSet.supervisoryRoleId
-          ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }]
-          : []
+        // const assignees = dataSet.supervisoryRoleId
+        //   ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assigneeRole }]
+        //   : []
 
         /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
-        if (assignees && assignees instanceof Array && assignees.length > 0) {
+        if (assigneeRole) {
           dataSample.dataItems = dataItems
           const activityInstance = {
             name: `[Data 검토] ${dataSet.name}`,
@@ -384,7 +388,9 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             input: {
               dataSampleId: dataSample.id
             },
-            assignees,
+            assigneeRole,
+            threadsMin: 1,
+            threadsMax: 1,
             approvalLine: dataSet.reviewApprovalLine
           }
 

package/server/controllers/issue-data-collection-task.ts

@@ -36,10 +36,10 @@ export async function issueDataCollectionTask(
     if (activity) {
       const { entryRole } = dataSet
 
-      const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
+      // const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
 
       /* 해당 dataset에 대한 데이타 수집 태스크를 dataset entryRole에게 할당한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
+      if (entryRole) {
         const activityInstance = {
           name: `[Data 수집] ${dataSet.name}`,
           description: dataSet.description,
@@ -49,7 +49,9 @@ export async function issueDataCollectionTask(
             dataSetId: dataSet.id,
             dataSetName: dataSet.name
           },
-          assignees
+          assigneeRole: entryRole,
+          threadsMin: 1,
+          threadsMax: 1
         }
 
         context.state = {

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

@@ -6,7 +6,6 @@ import { User } from '@things-factory/auth-base'
 import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
 import { Application, CallbackBase, registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
-import { Activity, AssigneeItem, issue } from '@things-factory/worklist'
 
 import { getDataFinalizeCrontabSchedule } from '../../controllers/finalize-data-collection'
 import { DataSet } from './data-set'
@@ -81,39 +80,6 @@ function getOutlierApprovalLineValue(patch: NewDataSet | DataSetPatch): Approval
     })
 }
 
-function getAssigneesValue(patch: NewDataSet | DataSetPatch): AssigneeItem[] {
-  const { assignees } = patch
-
-  if (!('assignees' in patch)) {
-    /* assignees이 언급되지 않았다면, 업데이트하지 않는다. */
-    return
-  }
-
-  if (!assignees || !(assignees instanceof Array)) {
-    /* assignees의 값이 없거나 배열이 아니라면, 클리어시킨다. */
-    return null
-  }
-
-  return assignees
-    .map(m => {
-      return {
-        type: m.type,
-        assignee: m.assignee
-      }
-    })
-    .filter(m => m.type)
-    .filter(m => {
-      switch (m.type) {
-        case OrgMemberTargetType.Employee:
-        case OrgMemberTargetType.Department:
-        case OrgMemberTargetType.Role:
-          return !!m.assignee?.id
-        default:
-          return true
-      }
-    })
-}
-
 @Resolver(DataSet)
 export class DataSetMutation {
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
@@ -126,7 +92,6 @@ export class DataSetMutation {
     const result = await dataSetRepo.save({
       ...dataSet,
       approvalLine: getApprovalLineValue(dataSet),
-      assignees: getAssigneesValue(dataSet),
       outlierApprovalLineValue: getOutlierApprovalLineValue(dataSet),
       version: 1,
       domain,
@@ -161,7 +126,6 @@ export class DataSetMutation {
       ...patch,
       approvalLine: getApprovalLineValue(patch),
       outlierApprovalLineValue: getOutlierApprovalLineValue(patch),
-      assignees: getAssigneesValue(patch),
       updater: user
     })
 
@@ -192,7 +156,6 @@ export class DataSetMutation {
         const result = await dataSetRepo.save({
           ...newRecord,
           approvalLine: getApprovalLineValue(newRecord),
-          assignees: getAssigneesValue(newRecord),
           outlierApprovalLineValue: getOutlierApprovalLineValue(newRecord),
           domain,
           creator: user,
@@ -223,7 +186,6 @@ export class DataSetMutation {
           ...updateRecord,
           approvalLine: getApprovalLineValue(updateRecord),
           outlierApprovalLineValue: getOutlierApprovalLineValue(updateRecord),
-          assignees: getAssigneesValue(updateRecord),
           updater: user
         })
 

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

@@ -184,6 +184,18 @@ export class DataSetQuery {
     )
   }
 
+  // 데이터셋의 resolver 역할을 조회
+  @FieldResolver(type => Role, { description: 'Retrieves the resolver role for the dataset' })
+  async resolverRole(@Root() dataSet: DataSet): Promise<Role> {
+    return (
+      dataSet.resolverRole ||
+      (dataSet.resolverRoleId &&
+        (await getRepository(Role).findOneBy({
+          id: dataSet.resolverRoleId
+        })))
+    )
+  }
+
   @FieldResolver(type => [AssigneeItem], { description: 'Retrieves the assignee items for the dataset' })
   async assignees(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<AssigneeItem[]> {
     const { domain, user } = context.state

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

@@ -29,8 +29,8 @@ export class NewDataSet {
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
-  @Field(type => ScalarObject, { nullable: true })
-  assignees?: AssigneeItem[]
+  @Field(type => ObjectRef, { nullable: true })
+  resolverRole?: ObjectRef
 
   @Field(type => ScalarObject, { nullable: true })
   reviewApprovalLine?: ApprovalLineItem[]
@@ -116,8 +116,8 @@ export class DataSetPatch {
   @Field(type => ObjectRef, { nullable: true })
   entryRole?: ObjectRef
 
-  @Field(type => ScalarObject, { nullable: true })
-  assignees?: AssigneeItem[]
+  @Field(type => ObjectRef, { nullable: true })
+  resolverRole?: ObjectRef
 
   @Field(type => ScalarObject, { nullable: true })
   reviewApprovalLine?: ApprovalLineItem[]

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

@@ -150,6 +150,16 @@ export class DataSet {
   @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)
   supervisoryRoleId?: string
 
+  @ManyToOne(type => Role, { nullable: true })
+  @Field(type => Role, {
+    nullable: true,
+    description: 'The final authority on resolving outlier related to that dataset.'
+  })
+  resolverRole?: Role
+
+  @RelationId((dataSet: DataSet) => dataSet.resolverRole)
+  resolverRoleId?: string
+
   @Column('simple-json', { nullable: true })
   @Field(type => [AssigneeItem], { nullable: true, description: 'Who to contact for OOC issues' })
   assignees?: AssigneeItem[]

package/translations/en.json

@@ -70,6 +70,7 @@
   "field.report-view": "report view",
   "field.request-params": "request parameters",
   "field.requires-review": "requires review",
+  "field.resolver-role": "resolver role",
   "field.review-approval-line": "review approval line",
   "field.role": "role",
   "field.serial-no": "serial #",

package/translations/ja.json

@@ -71,6 +71,7 @@
   "field.report-view": "レポート用画面",
   "field.request-params": "リクエスト パラメータ",
   "field.requires-review": "見直しが必要",
+  "field.resolver-role": "解決者役割",
   "field.review-approval-line": "決済ライン",
   "field.role": "ロール",
   "field.serial-no": "シリアル番号",

package/translations/ko.json

@@ -71,6 +71,7 @@
   "field.report-view": "리포트용 화면",
   "field.request-params": "요청 매개변수",
   "field.requires-review": "검토 요청",
+  "field.resolver-role": "해결자 역할",
   "field.review-approval-line": "결재라인",
   "field.role": "역할",
   "field.serial-no": "시리얼번호",

package/translations/ms.json

@@ -71,6 +71,7 @@
   "field.report-view": "paparan laporan",
   "field.request-params": "parameter permintaan",
   "field.requires-review": "memerlukan semakan",
+  "field.resolver-role": "peranan penyelesai",
   "field.review-approval-line": "baris kelulusan",
   "field.role": "peranan",
   "field.serial-no": "no. siri",

package/translations/zh.json

@@ -71,6 +71,7 @@
   "field.report-view": "报告界面",
   "field.request-params": "请求参数",
   "field.requires-review": "需要审查",
+  "field.resolver-role": "解决者角色",
   "field.review-approval-line": "审批线",
   "field.role": "角色",
   "field.serial-no": "序列号",