mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

4008 dont create a contact company if it matches the persons domain (#4088)

Browse Source 
* 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

* create utils

* fix

* Fix getAllByWorkspaceId to throw NotFoundException when no workspace member found

* fix after merge

* use map

* modify after review
This commit is contained in:
bosiraphael
2024-02-21 13:22:01 +01:00
committed by GitHub
parent 11581ca9c3
commit ee7c1fbf5c
5 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.module.ts
View File

@ -1,6 +1,7 @@
import { Module } from '@nestjs/common';
import { PersonModule } from 'src/workspace/messaging/repositories/person/person.module';
import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
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 { CreateContactModule } from 'src/workspace/messaging/services/create-contact/create-contact.module';
@ -11,6 +12,7 @@ import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/wo
WorkspaceDataSourceModule,
CreateContactModule,
CreateCompanyModule,
WorkspaceMemberModule,
PersonModule,
],
providers: [CreateCompaniesAndContactsService],

39
packages/twenty-server/src/workspace/messaging/services/create-companies-and-contacts/create-companies-and-contacts.service.ts
View File

@ -7,6 +7,9 @@ import { getDomainNameFromHandle } from 'src/workspace/messaging/utils/get-domai
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 { PersonService } from 'src/workspace/messaging/repositories/person/person.service';
import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
import { getUniqueParticipantsAndHandles } from 'src/workspace/messaging/utils/get-unique-participants-and-handles.util';
import { filterOutParticipantsFromCompanyOrWorkspace } from 'src/workspace/messaging/utils/filter-out-participants-from-company-or-workspace.util';
@Injectable()
export class CreateCompaniesAndContactsService {
@ -14,6 +17,7 @@ export class CreateCompaniesAndContactsService {
private readonly personService: PersonService,
private readonly createContactService: CreateContactService,
private readonly createCompaniesService: CreateCompanyService,
private readonly workspaceMemberService: WorkspaceMemberService,
) {}
async createCompaniesAndContacts(
@ -22,31 +26,26 @@ export class CreateCompaniesAndContactsService {
workspaceId: string,
transactionManager?: EntityManager,
) {
const selfDomainName = getDomainNameFromHandle(selfHandle);
// 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) {
if (participants.length === 0) {
return;
}
const uniqueHandles = Array.from(
new Set(
participantsFromOtherCompanies.map((participant) => participant.handle),
),
);
const uniqueParticipants = uniqueHandles.map((handle) => {
const participant = participantsFromOtherCompanies.find(
(participant) => participant.handle === handle,
const workspaceMembers =
await this.workspaceMemberService.getAllByWorkspaceId(
workspaceId,
transactionManager,
);
return participant;
}) as Participant[];
// TODO: use isWorkEmail so we can create a contact even if the email is a personal email ex: @gmail.com
const participantsFromOtherCompanies =
filterOutParticipantsFromCompanyOrWorkspace(
participants,
selfHandle,
workspaceMembers,
);
const { uniqueParticipants, uniqueHandles } =
getUniqueParticipantsAndHandles(participantsFromOtherCompanies);
const alreadyCreatedContacts = await this.personService.getByEmails(
uniqueHandles,