merge records composite type (#14005)

/closes #13989

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
neo773
2025-09-08 21:20:26 +05:30
committed by GitHub
parent 9e81618773
commit ad944e1d2c
19 changed files with 1277 additions and 16 deletions
@@ -0,0 +1,252 @@
import { COMPANY_GQL_FIELDS } from 'test/integration/constants/company-gql-fields.constants';
import { createManyOperationFactory } from 'test/integration/graphql/utils/create-many-operation-factory.util';
import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
import { mergeManyOperationFactory } from 'test/integration/graphql/utils/merge-many-operation-factory.util';
import { deleteRecordsByIds } from 'test/integration/utils/delete-records-by-ids';
describe('companies merge resolvers (integration)', () => {
let createdCompanyIds: string[] = [];
afterEach(async () => {
if (createdCompanyIds.length > 0) {
await deleteRecordsByIds('company', createdCompanyIds);
createdCompanyIds = [];
}
});
describe('merging links composite fields', () => {
it('should merge linkedinLink composite field correctly', async () => {
const createCompaniesOperation = createManyOperationFactory({
objectMetadataSingularName: 'company',
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
data: [
{
name: 'Company A',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/company-a',
primaryLinkLabel: 'Main LinkedIn',
secondaryLinks: [
{
url: 'linkedin.com/company/subsidiary-a1',
label: 'Subsidiary A1',
},
{
url: 'linkedin.com/company/subsidiary-a2',
label: 'Subsidiary A2',
},
],
},
},
{
name: 'Company B',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/company-b',
primaryLinkLabel: 'Main LinkedIn',
secondaryLinks: [
{
url: 'linkedin.com/company/subsidiary-b1',
label: 'Subsidiary B1',
},
{
url: 'linkedin.com/company/subsidiary-b2',
label: 'Subsidiary B2',
},
],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createCompaniesOperation,
);
expect(createResponse.body.data.createCompanies).toHaveLength(2);
const company1Id = createResponse.body.data.createCompanies[0].id;
const company2Id = createResponse.body.data.createCompanies[1].id;
createdCompanyIds.push(company1Id, company2Id);
const mergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
ids: [company1Id, company2Id],
conflictPriorityIndex: 0,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeOperation);
expect(mergeResponse.body.errors).toBeUndefined();
const mergedCompany = mergeResponse.body.data.mergeCompanies;
expect(mergedCompany.linkedinLink.primaryLinkUrl).toBe(
'https://linkedin.com/company/company-a',
);
expect(mergedCompany.linkedinLink.primaryLinkLabel).toBe('Main LinkedIn');
expect(mergedCompany.linkedinLink.secondaryLinks).toEqual(
expect.arrayContaining([
expect.objectContaining({
url: 'linkedin.com/company/subsidiary-a1',
}),
expect.objectContaining({
url: 'linkedin.com/company/subsidiary-a2',
}),
expect.objectContaining({
url: 'linkedin.com/company/subsidiary-b1',
}),
expect.objectContaining({
url: 'linkedin.com/company/subsidiary-b2',
}),
]),
);
expect(mergedCompany.linkedinLink.secondaryLinks).toHaveLength(4);
});
it('should merge links with deduplication', async () => {
const createCompaniesOperation = createManyOperationFactory({
objectMetadataSingularName: 'company',
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
data: [
{
name: 'Tech Corp',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/tech-corp',
primaryLinkLabel: '',
secondaryLinks: [
{
url: 'linkedin.com/company/shared-subsidiary',
label: 'Shared Sub',
},
{
url: 'linkedin.com/company/tech-division',
label: 'Tech Division',
},
],
},
},
{
name: 'Corp Tech',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/corp-tech',
primaryLinkLabel: '',
secondaryLinks: [
{
url: 'linkedin.com/company/shared-subsidiary',
label: 'Shared Sub Different Label',
},
{
url: 'linkedin.com/company/corp-division',
label: 'Corp Division',
},
],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createCompaniesOperation,
);
const company1Id = createResponse.body.data.createCompanies[0].id;
const company2Id = createResponse.body.data.createCompanies[1].id;
createdCompanyIds.push(company1Id, company2Id);
const mergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
ids: [company1Id, company2Id],
conflictPriorityIndex: 0,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeOperation);
const mergedCompany = mergeResponse.body.data.mergeCompanies;
expect(mergedCompany.linkedinLink.primaryLinkUrl).toBe(
'https://linkedin.com/company/tech-corp',
);
const secondaryLinks = mergedCompany.linkedinLink.secondaryLinks;
expect(secondaryLinks).toHaveLength(3);
const urls = secondaryLinks.map((link: { url: string }) => link.url);
expect(urls).toEqual(
expect.arrayContaining([
'linkedin.com/company/shared-subsidiary',
'linkedin.com/company/tech-division',
'linkedin.com/company/corp-division',
]),
);
const duplicateCount = urls.filter(
(url: string) => url === 'linkedin.com/company/shared-subsidiary',
).length;
expect(duplicateCount).toBe(1);
});
it('should respect priority index for links unique constraint', async () => {
const createCompaniesOperation = createManyOperationFactory({
objectMetadataSingularName: 'company',
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
data: [
{
name: 'Priority First',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/first-priority',
primaryLinkLabel: 'First Label',
secondaryLinks: [
{ url: 'linkedin.com/company/first-sub', label: 'First Sub' },
],
},
},
{
name: 'Priority Second',
linkedinLink: {
primaryLinkUrl: 'https://linkedin.com/company/second-priority',
primaryLinkLabel: 'Second Label',
secondaryLinks: [
{ url: 'linkedin.com/company/second-sub', label: 'Second Sub' },
],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createCompaniesOperation,
);
const company1Id = createResponse.body.data.createCompanies[0].id;
const company2Id = createResponse.body.data.createCompanies[1].id;
createdCompanyIds.push(company1Id, company2Id);
const mergeWithPriority1 = mergeManyOperationFactory({
objectMetadataPluralName: 'companies',
gqlFields: COMPANY_GQL_FIELDS,
ids: [company1Id, company2Id],
conflictPriorityIndex: 1,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeWithPriority1);
const mergedCompany = mergeResponse.body.data.mergeCompanies;
expect(mergedCompany.linkedinLink.primaryLinkUrl).toBe(
'https://linkedin.com/company/second-priority',
);
expect(mergedCompany.linkedinLink.primaryLinkLabel).toBe('Second Label');
expect(mergedCompany.linkedinLink.secondaryLinks).toEqual(
expect.arrayContaining([
expect.objectContaining({ url: 'linkedin.com/company/first-sub' }),
expect.objectContaining({ url: 'linkedin.com/company/second-sub' }),
]),
);
});
});
});
@@ -0,0 +1,408 @@
import { PERSON_GQL_FIELDS } from 'test/integration/constants/person-gql-fields.constants';
import { createManyOperationFactory } from 'test/integration/graphql/utils/create-many-operation-factory.util';
import { findOneOperationFactory } from 'test/integration/graphql/utils/find-one-operation-factory.util';
import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
import { mergeManyOperationFactory } from 'test/integration/graphql/utils/merge-many-operation-factory.util';
import { deleteRecordsByIds } from 'test/integration/utils/delete-records-by-ids';
describe('people merge resolvers (integration)', () => {
let createdPersonIds: string[] = [];
afterEach(async () => {
if (createdPersonIds.length > 0) {
await deleteRecordsByIds('person', createdPersonIds);
createdPersonIds = [];
}
});
describe('merging composite fields', () => {
it('should merge emails composite field correctly', async () => {
const createPersonsOperation = createManyOperationFactory({
objectMetadataSingularName: 'person',
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
data: [
{
name: {
firstName: 'John',
lastName: 'Doe',
},
emails: {
primaryEmail: 'john@example.com',
additionalEmails: [
'john.alt@example.com',
'john.work@example.com',
],
},
},
{
name: {
firstName: 'Jane',
lastName: 'Doe',
},
emails: {
primaryEmail: 'jane@example.com',
additionalEmails: [
'jane.alt@example.com',
'jane.personal@example.com',
],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createPersonsOperation,
);
expect(createResponse.body.data.createPeople).toHaveLength(2);
const person1Id = createResponse.body.data.createPeople[0].id;
const person2Id = createResponse.body.data.createPeople[1].id;
createdPersonIds.push(person1Id, person2Id);
const mergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
ids: [person1Id, person2Id],
conflictPriorityIndex: 0,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeOperation);
expect(mergeResponse.body.errors).toBeUndefined();
const mergedPerson = mergeResponse.body.data.mergePeople;
expect(mergedPerson.emails.primaryEmail).toBe('john@example.com');
expect(mergedPerson.emails.additionalEmails).toEqual(
expect.arrayContaining([
'john.alt@example.com',
'john.work@example.com',
'jane.alt@example.com',
'jane.personal@example.com',
]),
);
expect(mergedPerson.emails.additionalEmails).toHaveLength(4);
});
it('should merge emails with deduplication', async () => {
const createPersonsOperation = createManyOperationFactory({
objectMetadataSingularName: 'person',
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
data: [
{
name: {
firstName: 'Alice',
lastName: 'Smith',
},
emails: {
primaryEmail: 'alice@example.com',
additionalEmails: [
'shared@example.com',
'alice.work@example.com',
],
},
},
{
name: {
firstName: 'Bob',
lastName: 'Smith',
},
emails: {
primaryEmail: 'bob@example.com',
additionalEmails: ['shared@example.com', 'bob.work@example.com'],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createPersonsOperation,
);
const person1Id = createResponse.body.data.createPeople[0].id;
const person2Id = createResponse.body.data.createPeople[1].id;
createdPersonIds.push(person1Id, person2Id);
const mergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
ids: [person1Id, person2Id],
conflictPriorityIndex: 0,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeOperation);
const mergedPerson = mergeResponse.body.data.mergePeople;
expect(mergedPerson.emails.primaryEmail).toBe('alice@example.com');
const additionalEmails = mergedPerson.emails.additionalEmails;
expect(additionalEmails).toHaveLength(3);
expect(additionalEmails).toEqual(
expect.arrayContaining([
'shared@example.com',
'alice.work@example.com',
'bob.work@example.com',
]),
);
const duplicateCount = additionalEmails.filter(
(email: string) => email === 'shared@example.com',
).length;
expect(duplicateCount).toBe(1);
});
it('should respect priority index for unique constraint fields', async () => {
const createPersonsOperation = createManyOperationFactory({
objectMetadataSingularName: 'person',
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
data: [
{
name: {
firstName: 'First',
lastName: 'Person',
},
emails: {
primaryEmail: 'first@example.com',
additionalEmails: ['first.extra@example.com'],
},
},
{
name: {
firstName: 'Second',
lastName: 'Person',
},
emails: {
primaryEmail: 'second@example.com',
additionalEmails: ['second.extra@example.com'],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createPersonsOperation,
);
const person1Id = createResponse.body.data.createPeople[0].id;
const person2Id = createResponse.body.data.createPeople[1].id;
createdPersonIds.push(person1Id, person2Id);
const mergeWithPriority1 = mergeManyOperationFactory({
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
ids: [person1Id, person2Id],
conflictPriorityIndex: 1,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeWithPriority1);
const mergedPerson = mergeResponse.body.data.mergePeople;
expect(mergedPerson.emails.primaryEmail).toBe('second@example.com');
expect(mergedPerson.emails.additionalEmails).toEqual(
expect.arrayContaining([
'first.extra@example.com',
'second.extra@example.com',
]),
);
});
it('should handle dry run mode', async () => {
const createPersonsOperation = createManyOperationFactory({
objectMetadataSingularName: 'person',
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
data: [
{
name: {
firstName: 'Test1',
lastName: 'User',
},
emails: {
primaryEmail: 'test1@example.com',
additionalEmails: ['test1.extra@example.com'],
},
},
{
name: {
firstName: 'Test2',
lastName: 'User',
},
emails: {
primaryEmail: 'test2@example.com',
additionalEmails: ['test2.extra@example.com'],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createPersonsOperation,
);
const person1Id = createResponse.body.data.createPeople[0].id;
const person2Id = createResponse.body.data.createPeople[1].id;
createdPersonIds.push(person1Id, person2Id);
const dryRunMergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
ids: [person1Id, person2Id],
conflictPriorityIndex: 0,
dryRun: true,
});
const dryRunResponse = await makeGraphqlAPIRequest(dryRunMergeOperation);
expect(dryRunResponse.body.errors).toBeUndefined();
const dryRunResult = dryRunResponse.body.data.mergePeople;
expect(dryRunResult.emails.primaryEmail).toBe('test1@example.com');
expect(dryRunResult.emails.additionalEmails).toEqual(
expect.arrayContaining([
'test1.extra@example.com',
'test2.extra@example.com',
]),
);
const findOriginalPersons = findOneOperationFactory({
objectMetadataSingularName: 'person',
gqlFields: PERSON_GQL_FIELDS,
filter: {
id: {
eq: person2Id,
},
},
});
const findResponse = await makeGraphqlAPIRequest(findOriginalPersons);
expect(findResponse.body.data.person).toBeTruthy();
expect(findResponse.body.data.person.emails.primaryEmail).toBe(
'test2@example.com',
);
});
it('should merge phones and whatsapp composite fields correctly', async () => {
const createPersonsOperation = createManyOperationFactory({
objectMetadataSingularName: 'person',
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
data: [
{
name: {
firstName: 'Alice',
lastName: 'Johnson',
},
phones: {
primaryPhoneNumber: '5551234567',
primaryPhoneCountryCode: 'US',
primaryPhoneCallingCode: '+1',
additionalPhones: [
{
number: '5559876543',
callingCode: '+1',
countryCode: 'US',
},
],
},
whatsapp: {
primaryPhoneNumber: '810407803',
primaryPhoneCountryCode: 'FR',
primaryPhoneCallingCode: '+33',
additionalPhones: [
{
number: '8104078034',
callingCode: '+91',
countryCode: 'IN',
},
],
},
},
{
name: {
firstName: 'Bob',
lastName: 'Johnson',
},
phones: {
primaryPhoneNumber: '4445556789',
primaryPhoneCountryCode: 'US',
primaryPhoneCallingCode: '+1',
additionalPhones: [
{
number: '4441112222',
callingCode: '+1',
countryCode: 'US',
},
],
},
whatsapp: {
primaryPhoneNumber: '987654321',
primaryPhoneCountryCode: 'FR',
primaryPhoneCallingCode: '+33',
additionalPhones: [
{
number: '123456789',
callingCode: '+44',
countryCode: 'GB',
},
],
},
},
],
});
const createResponse = await makeGraphqlAPIRequest(
createPersonsOperation,
);
expect(createResponse.body.data.createPeople).toHaveLength(2);
const person1Id = createResponse.body.data.createPeople[0].id;
const person2Id = createResponse.body.data.createPeople[1].id;
createdPersonIds.push(person1Id, person2Id);
const mergeOperation = mergeManyOperationFactory({
objectMetadataPluralName: 'people',
gqlFields: PERSON_GQL_FIELDS,
ids: [person1Id, person2Id],
conflictPriorityIndex: 0,
});
const mergeResponse = await makeGraphqlAPIRequest(mergeOperation);
expect(mergeResponse.body.errors).toBeUndefined();
const mergedPerson = mergeResponse.body.data.mergePeople;
expect(mergedPerson.phones.primaryPhoneNumber).toBe('5551234567');
expect(mergedPerson.phones.primaryPhoneCountryCode).toBe('US');
expect(mergedPerson.phones.primaryPhoneCallingCode).toBe('+1');
expect(mergedPerson.phones.additionalPhones).toEqual(
expect.arrayContaining([
expect.objectContaining({ number: '5559876543' }),
expect.objectContaining({ number: '4441112222' }),
]),
);
expect(mergedPerson.phones.additionalPhones).toHaveLength(2);
expect(mergedPerson.whatsapp.primaryPhoneNumber).toBe('810407803');
expect(mergedPerson.whatsapp.primaryPhoneCountryCode).toBe('FR');
expect(mergedPerson.whatsapp.primaryPhoneCallingCode).toBe('+33');
expect(mergedPerson.whatsapp.additionalPhones).toEqual(
expect.arrayContaining([
expect.objectContaining({ number: '8104078034' }),
expect.objectContaining({ number: '123456789' }),
]),
);
expect(mergedPerson.whatsapp.additionalPhones).toHaveLength(2);
});
});
});
@@ -0,0 +1,36 @@
import gql from 'graphql-tag';
import { capitalize } from 'twenty-shared/utils';
type MergeManyOperationFactoryParams = {
objectMetadataPluralName: string;
gqlFields: string;
ids: string[];
conflictPriorityIndex: number;
dryRun?: boolean;
};
export const mergeManyOperationFactory = ({
objectMetadataPluralName,
gqlFields,
ids,
conflictPriorityIndex,
dryRun = false,
}: MergeManyOperationFactoryParams) => {
const capitalizedObjectName = capitalize(objectMetadataPluralName);
const mutationName = `merge${capitalizedObjectName}`;
return {
query: gql`
mutation Merge${capitalizedObjectName}($ids: [UUID!]!, $conflictPriorityIndex: Int!, $dryRun: Boolean! = false) {
${mutationName}(ids: $ids, conflictPriorityIndex: $conflictPriorityIndex, dryRun: $dryRun) {
${gqlFields}
}
}
`,
variables: {
ids,
conflictPriorityIndex,
dryRun,
},
};
};