@things-factory/contact 6.0.7 → 6.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/contact",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -34,5 +34,5 @@
     "@things-factory/auth-base": "^6.0.7",
     "@things-factory/shell": "^6.0.7"
   },
-  "gitHead": "5af6d8613bd6eab6feaa69df942ef3ddfae764fe"
+  "gitHead": "c883904927d790f21f9e821ddbb4b74be370040e"
 }

package/server/service/contact/contact-item.ts

@@ -1,33 +1,17 @@
-import { Column, Entity, PrimaryGeneratedColumn, ManyToOne, RelationId } from 'typeorm'
-import { ObjectType, Field, Int, ID, InputType, registerEnumType } from 'type-graphql'
+import { ObjectType, Field, InputType } from 'type-graphql'
 
-import { Contact, ContactField } from './contact'
+import { ContactField } from './contact'
 
-@Entity()
-@ObjectType({ description: 'Entity for ContactItem' })
+@ObjectType()
 export class ContactItem {
-  @PrimaryGeneratedColumn('uuid')
-  @Field(type => ID)
-  readonly id: string
-
-  @Column()
   @Field()
   label: string
 
-  @Column()
   @Field()
   type: ContactField
 
-  @Column()
   @Field()
   value: string
-
-  @ManyToOne(type => Contact, contact => contact.items, { onDelete: 'CASCADE' })
-  @Field()
-  contact: Contact
-
-  @RelationId((item: ContactItem) => item.contact)
-  contactId: string
 }
 
 @InputType()

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

@@ -4,7 +4,6 @@ import { In } from 'typeorm'
 import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 
 import { Contact } from './contact'
-import { ContactItem } from './contact-item'
 import { NewContact, ContactPatch } from './contact-type'
 
 @Resolver(Contact)
@@ -21,7 +20,6 @@ export class ContactMutation {
     }
 
     const ContactRepository = tx.getRepository(Contact)
-    const ContactItemRepository = tx.getRepository(ContactItem)
 
     const result = await ContactRepository.save({
       ...contact,
@@ -30,13 +28,6 @@ export class ContactMutation {
       updater: user
     })
 
-    for (let item of contact.items || []) {
-      await ContactItemRepository.save({
-        ...item,
-        contact: { id: result.id }
-      })
-    }
-
     if (file) {
       await createAttachment(
         null,
@@ -75,22 +66,6 @@ export class ContactMutation {
       where: { domain: { id: domain.id }, id }
     })
 
-    if (patch.items) {
-      const ContactItemRepository = tx.getRepository(ContactItem)
-      await ContactItemRepository.delete({
-        contact: { id: contact.id }
-      })
-
-      for (let item of patch.items) {
-        await ContactItemRepository.save({
-          ...item,
-          contact: { id: contact.id }
-        })
-      }
-
-      delete patch.items
-    }
-
     const result = await ContactRepository.save({
       ...contact,
       ...patch,

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

@@ -7,6 +7,22 @@ import { ContactItem } from './contact-item'
 import { Profile } from './profile'
 import { ContactList } from './contact-type'
 
+function getContactItems(contact: Contact) {
+  const { items } = contact
+
+  if (!items || !(items instanceof Array)) {
+    return null
+  }
+
+  return items
+}
+
+function getContactItem(contact: Contact, type: String, label: String) {
+  const { items } = contact
+
+  return items?.find(item => item.type === type && item.label === label)?.value || ''
+}
+
 @Resolver(Contact)
 export class ContactQuery {
   @Query(returns => Contact!, { nullable: true, description: 'To fetch a Contact' })
@@ -54,48 +70,28 @@ export class ContactQuery {
   }
 
   @FieldResolver(type => String)
-  async email(@Root() contact: Contact): Promise<string> {
-    const email = await getRepository(ContactItem).findOneBy({
-      contact: { id: contact.id },
-      type: ContactField.Email,
-      label: 'work'
-    })
-    return email?.value
+  async phone(@Root() contact: Contact): Promise<string> {
+    return getContactItem(contact, ContactField.Phone, 'work')
   }
 
   @FieldResolver(type => String)
-  async phone(@Root() contact: Contact): Promise<string> {
-    const phone = await getRepository(ContactItem).findOneBy({
-      contact: { id: contact.id },
-      type: ContactField.Phone,
-      label: 'work'
-    })
-    return phone?.value
+  async email(@Root() contact: Contact): Promise<string> {
+    return getContactItem(contact, ContactField.Email, 'work')
   }
 
   @FieldResolver(type => String)
   async address(@Root() contact: Contact): Promise<string> {
-    const address = await getRepository(ContactItem).findOneBy({
-      contact: { id: contact.id },
-      type: ContactField.Address,
-      label: 'work'
-    })
-    return address?.value
+    return getContactItem(contact, ContactField.Address, 'work')
   }
 
   @FieldResolver(type => String)
   async department(@Root() contact: Contact): Promise<string> {
-    const department = await getRepository(ContactItem).findOneBy({
-      contact: { id: contact.id },
-      type: ContactField.Department,
-      label: 'work'
-    })
-    return department?.value
+    return getContactItem(contact, ContactField.Department, 'work')
   }
 
   @FieldResolver(type => [ContactItem])
   async items(@Root() contact: Contact): Promise<ContactItem[]> {
-    return await getRepository(ContactItem).findBy({ contact: { id: contact.id } })
+    return getContactItems(contact)
   }
 
   @FieldResolver(type => Domain)

package/server/service/contact/contact.ts

@@ -79,8 +79,8 @@ export class Contact {
   @Field(type => Profile, { nullable: true })
   profile: Profile
 
-  @OneToMany(type => ContactItem, contactItem => contactItem.contact)
-  @Field(type => [ContactItem])
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ContactItem], { nullable: true })
   items?: ContactItem[]
 
   @CreateDateColumn()

package/server/service/contact/index.ts

@@ -1,8 +1,7 @@
 import { Contact } from './contact'
-import { ContactItem } from './contact-item'
 import { Profile } from './profile'
 import { ContactQuery } from './contact-query'
 import { ContactMutation } from './contact-mutation'
 
-export const entities = [Profile, Contact, ContactItem]
+export const entities = [Profile, Contact]
 export const resolvers = [ContactQuery, ContactMutation]