@things-factory/dataset 8.0.0-alpha.8 → 8.0.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.0-alpha.8",
+  "version": "8.0.0-beta.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,34 +27,34 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@operato/app": "^8.0.0-alpha",
-    "@operato/data-grist": "^8.0.0-alpha",
-    "@operato/dataset": "^8.0.0-alpha",
-    "@operato/ghost-print": "^8.0.0-alpha",
-    "@operato/graphql": "^8.0.0-alpha",
-    "@operato/grist-editor": "^8.0.0-alpha",
-    "@operato/i18n": "^8.0.0-alpha",
-    "@operato/layout": "^8.0.0-alpha",
-    "@operato/moment-timezone-es": "^8.0.0-alpha",
-    "@operato/p13n": "^8.0.0-alpha",
-    "@operato/shell": "^8.0.0-alpha",
-    "@operato/styles": "^8.0.0-alpha",
-    "@operato/utils": "^8.0.0-alpha",
-    "@things-factory/auth-base": "^8.0.0-alpha.8",
-    "@things-factory/aws-base": "^8.0.0-alpha.8",
-    "@things-factory/board-service": "^8.0.0-alpha.8",
-    "@things-factory/env": "^8.0.0-alpha.8",
-    "@things-factory/integration-base": "^8.0.0-alpha.8",
-    "@things-factory/organization": "^8.0.0-alpha.8",
-    "@things-factory/personalization": "^8.0.0-alpha.8",
-    "@things-factory/scheduler-client": "^8.0.0-alpha.8",
-    "@things-factory/shell": "^8.0.0-alpha.8",
-    "@things-factory/work-shift": "^8.0.0-alpha.8",
-    "@things-factory/worklist": "^8.0.0-alpha.8",
+    "@operato/app": "^8.0.0-beta",
+    "@operato/data-grist": "^8.0.0-beta",
+    "@operato/dataset": "^8.0.0-beta",
+    "@operato/ghost-print": "^8.0.0-beta",
+    "@operato/graphql": "^8.0.0-beta",
+    "@operato/grist-editor": "^8.0.0-beta",
+    "@operato/i18n": "^8.0.0-beta",
+    "@operato/layout": "^8.0.0-beta",
+    "@operato/moment-timezone-es": "^8.0.0-beta",
+    "@operato/p13n": "^8.0.0-beta",
+    "@operato/shell": "^8.0.0-beta",
+    "@operato/styles": "^8.0.0-beta",
+    "@operato/utils": "^8.0.0-beta",
+    "@things-factory/auth-base": "^8.0.0-beta.0",
+    "@things-factory/aws-base": "^8.0.0-beta.0",
+    "@things-factory/board-service": "^8.0.0-beta.0",
+    "@things-factory/env": "^8.0.0-beta.0",
+    "@things-factory/integration-base": "^8.0.0-beta.0",
+    "@things-factory/organization": "^8.0.0-beta.0",
+    "@things-factory/personalization": "^8.0.0-beta.0",
+    "@things-factory/scheduler-client": "^8.0.0-beta.0",
+    "@things-factory/shell": "^8.0.0-beta.0",
+    "@things-factory/work-shift": "^8.0.0-beta.0",
+    "@things-factory/worklist": "^8.0.0-beta.0",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "0a9fb3ab431934982294b58c743d01b6f782a15f"
+  "gitHead": "add6fb8224b2cb19cbea47bed6a5ecb0424c9a28"
 }

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
 
