The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(contact-creation): enrich missing names on auto-created contacts (#21018)
Félix Malfait8a74ea882948
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company-and-contact.service.spec.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company-and-contact.service.spec.tsindex 4926ffe5145..1ab28b84244 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company-and-contact.service.spec.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company-and-contact.service.spec.ts@@ -30,6 +30,7 @@ describe('CreateCompanyAndPersonService', () => {};const mockCreatePersonService = {restorePeople: jest.fn(),+ enrichPeopleNames: jest.fn(),};const module: TestingModule = await Test.createTestingModule({@@ -148,5 +149,258 @@ describe('CreateCompanyAndPersonService', () => {result.contactsThatNeedPersonRestore.map((c) => c.handle),).toContain('[email protected]');});++ describe('peopleToEnrichNames', () => {+ const contact: Contact = {+ handle: '[email protected]',+ displayName: 'Félix Malfait',+ };++ const buildExistingPerson = (+ overrides: Record<string, unknown>,+ ): PersonWorkspaceEntity =>+ ({+ id: 'existing-person-1',+ emails: {+ primaryEmail: '[email protected]',+ additionalEmails: null,+ },+ name: { firstName: 'Félix', lastName: '' },+ createdBy: { source: FieldActorSource.EMAIL },+ deletedAt: null,+ ...overrides,+ }) as unknown as PersonWorkspaceEntity;++ it('should enrich an empty lastName on an EMAIL-created contact', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [buildExistingPerson({})],+ FieldActorSource.CALENDAR,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });++ it('should enrich a contact created from CALENDAR too', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [+ buildExistingPerson({+ createdBy: {+ source: FieldActorSource.CALENDAR,+ } as PersonWorkspaceEntity['createdBy'],+ }),+ ],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toHaveLength(1);+ });++ it('should not overwrite an existing non-empty lastName', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [{ handle: '[email protected]', displayName: 'Felix Smith' }],+ [+ buildExistingPerson({+ name: { firstName: 'Félix', lastName: 'Malfait' },+ }),+ ],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([]);+ });++ it('should not touch a manually-created contact', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [+ buildExistingPerson({+ createdBy: {+ source: FieldActorSource.MANUAL,+ } as PersonWorkspaceEntity['createdBy'],+ }),+ ],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([]);+ });++ it('should not touch an IMPORT-created contact', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [+ buildExistingPerson({+ createdBy: {+ source: FieldActorSource.IMPORT,+ } as PersonWorkspaceEntity['createdBy'],+ }),+ ],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([]);+ });++ it('should skip enrichment when the new displayName provides no last name either', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [{ handle: '[email protected]', displayName: 'Félix' }],+ [buildExistingPerson({})],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([]);+ });++ it('should enrich a soft-deleted contact that will be restored in this same batch', () => {+ // Restore runs before enrich in createCompaniesAndPeople — by the time+ // the enrichment UPDATE fires, the row is no longer soft-deleted.+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [buildExistingPerson({ deletedAt: new Date() })],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });++ it('should fill firstName when missing and preserve existing lastName', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [+ buildExistingPerson({+ name: { firstName: '', lastName: 'Malfait' },+ }),+ ],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });++ it('should handle a person with a null name field', () => {+ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [contact],+ [buildExistingPerson({ name: null })],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });++ it('should not emit two enrichments when one Person matches both primary and additional emails in the batch', () => {+ const existingPersonWithMultipleEmails = buildExistingPerson({+ emails: {+ primaryEmail: '[email protected]',+ additionalEmails: ['[email protected]'],+ },+ });++ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [+ { handle: '[email protected]', displayName: 'Félix Malfait' },+ {+ handle: '[email protected]',+ displayName: 'Félix Other',+ },+ ],+ [existingPersonWithMultipleEmails],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });++ it('should merge partial enrichments across contacts mapping to the same Person', () => {+ const existingPersonWithMultipleEmails = buildExistingPerson({+ name: { firstName: '', lastName: '' },+ emails: {+ primaryEmail: '[email protected]',+ additionalEmails: ['[email protected]'],+ },+ });++ const result =+ service.computeContactsThatNeedPersonCreateAndRestoreAndWorkDomainNamesToCreate(+ [+ // First contact only carries a first name.+ { handle: '[email protected]', displayName: 'Félix' },+ // Second contact (additional email) carries both — the lastName+ // should fill in even though the firstName slot is already taken.+ {+ handle: '[email protected]',+ displayName: 'Félix Malfait',+ },+ ],+ [existingPersonWithMultipleEmails],+ FieldActorSource.EMAIL,+ mockConnectedAccount,+ null,+ );++ expect(result.peopleToEnrichNames).toEqual([+ {+ personId: 'existing-person-1',+ name: { firstName: 'Félix', lastName: 'Malfait' },+ },+ ]);+ });+ });});});diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.tsindex e891961adc2..7285c8d4ab3 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts@@ -6,7 +6,8 @@ import chunk from 'lodash.chunk';import compact from 'lodash.compact';import {ConnectedAccountProvider,- type FieldActorSource,+ FieldActorSource,+ type FullNameMetadata,} from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type DeepPartial, type Repository } from 'typeorm';@@ -112,6 +113,7 @@ export class CreateCompanyAndPersonService {const {contactsThatNeedPersonCreate,contactsThatNeedPersonRestore,+ peopleToEnrichNames,workDomainNamesToCreate,shouldCreateOrRestorePeopleByHandleMap,} =@@ -157,6 +159,11 @@ export class CreateCompanyAndPersonService {workspaceId,);+ await this.createPersonService.enrichPeopleNames(+ peopleToEnrichNames,+ workspaceId,+ );+return { ...createdPeople, ...restoredPeople };},authContext,@@ -296,6 +303,11 @@ export class CreateCompanyAndPersonService {return !isNull(existingPerson.deletedAt);});+ const peopleToEnrichNames = this.computePeopleToEnrichNames(+ uniqueContacts,+ shouldCreateOrRestorePeopleByHandleMap,+ );+const workDomainNamesToCreate = compact([...contactsThatNeedPersonCreate, ...contactsThatNeedPersonRestore].map((contact) => {@@ -321,11 +333,93 @@ export class CreateCompanyAndPersonService {return {contactsThatNeedPersonCreate,contactsThatNeedPersonRestore,+ peopleToEnrichNames,workDomainNamesToCreate,shouldCreateOrRestorePeopleByHandleMap,};}+ // Stages per-personId name enrichments for existing People auto-created via+ // CALENDAR or EMAIL. Empty fields are filled from new sources (first+ // non-empty value wins across multiple contacts mapping to the same Person);+ // populated fields are never overwritten.+ private computePeopleToEnrichNames(+ uniqueContacts: Contact[],+ shouldCreateOrRestorePeopleByHandleMap: Map<+ string,+ { existingPerson: PersonWorkspaceEntity }+ >,+ ): { personId: string; name: FullNameMetadata }[] {+ const enrichmentByPersonId = new Map<+ string,+ { firstName: string; lastName: string }+ >();++ for (const contact of uniqueContacts) {+ const existingPerson = shouldCreateOrRestorePeopleByHandleMap.get(+ contact.handle.toLowerCase(),+ )?.existingPerson;++ if (!isDefined(existingPerson)) {+ continue;+ }++ // Soft-deleted matches are restored earlier in the same job, so the+ // enrichment UPDATE runs against an un-deleted row.+ const existingSource = existingPerson.createdBy?.source;++ if (+ existingSource !== FieldActorSource.CALENDAR &&+ existingSource !== FieldActorSource.EMAIL+ ) {+ continue;+ }++ const staged = enrichmentByPersonId.get(existingPerson.id);+ const currentFirstName =+ staged?.firstName ?? existingPerson.name?.firstName ?? '';+ const currentLastName =+ staged?.lastName ?? existingPerson.name?.lastName ?? '';+ const firstNameIsEmpty = !isNonEmptyString(currentFirstName);+ const lastNameIsEmpty = !isNonEmptyString(currentLastName);++ if (!firstNameIsEmpty && !lastNameIsEmpty) {+ continue;+ }++ const { firstName: parsedFirstName, lastName: parsedLastName } =+ getFirstNameAndLastNameFromHandleAndDisplayName(+ contact.handle,+ contact.displayName,+ );++ const enrichedFirstName =+ firstNameIsEmpty && isNonEmptyString(parsedFirstName)+ ? parsedFirstName+ : currentFirstName;+ const enrichedLastName =+ lastNameIsEmpty && isNonEmptyString(parsedLastName)+ ? parsedLastName+ : currentLastName;++ if (+ enrichedFirstName === currentFirstName &&+ enrichedLastName === currentLastName+ ) {+ continue;+ }++ enrichmentByPersonId.set(existingPerson.id, {+ firstName: enrichedFirstName,+ lastName: enrichedLastName,+ });+ }++ return Array.from(enrichmentByPersonId.entries()).map(+ ([personId, name]) => ({ personId, name }),+ );+ }+formatPeopleToCreateFromContacts({contactsToCreate,createdBy,diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.tsindex a1c3d0ab9ed..eaad107477f 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-person.service.ts@@ -1,5 +1,6 @@import { Injectable } from '@nestjs/common';+import { type FullNameMetadata } from 'twenty-shared/types';import { DeepPartial } from 'typeorm';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';@@ -89,6 +90,42 @@ export class CreatePersonService {);}+ public async enrichPeopleNames(+ peopleToEnrich: { personId: string; name: FullNameMetadata }[],+ workspaceId: string,+ ): Promise<DeepPartial<PersonWorkspaceEntity>[]> {+ if (peopleToEnrich.length === 0) {+ return [];+ }++ const authContext = buildSystemAuthContext(workspaceId);++ return this.globalWorkspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const personRepository =+ await this.globalWorkspaceOrmManager.getRepository(+ workspaceId,+ PersonWorkspaceEntity,+ {+ shouldBypassPermissionChecks: true,+ },+ );++ const enrichedPeople = await personRepository.updateMany(+ peopleToEnrich.map(({ personId, name }) => ({+ criteria: personId,+ partialEntity: { name },+ })),+ undefined,+ ['id'],+ );++ return enrichedPeople.raw;+ },+ authContext,+ );+ }+private async getLastPersonPosition(personRepository: WorkspaceRepository<PersonWorkspaceEntity>,): Promise<number> {diff --git a/packages/twenty-server/src/modules/contact-creation-manager/utils/__tests__/get-parsed-name-from-display-name.util.spec.ts b/packages/twenty-server/src/modules/contact-creation-manager/utils/__tests__/get-parsed-name-from-display-name.util.spec.tsindex d1550a40a0c..4f2809ab3cc 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/utils/__tests__/get-parsed-name-from-display-name.util.spec.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/utils/__tests__/get-parsed-name-from-display-name.util.spec.ts@@ -63,6 +63,62 @@ describe('getParsedNameFromDisplayName', () => {expected: { firstName: 'John', lastName: 'Doe' },},},+ {+ title:+ 'should keep a multi-word first name intact when paired with a last name',+ context: {+ displayName: 'Smith, Mary Jane',+ expected: { firstName: 'Mary Jane', lastName: 'Smith' },+ },+ },+ ];++ test.each(testCases)('$title', ({ context: { displayName, expected } }) => {+ expect(getParsedNameFromDisplayName(displayName)).toEqual(expected);+ });+ });++ describe('multi-comma comma-inverted forms', () => {+ const testCases: TestCase[] = [+ {+ title:+ 'should treat the segment before the first comma as the last name and merge the rest into the first name',+ context: {+ displayName: 'Smith, Jane, Jr.',+ expected: { firstName: 'Jane Jr.', lastName: 'Smith' },+ },+ },+ {+ title: 'should keep credential suffixes attached to the first name',+ context: {+ displayName: "O'Brien, Mary, MD",+ expected: { firstName: 'Mary MD', lastName: "O'Brien" },+ },+ },+ {+ title:+ 'should fold a three-part "Last, First, Middle" form into a multi-word first name',+ context: {+ displayName: 'Doe, John, Patrick',+ expected: { firstName: 'John Patrick', lastName: 'Doe' },+ },+ },+ {+ title:+ 'should collapse extra whitespace around the inner commas as it merges',+ context: {+ displayName: 'Smith , Jane , Jr.',+ expected: { firstName: 'Jane Jr.', lastName: 'Smith' },+ },+ },+ {+ title:+ 'should still strip a trailing :GROUP tag after a multi-comma swap',+ context: {+ displayName: 'Smith, Jane, Jr.:GROUP',+ expected: { firstName: 'Jane Jr.', lastName: 'Smith' },+ },+ },];test.each(testCases)('$title', ({ context: { displayName, expected } }) => {diff --git a/packages/twenty-server/src/modules/contact-creation-manager/utils/get-parsed-name-from-display-name.util.ts b/packages/twenty-server/src/modules/contact-creation-manager/utils/get-parsed-name-from-display-name.util.tsindex 8131cff929e..a787f2ef289 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/utils/get-parsed-name-from-display-name.util.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/utils/get-parsed-name-from-display-name.util.ts@@ -24,13 +24,23 @@ export const getParsedNameFromDisplayName = (lastName: stripTrailingGroupTag(parsed.lastName),});- const commaMatch = cleaned.match(/^([^,]+),\s*([^,]+)$/);+ // Comma-inverted forms "Last, First[, Suffix]". Splits on the first comma;+ // any further commas collapse to spaces so firstName is comma-free.+ const commaMatch = cleaned.match(/^([^,]+),\s*(.+)$/);if (isDefined(commaMatch)) {- return withGroupTagsStripped({- firstName: commaMatch[2].trim(),- lastName: commaMatch[1].trim(),- });+ const lastName = commaMatch[1].trim();+ const firstName = commaMatch[2]+ .trim()+ .replace(/\s*,\s*/g, ' ')+ .replace(/\s+/g, ' ');++ if (isNonEmptyString(firstName) && isNonEmptyString(lastName)) {+ return withGroupTagsStripped({+ firstName,+ lastName,+ });+ }}const [firstToken, ...rest] = cleaned.split(/\s+/);