@things-factory/organization 6.0.6 → 6.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.0.6",
+  "version": "6.0.8",
   "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.5",
-    "@things-factory/contact": "^6.0.6",
-    "@things-factory/shell": "^6.0.5"
+    "@things-factory/auth-base": "^6.0.7",
+    "@things-factory/contact": "^6.0.8",
+    "@things-factory/shell": "^6.0.7"
   },
-  "gitHead": "483b3f62690284db348d176ccc1b82825fda0c98"
+  "gitHead": "c883904927d790f21f9e821ddbb4b74be370040e"
 }

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

@@ -7,6 +7,17 @@ import { Employee } from './employee'
 import { EmployeeList } from './employee-type'
 import { Department } from '../department/department'
 
+async function getContactItem(contactId: String, type: String, label: String, context: ResolverContext) {
+  const { domain } = context.state
+  const contact: Contact = await getRepository(Contact).findOne({ where: { domain: { id: domain.id }, id: contactId } })
+  const { items } = contact
+
+  if (!items || !(items instanceof Array)) {
+    return ''
+  }
+
+  return items?.find(item => item.type === type && item.label === label)?.value || ''
+}
 @Resolver(Employee)
 export class EmployeeQuery {
   @Query(returns => Employee!, { nullable: true, description: 'To fetch a Employee' })
@@ -48,42 +59,30 @@ export class EmployeeQuery {
   }
 
   @FieldResolver(type => String)
-  async phone(@Root() employee: Employee): Promise<string> {
+  async phone(@Root() employee: Employee, @Ctx() context: ResolverContext): Promise<string> {
     if (!employee.contactId) {
       return
     }
-    const phone = (await getRepository(ContactItem).findOneBy({
-      contact: { id: employee.contactId },
-      type: ContactField.Phone,
-      label: 'work'
-    })) as any
-    return phone?.value
+
+    await getContactItem(employee.contactId, ContactField.Phone, 'work', context)
   }
 
   @FieldResolver(type => String)
-  async address(@Root() employee: Employee): Promise<string> {
+  async address(@Root() employee: Employee, @Ctx() context: ResolverContext): Promise<string> {
     if (!employee.contactId) {
       return
     }
-    const address = (await getRepository(ContactItem).findOneBy({
-      contact: { id: employee.contactId },
-      type: ContactField.Address,
-      label: 'work'
-    })) as any
-    return address?.value
+
+    await getContactItem(employee.contactId, ContactField.Address, 'work', context)
   }
 
   @FieldResolver(type => String)
-  async email(@Root() employee: Employee): Promise<string> {
+  async email(@Root() employee: Employee, @Ctx() context: ResolverContext): Promise<string> {
     if (!employee.contactId) {
       return
     }
-    const email = (await getRepository(ContactItem).findOneBy({
-      contact: { id: employee.contactId },
-      type: ContactField.Email,
-      label: 'work'
-    })) as any
-    return email?.value
+
+    await getContactItem(employee.contactId, ContactField.Email, 'work', context)
   }
 
   @FieldResolver(type => Profile)

package/server/service/employee/employee-type.ts

@@ -11,6 +11,9 @@ export class ObjectRefForEmployee extends ObjectRef {
   @Field({ nullable: true })
   controlNo?: string
 
+  @Field({ nullable: true })
+  photo?: string
+
   @Field({ nullable: true })
   email?: string
 }