@@ -86,5 +95,6 @@ export const ActivityDataCollect = {
   reportType: 'custom-element',
   reportSource: 'activity-data-collect-view',
   thumbnail: '/assets/images/data-collect.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -3,7 +3,11 @@ import { ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAd
 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) {
+async function callback(
+  activityInstance: ActivityInstance,
+  addendum: UpdateActivityInstanceStateAddendum,
+  context: ResolverContext
+) {
   const { domain, tx, user } = context.state
   const { input, output, state } = activityInstance
 
@@ -73,5 +77,6 @@ export const ActivityDataReview = {
   reportType: 'custom-element',
   reportSource: 'activity-data-review-view',
   thumbnail: '/assets/images/data-collect.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -30,7 +30,7 @@ async function callback(
     const corrector = activityThreads[0]?.assignee
 
     const { dataOocId } = input
-    const correctiveAction = output.action
+    const correctiveAction = output?.action
 
     var dataOoc = await tx.getRepository(DataOoc).findOne({
       where: {
@@ -118,5 +118,6 @@ export const ActivityOocResolve = {
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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,25 +49,36 @@ 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,
           activityId: activity.id,
-          dueAt: new Date(terminatedAt.getTime() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(terminatedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             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.')
@@ -118,5 +139,6 @@ export const ActivityOocReview = {
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',
+  standardTime: 24 * 60 * 60, // seconds
   callback /* Called when there is a change in the lifecycle of a task (activity-instance). */
 }

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

@@ -260,26 +260,30 @@ 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,
           activityId: activity.id,
-          dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             dataOocId: dataOoc.id
           },
-          assignees,
+          assigneeRole,
+          threadsMin: 1,
+          threadsMax: 1,
           approvalLine: []
         }
 
@@ -362,29 +366,31 @@ 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}`,
             description: dataSet.description,
             activityId: activity.id,
-            dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
+            dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),
             input: {
               dataSampleId: dataSample.id
             },
-            assignees,
+            assigneeRole,
+            threadsMin: 1,
+            threadsMax: 1,
             approvalLine: dataSet.reviewApprovalLine
           }
 

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

@@ -4,7 +4,6 @@ import { Domain, getDataSource } from '@things-factory/shell'
 import { Activity, ActivityInstance, issue } from '@things-factory/worklist'
 
 import { DataSet } from '../service/data-set/data-set'
-import { OrgMemberTargetType } from '@things-factory/organization'
 
 export async function issueDataCollectionTask(
   domainId: string,
@@ -34,22 +33,22 @@ export async function issueDataCollectionTask(
     })) as Activity
 
     if (activity) {
-      const { entryRole } = dataSet
-
-      const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
+      const { entryRole, timeLimit } = dataSet
 
       /* 해당 dataset에 대한 데이타 수집 태스크를 dataset entryRole에게 할당한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
+      if (entryRole) {
         const activityInstance = {
           name: `[Data 수집] ${dataSet.name}`,
           description: dataSet.description,
           activityId: activity.id,
-          dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
+          dueAt: new Date(Date.now() + (timeLimit || activity.standardTime || 24 * 60 * 60) * 1000),
           input: {
             dataSetId: dataSet.id,
             dataSetName: dataSet.name
           },
-          assignees
+          assigneeRole: entryRole,
+          threadsMin: 1,
+          threadsMax: 1
         }
 
         context.state = {

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

@@ -50,7 +50,7 @@ export class DataOocQuery {
           version: dataOoc.dataSetVersion
         }
       }))
-    return dataSetHistory?.dataItems || []
+    return dataSetHistory?.dataItems.filter(item => item.active) || []
   }
 
   @FieldResolver(type => DataSample)

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

@@ -88,7 +88,10 @@ export class DataOoc {
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
           ? 'clob'
-          : 'varchar'
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    length: DATABASE_TYPE == 'mssql' ? 'MAX' : undefined
   })
   @Field({ nullable: true })
   correctiveInstruction?: string
@@ -100,7 +103,10 @@ export class DataOoc {
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
           ? 'clob'
-          : 'varchar'
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    length: DATABASE_TYPE == 'mssql' ? 'MAX' : undefined
   })
   @Field({ nullable: true })
   correctiveAction?: string
@@ -159,7 +165,10 @@ export class DataOoc {
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
           ? 'clob'
-          : 'varchar'
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    length: DATABASE_TYPE == 'mssql' ? 'MAX' : undefined
   })
   @Field({ nullable: true })
   rawData?: string

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

@@ -175,7 +175,7 @@ export class DataSampleQuery {
         }
       }))
 
-    return dataSetHistory?.dataItems || []
+    return dataSetHistory?.dataItems.filter(item => item.active) || []
   }
 
   @FieldResolver(type => DataSet)

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

@@ -104,7 +104,10 @@ export class DataSample {
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
           ? 'clob'
-          : 'varchar',
+          : DATABASE_TYPE == 'mssql'
+            ? 'nvarchar'
+            : 'varchar',
+    length: DATABASE_TYPE == 'mssql' ? 'MAX' : undefined,
     transformer: json5Transformer
   })
   @Field({ nullable: true })

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
         })
 
@@ -281,14 +243,15 @@ export class DataSetMutation {
       }
     })
 
-    const { supervisoryRoleId } = dataSet
+    const { supervisoryRoleId, entryRoleId } = dataSet
+    const allowedRoles = [supervisoryRoleId, entryRoleId].filter(Boolean)
 
     const me = await getRepository(User, tx).findOne({
       where: { id: user.id },
       relations: ['roles']
     })
 
-    if (!me.roles.find(role => role.id == supervisoryRoleId)) {
+    if (!me.roles.find(role => allowedRoles.includes(role.id))) {
       throw new Error(`You don't have permission to issue data collection task for this dataset.`)
     }