@things-factory/worklist 6.0.138 → 6.0.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.138",
+  "version": "6.0.140",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,10 +33,10 @@
     "@things-factory/auth-base": "^6.0.133",
     "@things-factory/board-service": "^6.0.133",
     "@things-factory/context-ui": "^6.0.133",
-    "@things-factory/organization": "^6.0.138",
+    "@things-factory/organization": "^6.0.139",
     "@things-factory/scheduler-client": "^6.0.133",
     "@things-factory/shell": "^6.0.133",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "ca6c771a4c9f84e36f002665377ec919c0e11465"
+  "gitHead": "b7e0dde9f11e2fa1f7ab276221d936d77cdbb770"
 }

package/server/controllers/activity-instance/draft.ts

@@ -68,24 +68,6 @@ export async function draft(
     activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000)
   }
 
-  // if (activityInstance.assignees) {
-  //   activityInstance.assignees = activityInstance.assignees.map(assignee => {
-  //     return {
-  //       type: assignee.type,
-  //       value: assignee.value
-  //     }
-  //   })
-  // }
-
-  // if (activityInstance.approvalLine) {
-  //   activityInstance.approvalLine = activityInstance.approvalLine.map(approval => {
-  //     return {
-  //       type: approval.type,
-  //       value: approval.value
-  //     }
-  //   })
-  // }
-
   const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)
 
   return await tx.getRepository(ActivityInstance).save({

package/server/service/activity/activity-mutation.ts

@@ -3,10 +3,77 @@ 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 { Activity } from './activity'
+import { Activity, AssigneeItem } from './activity'
 import { ActivityPatch, NewActivity } from './activity-type'
 
+function getApprovalLineValue(patch: NewActivity | ActivityPatch): 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: NewActivity | ActivityPatch): 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(Activity)
 export class ActivityMutation {
   @Directive('@transaction')
@@ -17,6 +84,8 @@ export class ActivityMutation {
 
     const result = await tx.getRepository(Activity).save({
       ...activity,
+      assignees: getAssigneesValue(activity),
+      approvalLine: getApprovalLineValue(activity),
       domain,
       creator: user,
       updater: user
@@ -59,6 +128,8 @@ export class ActivityMutation {
     const result = await repository.save({
       ...activity,
       ...patch,
+      assignees: getAssigneesValue(activity),
+      approvalLine: getApprovalLineValue(activity),
       updater: user
     })
 
@@ -100,6 +171,8 @@ export class ActivityMutation {
 
         const result = await activityRepo.save({
           ...newRecord,
+          assignees: getAssigneesValue(newRecord),
+          approvalLine: getApprovalLineValue(newRecord),
           domain,
           creator: user,
           updater: user
@@ -135,6 +208,8 @@ export class ActivityMutation {
         const result = await activityRepo.save({
           ...activity,
           ...updateRecord,
+          assignees: getAssigneesValue(updateRecord),
+          approvalLine: getApprovalLineValue(updateRecord),
           updater: user
         })
 

package/server/service/activity/activity-query.ts

@@ -168,7 +168,7 @@ export class ActivityQuery {
         default:
       }
 
-      assignee && assigneeItemList.push({ type, value: id, assignee })
+      id ? assigneeItemList.push({ type, assignee }) : assigneeItemList.push({ type })
     }
 
     return assigneeItemList