feat: add contact tags and fields

Author: marian2js

apps/api/src/chat/entities/contact.ts

@@ -4,11 +4,12 @@ import { OwnedEntity } from '@app/common/decorators/owned-entity.decorator'
 import { jsonProp } from '@app/common/decorators/props/json-prop.decorator'
 import { Reference } from '@app/common/typings/mongodb'
 import { Injectable } from '@nestjs/common'
-import { Field, ObjectType } from '@nestjs/graphql'
+import { Field, InputType, ObjectType } from '@nestjs/graphql'
 import { Authorize } from '@ptc-org/nestjs-query-graphql'
 import { Index, prop } from '@typegoose/typegoose'
 import { getAddress, isAddress } from 'ethers/lib/utils'
 import { GraphQLString } from 'graphql'
+import { GraphQLJSONObject } from 'graphql-type-json'
 import { User } from '../../users/entities/user'
 
 @Injectable()
@@ -33,3 +34,24 @@ export class Contact extends BaseEntity {
   @jsonProp()
   fields?: Record<string, any>
 }
+
+@InputType()
+export class CreateContactInput {
+  @Field()
+  address: string
+
+  @Field(() => [GraphQLString], { nullable: true })
+  tags?: string[]
+
+  @Field(() => GraphQLJSONObject, { nullable: true })
+  fields?: Record<string, any>
+}
+
+@InputType()
+export class UpdateContactInput {
+  @Field(() => [GraphQLString], { nullable: true })
+  tags?: string[]
+
+  @Field(() => GraphQLJSONObject, { nullable: true })
+  fields?: Record<string, any>
+}

apps/api/src/chat/resolvers/contact.resolver.ts

@@ -16,13 +16,15 @@ import { GraphqlGuard } from '../../auth/guards/graphql.guard'
 import { IntegrationAccountService } from '../../integration-accounts/services/integration-account.service'
 import { ResultPayload } from '../../users/payloads/user.payloads'
 import { UserService } from '../../users/services/user.service'
