@things-factory/organization 6.0.25 → 6.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.0.25",
+  "version": "6.0.28",
   "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.25",
-    "@things-factory/contact": "^6.0.25",
-    "@things-factory/shell": "^6.0.25"
+    "@things-factory/auth-base": "^6.0.28",
+    "@things-factory/contact": "^6.0.28",
+    "@things-factory/shell": "^6.0.28"
   },
-  "gitHead": "8a987a42de944dc915b8cfddb047eb7bc0d4ba41"
+  "gitHead": "8b4e03229444e38fc3f3487227a96837eef85099"
 }

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
@@ -44,25 +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 'Department':
-        approver = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+      case OrgMemberTargetType.Department:
+        approver = await getRepository(Department).findOneBy({ domain: { id: domain.id }, id })
         break
-      case 'Role':
-        approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+      case OrgMemberTargetType.Role:
+        approver = await getRepository(Role).findOneBy({ domain: { id: domain.id }, id })
         break
-      case 'Myself':
-        approver = user
-        break
-      case 'MyDepartment':
-      case 'MySupervisor':
+      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

@@ -12,9 +12,11 @@
   "label.manager": "manager",
   "label.note": "note",
   "label.picture": "picture",
+  "title.approval-line editor": "approval line editor",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
   "title.assignee list": "assignee list",
+  "title.assignees editor": "assignee editor",
   "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

@@ -12,9 +12,11 @@
   "label.manager": "관리자",
   "label.note": "노트",
   "label.picture": "사진",
+  "title.approval-line editor": "결재라인 편집",
   "title.approval-line item list": "결재라인 상세",
   "title.approval-line template list": "결재라인 템플릿 목록",
   "title.assignee list": "할당자 목록",
+  "title.assignees editor": "할당자 목록 편집",
   "title.common-approval-line template list": "공통 결재라인 템플릿 목록",
   "title.my-approval-line template list": "나의 결재라인 템플릿 목록",
   "title.employee list": "직원 목록",

package/translations/ms.json

@@ -12,9 +12,11 @@
   "label.manager": "manager",
   "label.note": "note",
   "label.picture": "picture",
+  "title.approval-line editor": "approval line editor",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
   "title.assignee list": "assignee list",
+  "title.assignees editor": "assignee editor",
   "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

@@ -12,9 +12,11 @@
   "label.manager": "manager",
   "label.note": "note",
   "label.picture": "picture",
+  "title.approval-line editor": "approval line editor",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
   "title.assignee list": "assignee list",
+  "title.assignees editor": "assignee editor",
   "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/client/model/domain.ts

@@ -1,22 +0,0 @@
-export class Domain {
-  readonly id?: string
-
-  name?: string
-  description?: string
-
-  subdomain?: string
-
-  extType?: string
-  timezone?: string
-  systemFlag?: boolean
-
-  brandName?: string
-  brandImage?: string
-  contentImage?: string
-
-  owner?: string
-  theme?: string
-
-  createdAt?: Date
-  updatedAt?: Date
-}

package/client/model/privilege.ts

@@ -1,28 +0,0 @@
-import { Role } from './role'
-import { User } from './user'
-
-export class Privilege {
-  id?: string
-
-  name?: string
-
-  category?: string
-
-  nullable?: true
-
-  description?: string
-
-  roles?: Role[]
-
-  creator?: User
-
-  creatorId?: string
-
-  updater?: User
-
-  updaterId?: string
-
-  createdAt?: Date
-
-  updatedAt?: Date
-}

package/client/model/role.ts

@@ -1,33 +0,0 @@
-import { Domain } from './domain'
-import { User } from './user'
-import { Privilege } from './privilege'
-
-export class Role {
-  readonly id?: string
-
-  domain?: Domain
-
-  domainId?: string
-
-  name?: string
-
-  users?: User[]
-
-  privileges?: Privilege[]
-
-  nullable?: true
-
-  description?: string
-
-  creator?: User
-
-  creatorId?: string
-
-  updater?: User
-
-  updaterId?: string
-
-  createdAt?: Date
-
-  updatedAt?: Date
-}

package/client/model/user.ts

@@ -1,23 +0,0 @@
-export enum UserStatus {
-  INACTIVE = 'inactive',
-  ACTIVATED = 'activated',
-  DELETED = 'deleted',
-  LOCKED = 'locked',
-  BANNED = 'banned',
-  PWD_RESET_REQUIRED = 'password_reset_required'
-}
-
-export class User {
-  readonly id?: string
-
-  name?: string
-  description?: string
-
-  email?: string
-
-  creator?: User
-  updater?: User
-
-  createdAt?: Date
-  updatedAt?: Date
-}