@things-factory/organization 6.0.24 → 6.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.0.24",
+  "version": "6.0.27",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,9 +30,9 @@
     "@operato/data-tree": "^1.0.0",
     "@operato/graphql": "^1.0.0",
     "@operato/shell": "^1.0.0",
-    "@things-factory/auth-base": "^6.0.24",
-    "@things-factory/contact": "^6.0.24",
-    "@things-factory/shell": "^6.0.24"
+    "@things-factory/auth-base": "^6.0.27",
+    "@things-factory/contact": "^6.0.27",
+    "@things-factory/shell": "^6.0.27"
   },
-  "gitHead": "27c1a4c3bcf4f293e7e676caa1f2daa3bb6ded11"
+  "gitHead": "684784a4f3e450e9ce07dcd51db70b8a2d2c2a0f"
 }

package/server/service/approval-line/approval-line-item.ts

@@ -1,26 +1,21 @@
-import { ObjectType, Field, ID, InputType, registerEnumType } from 'type-graphql'
+import { ObjectType, Field, ID, registerEnumType } from 'type-graphql'
 
-import { ObjectRef } from '@things-factory/shell'
-
-export enum ApprovalLineItemType {
+export enum OrgMemberTargetType {
   Employee = 'Employee',
   Department = 'Department',
-  Role = 'Role'
+  Role = 'Role',
+  Myself = 'Myself',
+  MyDepartment = 'MyDepartment',
+  MySupervisor = 'MySupervisor'
 }
 
-registerEnumType(ApprovalLineItemType, {
-  name: 'ApprovalLineItemType',
+registerEnumType(OrgMemberTargetType, {
+  name: 'OrgMemberTargetType',
   description: 'type enumeration of a approval line item'
 })
 
-// @InputType()
-// export class ObjectRefApprover extends ObjectRef {
-//   @Field({ nullable: true })
-//   controlNo?: string
-// }
-
 @ObjectType()
-export class ApproverTarget {
+export class OrgMemberTarget {
   @Field(() => ID, { description: 'Field id' })
   id?: string
 
@@ -37,20 +32,11 @@ export class ApproverTarget {
 @ObjectType({ description: 'Entity for approval line item' })
 export class ApprovalLineItem {
   @Field({ nullable: true })
-  type?: ApprovalLineItemType
+  type?: OrgMemberTargetType
 
   @Field(type => String, { nullable: true })
   value?: string
 
-  @Field(type => ApproverTarget, { nullable: true })
-  approver?: ApproverTarget
+  @Field(type => OrgMemberTarget, { nullable: true })
+  approver?: OrgMemberTarget
 }
-
-// @InputType()
-// export class ApprovalLineItemPatch {
-//   @Field({ nullable: true })
-//   type?: ApprovalLineItemType
-
-//   @Field(type => ObjectRefApprover, { nullable: true })
-//   approver?: ObjectRefApprover
-// }

package/server/service/approval-line/approval-line-mutation.ts

@@ -6,7 +6,11 @@ import { ApprovalLine, ApprovalLineOwnerType } from './approval-line'
 import { ApprovalLineItem } from './approval-line-item'
 import { NewApprovalLine, ApprovalLinePatch } from './approval-line-type'
 
-async function getOwnerValue(approvalLine: any, patch: any, context: ResolverContext) {
+async function getOwnerValue(
+  approvalLine: ApprovalLine | NewApprovalLine | ApprovalLinePatch,
+  patch: NewApprovalLine | ApprovalLinePatch,
+  context: ResolverContext
+) {
   if (!('owner' in patch || 'ownerType' in patch)) {
     /* owner 또는 ownerType 하나도 언급되지 않았다면, 업데이트하지 않는다. */
     return
@@ -15,7 +19,7 @@ async function getOwnerValue(approvalLine: any, patch: any, context: ResolverCon
   const { domain, tx } = context.state
   const { ownerType, owner } = patch
 
-  if (ownerType === '' || !owner) {
+  if (!ownerType || !owner) {
     /* ownerType이 클리어되거나, owner가 지정되지 않았다면, 클리어시킨다. */
     return null
   }
@@ -23,14 +27,8 @@ async function getOwnerValue(approvalLine: any, patch: any, context: ResolverCon
   var ownerObject
 
   switch (ownerType || approvalLine.ownerType) {
-    case 'Employee':
-      ownerObject = await tx.getRepository('Employee').findOneBy({ domain: { id: domain.id }, id: owner.id })
-      break
-    case 'Department':
-      ownerObject = await tx.getRepository('Department').findOneBy({ domain: { id: domain.id }, id: owner.id })
-      break
-    case 'Role':
-      ownerObject = await tx.getRepository('Role').findOneBy({ domain: { id: domain.id }, id: owner.id })
+    case ApprovalLineOwnerType.Employee:
+      ownerObject = await tx.getRepository(Employee).findOneBy({ domain: { id: domain.id }, id: owner.id })
       break
     default:
   }
@@ -38,7 +36,7 @@ async function getOwnerValue(approvalLine: any, patch: any, context: ResolverCon
   return ownerObject?.id || null
 }
 
-function getModelValue(patch: any): ApprovalLineItem[] {
+function getModelValue(patch: NewApprovalLine | ApprovalLinePatch): ApprovalLineItem[] {
   if (!('model' in patch)) {
     /* model이 언급되지 않았다면, 업데이트하지 않는다. */
     return
@@ -54,7 +52,7 @@ function getModelValue(patch: any): ApprovalLineItem[] {
   return model.map(m => {
     return {
       type: m.type,
-      value: m.approver.id
+      value: m.approver?.id
     } as ApprovalLineItem
   })
 }

package/server/service/approval-line/approval-line-query.ts

@@ -1,11 +1,12 @@
 import { Directive, Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
 import { Brackets, In } from 'typeorm'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
-import { User } from '@things-factory/auth-base'
-import { ApprovalLineItem } from './approval-line-item'
-import { ApprovalLine, ApprovalLineOwner } from './approval-line'
+import { Role, User } from '@things-factory/auth-base'
+import { ApprovalLineItem, OrgMemberTargetType } from './approval-line-item'
+import { ApprovalLine, ApprovalLineOwner, ApprovalLineOwnerType } from './approval-line'
 import { ApprovalLineList } from './approval-line-type'
 import { Employee } from '../employee/employee'
+import { Department } from '../department/department'
 
 async function getOwnerValue(approvalLine: ApprovalLine, context: ResolverContext) {
   const { domain } = context.state
@@ -19,8 +20,8 @@ async function getOwnerValue(approvalLine: ApprovalLine, context: ResolverContex
   var ownerObject
 
   switch (ownerType) {
-    case 'Employee':
-      ownerObject = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id: ownerValue })
+    case ApprovalLineOwnerType.Employee:
+      ownerObject = await getRepository(Employee).findOneBy({ domain: { id: domain.id }, id: ownerValue })
       break
     default:
       return null
@@ -30,7 +31,7 @@ async function getOwnerValue(approvalLine: ApprovalLine, context: ResolverContex
 }
 
 async function getModel(approvalLine: ApprovalLine, context: ResolverContext): Promise<ApprovalLineItem[]> {
-  const { domain } = context.state
+  const { domain, user } = context.state
   const { model } = approvalLine
 
   if (!model || !(model instanceof Array)) {
@@ -44,19 +45,24 @@ async function getModel(approvalLine: ApprovalLine, context: ResolverContext): P
     var approver
 
     switch (type) {
-      case 'Employee':
-        approver = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+      case OrgMemberTargetType.Employee:
+        approver = await getRepository(Employee).findOneBy({ domain: { id: domain.id }, id })
+        break
+      case OrgMemberTargetType.Department:
+        approver = await getRepository(Department).findOneBy({ domain: { id: domain.id }, id })
         break
-      case 'Department':
-        approver = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+      case OrgMemberTargetType.Role:
+        approver = await getRepository(Role).findOneBy({ domain: { id: domain.id }, id })
         break
-      case 'Role':
-        approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+      case OrgMemberTargetType.Myself:
+      case OrgMemberTargetType.MyDepartment:
+      case OrgMemberTargetType.MySupervisor:
         break
       default:
+        continue
     }
 
-    approver && approvalLineItemList.push({ type, approver })
+    approvalLineItemList.push({ type, approver })
   }
 
   return approvalLineItemList

package/translations/en.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",

package/translations/ko.json

@@ -14,6 +14,7 @@
   "label.picture": "사진",
   "title.approval-line item list": "결재라인 상세",
   "title.approval-line template list": "결재라인 템플릿 목록",
+  "title.assignee list": "할당자 목록",
   "title.common-approval-line template list": "공통 결재라인 템플릿 목록",
   "title.my-approval-line template list": "나의 결재라인 템플릿 목록",
   "title.employee list": "직원 목록",

package/translations/ms.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",

package/translations/zh.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",