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

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-collect-data.ts → issue-data-collection-task.ts}

@@ -4,8 +4,9 @@ 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 issueCollectData(
+export async function issueDataCollectionTask(
   domainId: string,
   dataSetId: string,
   context: ResolverContext
@@ -23,7 +24,8 @@ export async function issueCollectData(
           id: In([domain.id, domain.parentId].filter(Boolean))
         },
         id: dataSetId
-      }
+      },
+      relations: ['entryRole']
     })
 
     const activity = (await tx.getRepository(Activity).findOneBy({
@@ -32,10 +34,12 @@ export async function issueCollectData(
     })) as Activity
 
     if (activity) {
-      const { assignees } = dataSet
+      const { entryRole } = dataSet
+
+      // const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
 
-      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset assignees에게 할당한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
+      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset entryRole에게 할당한다. */
+      if (entryRole) {
         const activityInstance = {
           name: `[Data 수집] ${dataSet.name}`,
           description: dataSet.description,
@@ -45,7 +49,9 @@ export async function issueCollectData(
             dataSetId: dataSet.id,
             dataSetName: dataSet.name
           },
-          assignees
+          assigneeRole: entryRole,
+          threadsMin: 1,
+          threadsMax: 1
         }
 
         context.state = {
@@ -57,7 +63,7 @@ export async function issueCollectData(
         return await issue(activityInstance, context)
       } else {
         throw new Error(
-          `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
+          `Data Entry Role not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
         )
       }
     } else {

package/server/engine/task/issue-collect-data.ts

@@ -1,5 +1,5 @@
 import { TaskRegistry, InputStep, Context } from '@things-factory/integration-base'
-import { issueCollectData } from '../../controllers/issue-collect-data'
+import { issueDataCollectionTask } from '../../controllers/issue-data-collection-task'
 import i18next from 'i18next'
 
 async function IssueCollectData(step: InputStep, context: Context) {
@@ -12,7 +12,7 @@ async function IssueCollectData(step: InputStep, context: Context) {
     throw new Error(`no dataset found`)
   }
 
-  const activityInstance = await issueCollectData(domain.id, dataSetId, {
+  const activityInstance = await issueDataCollectionTask(domain.id, dataSetId, {
     t: i18next.t,
     state: {
       domain,

package/server/routes.ts

@@ -8,7 +8,7 @@ import { ScheduleRegisterRequest } from '@things-factory/scheduler-client'
 import { createDataSample } from './controllers/create-data-sample'
 import { renderJasperReport } from './controllers/jasper-report'
 import { renderShinyReport } from './controllers/shiny-report'
-import { issueCollectData } from './controllers/issue-collect-data'
+import { issueDataCollectionTask } from './controllers/issue-data-collection-task'
 import { DataSensor } from './service/data-sensor/data-sensor'
 import { DataSet } from './service/data-set/data-set'
 
@@ -120,7 +120,7 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
       throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)
     }
 
-    await issueCollectData(domainId, dataSetId, context)
+    await issueDataCollectionTask(domainId, dataSetId, context)
 
     context.status = 200
   })
@@ -146,7 +146,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         throw new Error(`domain(${domainId}) not found`)
       }
 
-      const dataSet = await tx.getRepository(DataSet).findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
+      const dataSet = await tx
+        .getRepository(DataSet)
+        .findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
 
       // do what you gotta do
     })

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.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

@@ -1,14 +1,16 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
+import { getRepository } from '@things-factory/shell'
+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 { AssigneeItem } from '@things-factory/worklist'
 
 import { getDataFinalizeCrontabSchedule } from '../../controllers/finalize-data-collection'
 import { DataSet } from './data-set'
 import { DataSetPatch, NewDataSet } from './data-set-type'
+import { issueDataCollectionTask } from '../../controllers/issue-data-collection-task'
 
 const crypto = require('crypto')
 
@@ -78,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)')
@@ -118,12 +87,11 @@ export class DataSetMutation {
   @Mutation(returns => DataSet, { description: 'To create new DataSet' })
   async createDataSet(@Arg('dataSet') dataSet: NewDataSet, @Ctx() context: ResolverContext): Promise<DataSet> {
     const { domain, user, tx } = context.state
-    const dataSetRepo = tx.getRepository(DataSet)
+    const dataSetRepo = getRepository(DataSet, tx)
 
     const result = await dataSetRepo.save({
       ...dataSet,
       approvalLine: getApprovalLineValue(dataSet),
-      assignees: getAssigneesValue(dataSet),
       outlierApprovalLineValue: getOutlierApprovalLineValue(dataSet),
       version: 1,
       domain,
@@ -145,7 +113,7 @@ export class DataSetMutation {
     @Ctx() context: ResolverContext
   ): Promise<DataSet> {
     const { domain, user, tx } = context.state
-    const dataSetRepo = tx.getRepository(DataSet)
+    const dataSetRepo = getRepository(DataSet, tx)
 
     const dataSet = await dataSetRepo.findOne({
       where: { domain: { id: domain.id }, id },
@@ -158,7 +126,6 @@ export class DataSetMutation {
       ...patch,
       approvalLine: getApprovalLineValue(patch),
       outlierApprovalLineValue: getOutlierApprovalLineValue(patch),
-      assignees: getAssigneesValue(patch),
       updater: user
     })
 
@@ -175,7 +142,7 @@ export class DataSetMutation {
     @Ctx() context: ResolverContext
   ): Promise<DataSet[]> {
     const { domain, user, tx } = context.state
-    const dataSetRepo = tx.getRepository(DataSet)
+    const dataSetRepo = getRepository(DataSet, tx)
 
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -189,7 +156,6 @@ export class DataSetMutation {
         const result = await dataSetRepo.save({
           ...newRecord,
           approvalLine: getApprovalLineValue(newRecord),
-          assignees: getAssigneesValue(newRecord),
           outlierApprovalLineValue: getOutlierApprovalLineValue(newRecord),
           domain,
           creator: user,
@@ -220,7 +186,6 @@ export class DataSetMutation {
           ...updateRecord,
           approvalLine: getApprovalLineValue(updateRecord),
           outlierApprovalLineValue: getOutlierApprovalLineValue(updateRecord),
-          assignees: getAssigneesValue(updateRecord),
           updater: user
         })
 
@@ -242,7 +207,7 @@ export class DataSetMutation {
   async deleteDataSet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(DataSet).delete({ domain: { id: domain.id }, id })
+    await getRepository(DataSet, tx).delete({ domain: { id: domain.id }, id })
     await deleteAttachmentsByRef(null, { refBys: [`report-${id}`] }, context)
 
     return true
@@ -254,7 +219,7 @@ export class DataSetMutation {
   async deleteDataSets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(DataSet).delete({
+    await getRepository(DataSet, tx).delete({
       domain: { id: domain.id },
       id: In(ids)
     })
@@ -264,6 +229,36 @@ export class DataSetMutation {
     return true
   }
 
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To issue data-collection task for the given dataset' })
+  async issueDataCollection(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const { domain, tx, user } = context.state
+
+    const dataSet = await getRepository(DataSet, tx).findOne({
+      where: {
+        domain: {
+          id: In([domain.id, domain.parentId].filter(Boolean))
+        },
+        id: dataSetId
+      }
+    })
+
+    const { supervisoryRoleId } = dataSet
+
+    const me = await getRepository(User, tx).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+
+    if (!me.roles.find(role => role.id == supervisoryRoleId)) {
+      throw new Error(`You don't have permission to issue data collection task for this dataset.`)
+    }
+
+    const activityInstance = await issueDataCollectionTask(domain.id, dataSet.id, context)
+
+    return !!activityInstance
+  }
+
   @Directive('@transaction')
   @Mutation(returns => DataSet, { description: 'To start data collection schedule for the given dataset' })
   async startDataCollectionSchedule(
@@ -272,7 +267,7 @@ export class DataSetMutation {
   ): Promise<DataSet> {
     const { domain, tx } = context.state
 
-    var repository = tx.getRepository(DataSet)
+    var repository = getRepository(DataSet, tx)
     var dataSet = await repository.findOne({
       where: { domain: { id: domain.id }, id: dataSetId }
     })
@@ -338,7 +333,7 @@ export class DataSetMutation {
   ): Promise<DataSet | undefined> {
     const { domain, tx } = context.state
 
-    var repository = tx.getRepository(DataSet)
+    var repository = getRepository(DataSet, tx)
     var dataSet = await repository.findOne({
       where: { domain: { id: domain.id }, id: dataSetId }
     })
@@ -371,7 +366,7 @@ export class DataSetMutation {
   ): Promise<DataSet> {
     const { domain, tx } = context.state
 
-    var repository = tx.getRepository(DataSet)
+    var repository = getRepository(DataSet, tx)
     var dataSet = await repository.findOne({
       where: { domain: { id: domain.id }, id: dataSetId }
     })
@@ -448,7 +443,7 @@ export class DataSetMutation {
   ): Promise<DataSet | undefined> {
     const { domain, tx } = context.state
 
-    var repository = tx.getRepository(DataSet)
+    var repository = getRepository(DataSet, tx)
     var dataSet = await repository.findOne({
       where: { domain: { id: domain.id }, id: dataSetId }
     })
@@ -482,7 +477,7 @@ export class DataSetMutation {
     @Ctx() context: ResolverContext
   ): Promise<boolean> {
     const { domain, tx } = context.state
-    const dataSetRepo = tx.getRepository(DataSet)
+    const dataSetRepo = getRepository(DataSet, tx)
 
     await Promise.all(
       dataSets.map(async (dataSet: DataSet) => {
@@ -501,7 +496,7 @@ export class DataSetMutation {
   @Mutation(returns => [DataSet], { description: 'To copy multiple data-sets' })
   async copyDataSets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<DataSet[]> {
     const { domain, user, tx } = context.state
-    const dataSetRepo = tx.getRepository(DataSet)
+    const dataSetRepo = getRepository(DataSet, tx)
 
     const originals = await dataSetRepo.find({
       where: {