The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Only restore soft-deleted companies on contact auto-creation (#28579)
Adithya960556f7f4321189
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.tsindex bbcfe70e2fa..58956431235 100644--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts@@ -254,7 +254,8 @@ export class CreateCompanyService {domainName: company.domainName,});- return isDefined(existingCompany)+ return isDefined(existingCompany) &&+ isDefined(existingCompany.deletedAt)? {domainName: company.domainName,id: existingCompany.id,diff --git a/packages/twenty-server/test/integration/google/messaging/company-domain-matching.integration-spec.ts b/packages/twenty-server/test/integration/google/messaging/company-domain-matching.integration-spec.tsindex 2e24730f385..e7596f3391d 100644--- a/packages/twenty-server/test/integration/google/messaging/company-domain-matching.integration-spec.ts+++ b/packages/twenty-server/test/integration/google/messaging/company-domain-matching.integration-spec.ts@@ -197,6 +197,52 @@ describe('Gmail contact auto-creation company domain matching (integration)', ()expect(await syncMessageFrom(`sender@${domainName}`)).toBe(liveCompany.id);}, 120000);+ it('leaves a matched live company untouched', async () => {+ const domainName = `untouched-${randomUUID()}.com`;++ const company = await createCompany(domainName);++ const findCompanyUpdatedAt = async () => {+ const [companyNode] = await findRecordNodesByFilter<{+ updatedAt: string;+ }>('company', 'companies', 'updatedAt', { id: { eq: company.id } });++ return companyNode.updatedAt;+ };++ const updatedAtBeforeSync = await findCompanyUpdatedAt();++ expect(await syncMessageFrom(`sender@${domainName}`)).toBe(company.id);+ expect(await findCompanyUpdatedAt()).toBe(updatedAtBeforeSync);+ }, 120000);++ it('restores a deleted company matched on its domain', async () => {+ const domainName = `restored-${randomUUID()}.com`;++ const deletedCompany = await createCompany(domainName);++ await makeGraphqlApiRequest(+ deleteOneOperationFactory({+ objectMetadataSingularName: 'company',+ gqlFields: 'id',+ recordId: deletedCompany.id,+ }),+ );++ expect(await syncMessageFrom(`sender@${domainName}`)).toBe(+ deletedCompany.id,+ );++ const [restoredCompany] = await findRecordNodesByFilter<{ id: string }>(+ 'company',+ 'companies',+ 'id',+ { id: { eq: deletedCompany.id } },+ );++ expect(restoredCompany?.id).toBe(deletedCompany.id);+ }, 120000);+it('attaches a contact to the surviving company on its primary domain', async () => {const survivingDomainName = `surviving-${randomUUID()}.com`;const mergedCompany = await mergeTwoCompanies({