@things-factory/organization 6.0.138 → 6.0.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.0.138",
+  "version": "6.0.139",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -35,5 +35,5 @@
     "@things-factory/contact": "^6.0.133",
     "@things-factory/shell": "^6.0.133"
   },
-  "gitHead": "ca6c771a4c9f84e36f002665377ec919c0e11465"
+  "gitHead": "59efd5d9c1184b4ebd208a4f5dea47d23cf51cf7"
 }

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

@@ -3,7 +3,7 @@ import { In } from 'typeorm'
 
 import { Employee } from '../employee/employee'
 import { ApprovalLine, ApprovalLineOwnerType } from './approval-line'
-import { ApprovalLineItem } from './approval-line-item'
+import { ApprovalLineItem, OrgMemberTargetType } from './approval-line-item'
 import { NewApprovalLine, ApprovalLinePatch } from './approval-line-type'
 
 async function getOwnerValue(
@@ -49,12 +49,24 @@ function getModelValue(patch: NewApprovalLine | ApprovalLinePatch): ApprovalLine
     return null
   }
 
-  return model.map(m => {
-    return {
-      type: m.type,
-      approver: m.approver
-    } as ApprovalLineItem
-  })
+  return model
+    .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
+      }
+    })
 }
 
 @Resolver(ApprovalLine)