@things-factory/dataset 6.0.137 → 6.0.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.137",
+  "version": "6.0.139",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,15 +40,15 @@
     "@things-factory/aws-base": "^6.0.133",
     "@things-factory/board-service": "^6.0.133",
     "@things-factory/env": "^6.0.124",
-    "@things-factory/organization": "^6.0.137",
+    "@things-factory/organization": "^6.0.139",
     "@things-factory/scheduler-client": "^6.0.133",
     "@things-factory/shell": "^6.0.133",
     "@things-factory/work-shift": "^6.0.133",
-    "@things-factory/worklist": "^6.0.137",
+    "@things-factory/worklist": "^6.0.139",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "374fe27c35c1a4dbb305f972032d283a51ac8813"
+  "gitHead": "59efd5d9c1184b4ebd208a4f5dea47d23cf51cf7"
 }

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

@@ -3,12 +3,80 @@ 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 { AssigneeItem } from '@things-factory/worklist'
 
 import { DataSet } from './data-set'
 import { DataSetPatch, NewDataSet } from './data-set-type'
 
 const crypto = require('crypto')
 
+function getApprovalLineValue(patch: NewDataSet | DataSetPatch): ApprovalLineItem[] {
+  const { approvalLine } = patch
+
+  if (!('approvalLine' in patch)) {
+    /* approvalLine이 언급되지 않았다면, 업데이트하지 않는다. */
+    return
+  }
+
+  if (!approvalLine || !(approvalLine instanceof Array)) {
+    /* approvalLine의 값이 없거나 배열이 아니라면, 클리어시킨다. */
+    return null
+  }
+
+  return approvalLine
+    .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
+
+  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
+      } as ApprovalLineItem
+    })
+    .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)')
@@ -20,6 +88,8 @@ export class DataSetMutation {
 
     const result = await dataSetRepo.save({
       ...dataSet,
+      approvalLine: getApprovalLineValue(dataSet),
+      assignees: getAssigneesValue(dataSet),
       version: 1,
       domain,
       creator: user,
@@ -51,6 +121,8 @@ export class DataSetMutation {
     const result = await dataSetRepo.save({
       ...dataSet,
       ...patch,
+      approvalLine: getApprovalLineValue(patch),
+      assignees: getAssigneesValue(patch),
       updater: user
     })
 
@@ -80,6 +152,8 @@ export class DataSetMutation {
 
         const result = await dataSetRepo.save({
           ...newRecord,
+          approvalLine: getApprovalLineValue(newRecord),
+          assignees: getAssigneesValue(newRecord),
           domain,
           creator: user,
           updater: user
@@ -97,20 +171,22 @@ export class DataSetMutation {
     if (_updateRecords.length > 0) {
       const cuFlag = 'M'
       for (let i = 0; i < _updateRecords.length; i++) {
-        const newRecord = _updateRecords[i]
+        const updateRecord = _updateRecords[i]
         const dataSet = await dataSetRepo.findOne({
-          where: { id: newRecord.id },
+          where: { id: updateRecord.id },
           /* history에 항상 반영될 수 있도록 relations가 있어야 함. */
           relations: ['domain', 'dataKeySet', 'entryRole', 'supervisoryRole', 'creator', 'updater']
         })
 
         const result = await dataSetRepo.save({
           ...dataSet,
-          ...newRecord,
+          ...updateRecord,
+          approvalLine: getApprovalLineValue(updateRecord),
+          assignees: getAssigneesValue(updateRecord),
           updater: user
         })
 
-        await this._createAttachment(context, newRecord.reportTemplate, { ref: result, cuFlag })
+        await this._createAttachment(context, updateRecord.reportTemplate, { ref: result, cuFlag })
 
         results.push({
           ...result,

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

@@ -6,6 +6,7 @@ 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 { AssigneeItem } from '@things-factory/worklist'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
@@ -55,27 +56,6 @@ export class DataSetQuery {
     return { items, total }
   }
 
-  // @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
-  // @Query(returns => DataSetStateList, { description: 'To fetch multiple status of DataSets' })
-  // async dataSetsStatus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetStateList> {
-  //   const { domain } = context.state
-
-  //   // scheduler server에 group내 schedule list를 조회한다.
-  //   const queryBuilder = getQueryBuilderFromListParams({
-  //     repository: getRepository(DataSet),
-  //     params,
-  //     domain,
-  //     alias: 'dataset',
-  //     searchables: ['name', 'description', 'supervisoryRole']
-  //   })
-
-  //   const [items, total] = await queryBuilder.getManyAndCount()
-
-  //   return { items: [{
-
-  //   }], total }
-  // }
-
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
   async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
     var { domain, user } = context.state
@@ -177,6 +157,48 @@ export class DataSetQuery {
     )
   }
 
+  @FieldResolver(type => [AssigneeItem])
+  async assignees(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<AssigneeItem[]> {
+    const { domain, user } = context.state
+    const { assignees } = dataSet
+
+    if (!assignees || !(assignees instanceof Array)) {
+      return null
+    }
+
+    var assigneeItemList = []
+
+    for (let item of assignees) {
+      // "value" deprecated. to be removed
+      var { type, assignee, value } = item
+      var id = assignee?.id || id
+      var assignee
+
+      switch (type) {
+        case 'Employee':
+          assignee = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Department':
+          assignee = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Role':
+          assignee = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
+          break
+        case 'Myself':
+          assignee = user
+          break
+        case 'MyDepartment':
+        case 'MySupervisor':
+          break
+        default:
+      }
+
+      id ? assigneeItemList.push({ type, assignee }) : assigneeItemList.push({ type })
+    }
+
+    return assigneeItemList
+  }
+
   @FieldResolver(type => [ApprovalLineItem])
   async approvalLine(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<ApprovalLineItem[]> {
     const { domain, user } = context.state