4008 dont create a contact company if it matches the persons domain (#4057)
* Add SettingsAccountsEmailsBlocklistInput story * prevent contact creation from the same company * add todo * improvements * Delete packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsEmailsBlocklistInput.stories.tsx * refactor * modify after review * improve code
This commit is contained in:
@ -32,11 +32,12 @@ export class CreateCompaniesAndContactsAfterSyncJob
|
|||||||
);
|
);
|
||||||
const { workspaceId, messageChannelId } = data;
|
const { workspaceId, messageChannelId } = data;
|
||||||
|
|
||||||
const isContactAutoCreationEnabled =
|
const messageChannel = await this.messageChannelService.getByIds(
|
||||||
await this.messageChannelService.getIsContactAutoCreationEnabledByMessageChannelId(
|
[messageChannelId],
|
||||||
messageChannelId,
|
workspaceId,
|
||||||
workspaceId,
|
);
|
||||||
);
|
|
||||||
|
const { handle, isContactAutoCreationEnabled } = messageChannel[0];
|
||||||
|
|
||||||
if (!isContactAutoCreationEnabled) {
|
if (!isContactAutoCreationEnabled) {
|
||||||
return;
|
return;
|
||||||
@ -49,6 +50,7 @@ export class CreateCompaniesAndContactsAfterSyncJob
|
|||||||
);
|
);
|
||||||
|
|
||||||
await this.createCompaniesAndContactsService.createCompaniesAndContacts(
|
await this.createCompaniesAndContactsService.createCompaniesAndContacts(
|
||||||
|
handle,
|
||||||
messageParticipantsWithoutPersonIdAndWorkspaceMemberId,
|
messageParticipantsWithoutPersonIdAndWorkspaceMemberId,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
);
|
);
|
||||||
|
|||||||
@ -56,23 +56,6 @@ export class MessageChannelService {
|
|||||||
return messageChannel.isContactAutoCreationEnabled;
|
return messageChannel.isContactAutoCreationEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getIsContactAutoCreationEnabledByMessageChannelId(
|
|
||||||
messageChannelId: string,
|
|
||||||
workspaceId: string,
|
|
||||||
): Promise<boolean> {
|
|
||||||
const dataSourceSchema =
|
|
||||||
this.workspaceDataSourceService.getSchemaName(workspaceId);
|
|
||||||
|
|
||||||
const messageChannels =
|
|
||||||
await this.workspaceDataSourceService.executeRawQuery(
|
|
||||||
`SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "id" = $1 LIMIT 1`,
|
|
||||||
[messageChannelId],
|
|
||||||
workspaceId,
|
|
||||||
);
|
|
||||||
|
|
||||||
return messageChannels[0]?.isContactAutoCreationEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async getByIds(
|
public async getByIds(
|
||||||
ids: string[],
|
ids: string[],
|
||||||
workspaceId: string,
|
workspaceId: string,
|
||||||
|
|||||||
@ -205,6 +205,7 @@ export class MessageService {
|
|||||||
|
|
||||||
if (isContactAutoCreationEnabled && messageDirection === 'outgoing') {
|
if (isContactAutoCreationEnabled && messageDirection === 'outgoing') {
|
||||||
await this.createCompaniesAndContactsService.createCompaniesAndContacts(
|
await this.createCompaniesAndContactsService.createCompaniesAndContacts(
|
||||||
|
connectedAccount.handle,
|
||||||
message.participants,
|
message.participants,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
manager,
|
manager,
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
|
|
||||||
|
import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
|
||||||
import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
|
import { CreateCompaniesAndContactsService } from 'src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service';
|
||||||
import { CreateCompanyModule } from 'src/workspace/messaging/services/create-company/create-company.module';
|
import { CreateCompanyModule } from 'src/workspace/messaging/services/create-company/create-company.module';
|
||||||
import { CreateContactModule } from 'src/workspace/messaging/services/create-contact/create-contact.module';
|
import { CreateContactModule } from 'src/workspace/messaging/services/create-contact/create-contact.module';
|
||||||
@ -10,6 +11,7 @@ import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/wo
|
|||||||
WorkspaceDataSourceModule,
|
WorkspaceDataSourceModule,
|
||||||
CreateContactModule,
|
CreateContactModule,
|
||||||
CreateCompanyModule,
|
CreateCompanyModule,
|
||||||
|
PersonModule,
|
||||||
],
|
],
|
||||||
providers: [CreateCompaniesAndContactsService],
|
providers: [CreateCompaniesAndContactsService],
|
||||||
exports: [CreateCompaniesAndContactsService],
|
exports: [CreateCompaniesAndContactsService],
|
||||||
|
|||||||
@ -2,47 +2,56 @@ import { Injectable } from '@nestjs/common';
|
|||||||
|
|
||||||
import { EntityManager } from 'typeorm';
|
import { EntityManager } from 'typeorm';
|
||||||
|
|
||||||
import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
|
|
||||||
import { Participant } from 'src/workspace/messaging/types/gmail-message';
|
import { Participant } from 'src/workspace/messaging/types/gmail-message';
|
||||||
import { getDomainNameFromHandle } from 'src/workspace/messaging/utils/get-domain-name-from-handle.util';
|
import { getDomainNameFromHandle } from 'src/workspace/messaging/utils/get-domain-name-from-handle.util';
|
||||||
import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
|
import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
|
||||||
import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
|
import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
|
||||||
|
import { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class CreateCompaniesAndContactsService {
|
export class CreateCompaniesAndContactsService {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
|
private readonly personService: PersonService,
|
||||||
private readonly createContactService: CreateContactService,
|
private readonly createContactService: CreateContactService,
|
||||||
private readonly createCompaniesService: CreateCompanyService,
|
private readonly createCompaniesService: CreateCompanyService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async createCompaniesAndContacts(
|
async createCompaniesAndContacts(
|
||||||
|
selfHandle: string,
|
||||||
participants: Participant[],
|
participants: Participant[],
|
||||||
workspaceId: string,
|
workspaceId: string,
|
||||||
transactionManager?: EntityManager,
|
transactionManager?: EntityManager,
|
||||||
) {
|
) {
|
||||||
const dataSourceSchema =
|
const selfDomainName = getDomainNameFromHandle(selfHandle);
|
||||||
this.workspaceDataSourceService.getSchemaName(workspaceId);
|
|
||||||
|
// TODO: use isWorkEmail so we can create a contact even if the email is a personal email
|
||||||
|
const participantsFromOtherCompanies = participants.filter(
|
||||||
|
(participant) =>
|
||||||
|
getDomainNameFromHandle(participant.handle) !== selfDomainName,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!participantsFromOtherCompanies.length) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const uniqueHandles = Array.from(
|
const uniqueHandles = Array.from(
|
||||||
new Set(participants.map((participant) => participant.handle)),
|
new Set(
|
||||||
|
participantsFromOtherCompanies.map((participant) => participant.handle),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const uniqueParticipants = uniqueHandles.map((handle) => {
|
const uniqueParticipants = uniqueHandles.map((handle) => {
|
||||||
const participant = participants.find(
|
const participant = participantsFromOtherCompanies.find(
|
||||||
(participant) => participant.handle === handle,
|
(participant) => participant.handle === handle,
|
||||||
);
|
);
|
||||||
|
|
||||||
return participant;
|
return participant;
|
||||||
}) as Participant[];
|
}) as Participant[];
|
||||||
|
|
||||||
const alreadyCreatedContacts =
|
const alreadyCreatedContacts = await this.personService.getByEmails(
|
||||||
await this.workspaceDataSourceService.executeRawQuery(
|
uniqueHandles,
|
||||||
`SELECT email FROM ${dataSourceSchema}."person" WHERE "email" = ANY($1)`,
|
workspaceId,
|
||||||
[uniqueParticipants.map((participant) => participant.handle)],
|
);
|
||||||
workspaceId,
|
|
||||||
transactionManager,
|
|
||||||
);
|
|
||||||
|
|
||||||
const alreadyCreatedContactEmails: string[] = alreadyCreatedContacts?.map(
|
const alreadyCreatedContactEmails: string[] = alreadyCreatedContacts?.map(
|
||||||
({ email }) => email,
|
({ email }) => email,
|
||||||
|
|||||||
Reference in New Issue
Block a user