-import { Contact } from '../entities/contact'
+import { Contact, CreateContactInput, UpdateContactInput } from '../entities/contact'
 import { ContactService } from '../services/contact.service'
 
 @Resolver(() => Contact)
 @UseGuards(GraphqlGuard)
 @UseInterceptors(AuthorizerInterceptor(Contact))
 export class ContactResolver extends BaseResolver(Contact, {
+  CreateDTOClass: CreateContactInput,
+  UpdateDTOClass: UpdateContactInput,
   guards: [GraphqlGuard],
   enableTotalCount: true,
 }) {

apps/api/src/chat/services/contact.service.ts

@@ -16,6 +16,7 @@ import { uniq } from 'lodash'
 import { ObjectId, WriteError } from 'mongodb'
 import { InjectModel } from 'nestjs-typegoose'
 import { User } from '../../users/entities/user'
+import { UserService } from '../../users/services/user.service'
 import { Contact } from '../entities/contact'
 
 @Injectable()
@@ -26,6 +27,7 @@ export class ContactService extends BaseService<Contact> {
   constructor(
     @InjectModel(Contact) protected readonly model: ReturnModelType<typeof Contact>,
     @InjectQueue('contacts') private contactsQueue: Queue,
+    private userService: UserService,
   ) {
     super(model)
     ContactService.instance = this
@@ -140,6 +142,7 @@ export class ContactService extends BaseService<Contact> {
         const existingTags = contact.tags.map((tag) => tag.toLowerCase())
         const tagsAdded = tags.filter((tag) => !existingTags.includes(tag.toLowerCase()))
         await this.onTagsAdded(contact, tagsAdded)
+        await this.userService.addContactDataKeys(contact.owner._id, [contact])
         return newTags
       }
     }
@@ -176,6 +179,7 @@ export class ContactService extends BaseService<Contact> {
     if (contact.tags?.length) {
       await this.onTagsAdded(contact, contact.tags)
     }
+    await this.userService.addContactDataKeys(contact.owner._id, [contact])
   }
 
   async afterCreateMany(contacts: Contact[]) {
@@ -195,14 +199,15 @@ export class ContactService extends BaseService<Contact> {
         tags: contactsWithTags.flatMap((contact) => contact.tags),
       })
     }
+    await this.userService.addContactDataKeys(contacts[0].owner._id, contacts)
   }
 
   async updateOne(
     id: string,
     update: Partial<Contact>,
     opts?: UpdateOneOptions<Contact> | undefined,
   ): Promise<Contact> {
-    if (!update.tags) {
+    if (!update.tags && !update.fields) {
       return super.updateOne(id, update, opts)
     }
 
@@ -212,11 +217,17 @@ export class ContactService extends BaseService<Contact> {
       throw new NotFoundException(`Contact with id ${id} not found`)
     }
     const contact = await super.updateOne(id, update, opts)
-    const existingTags = contactBefore.tags.map((tag) => tag.toLowerCase())
-    const tagsAdded = update.tags.filter((tag) => !existingTags.includes(tag.toLowerCase()))
-    if (tagsAdded?.length) {
-      await this.onTagsAdded(contact, tagsAdded)
+
+    if (update.tags) {
+      const existingTags = contactBefore.tags.map((tag) => tag.toLowerCase())
+      const tagsAdded = update.tags.filter((tag) => !existingTags.includes(tag.toLowerCase()))
+      if (tagsAdded?.length) {
+        await this.onTagsAdded(contact, tagsAdded)
+      }
     }
+
+    await this.userService.addContactDataKeys(contact.owner._id, [contact])
+
     return contact
   }
 

apps/api/src/users/entities/user.ts

@@ -5,9 +5,10 @@ import { Authorize } from '@ptc-org/nestjs-query-graphql'
 import { prop } from '@typegoose/typegoose'
 import { IsEmail } from 'class-validator'
 import { getAddress, isAddress } from 'ethers/lib/utils'
+import { GraphQLString } from 'graphql'
 import { GraphQLJSONObject } from 'graphql-type-json'
 import { Schema } from 'mongoose'
-import { PlanConfig, defaultPlan, plansConfig } from '../config/plans.config'
+import { defaultPlan, PlanConfig, plansConfig } from '../config/plans.config'
 import { UserAuthorizer } from '../resolvers/user.authorizer'
 
 @ObjectType()
@@ -106,6 +107,14 @@ export class User extends BaseEntity {
   @prop()
   limits?: Record<string, number>
 
+  @Field(() => [GraphQLString], { nullable: true })
+  @prop()
+  contactTags?: string[]
+
+  @Field(() => [GraphQLString], { nullable: true })
+  @prop()
+  contactFields?: string[]
+
   get planConfig(): PlanConfig {
     return plansConfig[this.plan]
   }

apps/api/src/users/services/user.service.ts

@@ -11,6 +11,7 @@ import { SiweMessage } from 'siwe'
 import { SecurityUtils } from '../../../../../libs/common/src/utils/security.utils'
 import { EmailService } from '../../../../../libs/emails/src/services/email.service'
 import { EmailVerificationTemplate } from '../../../../../libs/emails/src/templates/emailVerificationTemplate'
+import { Contact } from '../../chat/entities/contact'
 import { User } from '../entities/user'
 
 @Injectable()
@@ -109,6 +110,44 @@ export class UserService extends BaseService<User> {
     return plainVerificationToken
   }
 
+  async addContactDataKeys(userId: ObjectId, contact: Contact[]): Promise<void> {
+    const allTags = contact.flatMap((contact) => contact.tags)
+    const uniqueTags = Array.from(new Set(allTags))
+
+    const allFields = contact.flatMap((contact) => Object.keys(contact.fields ?? {}))
+    const uniqueFields = Array.from(new Set(allFields))
+
+    if (!uniqueTags.length && !uniqueFields.length) {
+      return
+    }
+
+    const user = await this.findById(userId.toString())
+    if (!user) {
+      throw new NotFoundException(`User ${userId} not found`)
+    }
+
+    const existingTags = user.contactTags ?? []
+    const existingFields = user.contactFields ?? []
+
+    const newTags = uniqueTags.filter((tag) => !existingTags.includes(tag))
+    const newFields = uniqueFields.filter((field) => !existingFields.includes(field))
+
+    if (!newTags.length && !newFields.length) {
+      return
+    }
+
+    await this.updateOneNative(
+      { _id: userId },
+      {
+        $addToSet: {
+          ...(newTags.length && { contactTags: { $each: newTags } }),
+          ...(newFields.length && { contactFields: { $each: newFields } }),
+        },
+      },
+    )
+    this.logger.log(`Added ${newTags.length} tags and ${newFields.length} fields to user ${userId}`)
+  }
+
   async syncIndexes() {
     return this.model.syncIndexes()
   }

generated/graphql.ts

@@ -734,26 +734,23 @@ export interface DeleteOneWorkflowTriggerInput {
 }
 
 export interface CreateOneContactInput {
-    contact: CreateContact;
+    contact: CreateContactInput;
 }
 
-export interface CreateContact {
-    id?: Nullable<string>;
-    createdAt?: Nullable<DateTime>;
-    address?: Nullable<string>;
+export interface CreateContactInput {
+    address: string;
     tags?: Nullable<string[]>;
+    fields?: Nullable<JSONObject>;
 }
 
 export interface UpdateOneContactInput {
     id: string;
-    update: UpdateContact;
+    update: UpdateContactInput;
 }
 
-export interface UpdateContact {
-    id?: Nullable<string>;
-    createdAt?: Nullable<DateTime>;
-    address?: Nullable<string>;
+export interface UpdateContactInput {
     tags?: Nullable<string[]>;
+    fields?: Nullable<JSONObject>;
 }
 
 export interface DeleteOneContactInput {
@@ -918,6 +915,8 @@ export interface User {
     subscribedToNotifications: boolean;
     subscribedToNewsletter: boolean;
     features?: Nullable<JSONObject>;
+    contactTags?: Nullable<string[]>;
+    contactFields?: Nullable<string[]>;
 }
 
 export interface IntegrationAccount {

generated/schema.graphql

@@ -16,6 +16,8 @@ type User {
   subscribedToNotifications: Boolean!
   subscribedToNewsletter: Boolean!
   features: JSONObject
+  contactTags: [String!]
+  contactFields: [String!]
 }
 
 """
@@ -1962,29 +1964,26 @@ input DeleteOneWorkflowTriggerInput {
 
 input CreateOneContactInput {
   """The record to create"""
-  contact: CreateContact!
+  contact: CreateContactInput!
 }
 
-input CreateContact {
-  id: ID
-  createdAt: DateTime
-  address: String
+input CreateContactInput {
+  address: String!
   tags: [String!]
+  fields: JSONObject
 }
 
 input UpdateOneContactInput {
   """The id of the record to update"""
   id: ID!
 
   """The update to apply."""
-  update: UpdateContact!
+  update: UpdateContactInput!
 }
 
-input UpdateContact {
-  id: ID
-  createdAt: DateTime
-  address: String
+input UpdateContactInput {
   tags: [String!]
+  fields: JSONObject
 }
 
 input DeleteOneContactInput {