The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Read Calendar and Email timelines from target junctions (#24782)
Félix Malfait2265d280c87b
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 95c05195737..c8e29deade6 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1832,6 +1832,7 @@ enum FeatureFlagKey {IS_WORKFLOW_CORE_INDEX_PAGE_ENABLEDIS_WORKFLOW_DISPATCH_FROM_CORE_ENABLEDIS_API_RATE_LIMIT_V2_ENABLED+ IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED}type WorkspaceUrls {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 22b449066cb..5f48ebde79c 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1468,7 +1468,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED'+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED'export interface WorkspaceUrls {customUrl?: Scalars['String']@@ -10069,7 +10069,8 @@ export const enumFeatureFlagKey = {IS_WORKFLOW_VERSION_IN_CORE_ENABLED: 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' as const,IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' as const,IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED: 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' as const,- IS_API_RATE_LIMIT_V2_ENABLED: 'IS_API_RATE_LIMIT_V2_ENABLED' as const+ IS_API_RATE_LIMIT_V2_ENABLED: 'IS_API_RATE_LIMIT_V2_ENABLED' as const,+ IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED: 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' as const}export const enumIdentityProviderType = {diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 76477258a0f..9880ce3e647 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -399,6 +399,7 @@ export enum FeatureFlagKey {IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',+ IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 99b5314e22e..d6c72844ddb 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1867,6 +1867,7 @@ export enum FeatureFlagKey {IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',+ IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.tsindex a3e99aee08d..227d6aba1ba 100644--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.module.ts@@ -9,12 +9,14 @@ import { RelatedPersonIdsModule } from 'src/engine/core-modules/related-person-iimport { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { UserModule } from 'src/engine/core-modules/user/user.module';+import { TargetModule } from 'src/engine/core-modules/target/target.module';@Module({imports: [FileUrlModule,UserModule,RelatedPersonIdsModule,+ TargetModule,TypeOrmModule.forFeature([CalendarChannelEntity,ConnectedAccountEntity,diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.tsindex 5a1d931904c..3ef33d45751 100644--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts@@ -11,6 +11,8 @@ import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from 'src/engine/core-moduimport { type TimelineCalendarEventsWithTotalDTO } from 'src/engine/core-modules/calendar/dtos/timeline-calendar-events-with-total.dto';import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';import { RelatedPersonIdsService } from 'src/engine/core-modules/related-person-ids/services/related-person-ids.service';+import { type TargetFilter } from 'src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util';+import { MessageCalendarTargetReadinessService } from 'src/engine/core-modules/target/services/message-calendar-target-readiness.service';import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';@@ -33,6 +35,7 @@ export class TimelineCalendarEventService {private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,private readonly relatedPersonIdsService: RelatedPersonIdsService,private readonly fileUrlService: FileUrlService,+ private readonly messageCalendarTargetReadinessService: MessageCalendarTargetReadinessService,) {}async getCalendarEventsFromPersonIds({@@ -41,12 +44,14 @@ export class TimelineCalendarEventService {workspaceId,page = 1,pageSize = TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,+ targetFilter,}: {currentWorkspaceMemberId: string;personIds: string[];workspaceId: string;page: number;pageSize: number;+ targetFilter?: TargetFilter;}): Promise<TimelineCalendarEventsWithTotalDTO> {const authContext = buildSystemAuthContext(workspaceId);@@ -67,20 +72,24 @@ export class TimelineCalendarEventService {{ shouldBypassPermissionChecks: true },);+ const where = isDefined(targetFilter)+ ? {+ calendarEventTargets: {+ [targetFilter.fieldName]: targetFilter.recordId,+ },+ }+ : {+ calendarEventParticipants: {+ personId: Any(personIds),+ },+ };+const totalNumberOfCalendarEvents = await calendarEventRepository.count({- where: {- calendarEventParticipants: {- personId: Any(personIds),- },- },+ where,});const calendarEventIds = await calendarEventRepository.find({- where: {- calendarEventParticipants: {- personId: Any(personIds),- },- },+ where,select: {id: true,startsAt: true,@@ -346,8 +355,14 @@ export class TimelineCalendarEventService {objectNameSingular,recordId,});+ const targetFilter =+ await this.messageCalendarTargetReadinessService.resolveTargetFilter({+ objectNameSingular,+ recordId,+ workspaceId,+ });- if (personIds.length === 0) {+ if (!isDefined(targetFilter) && personIds.length === 0) {return {totalNumberOfCalendarEvents: 0,timelineCalendarEvents: [],@@ -361,6 +376,7 @@ export class TimelineCalendarEventService {workspaceId,page,pageSize,+ ...(isDefined(targetFilter) && { targetFilter }),});}}diff --git a/packages/twenty-server/src/engine/core-modules/messaging/services/get-messages.service.ts b/packages/twenty-server/src/engine/core-modules/messaging/services/get-messages.service.tsindex 6a647994d4b..d80297f291a 100644--- a/packages/twenty-server/src/engine/core-modules/messaging/services/get-messages.service.ts+++ b/packages/twenty-server/src/engine/core-modules/messaging/services/get-messages.service.ts@@ -1,16 +1,21 @@import { Injectable } from '@nestjs/common';+import { isDefined } from 'twenty-shared/utils';+import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from 'src/engine/core-modules/messaging/constants/messaging.constants';import { type TimelineThreadsWithTotalDTO } from 'src/engine/core-modules/messaging/dtos/timeline-threads-with-total.dto';import { TimelineMessagingService } from 'src/engine/core-modules/messaging/services/timeline-messaging.service';import { formatThreads } from 'src/engine/core-modules/messaging/utils/format-threads.util';import { RelatedPersonIdsService } from 'src/engine/core-modules/related-person-ids/services/related-person-ids.service';+import { type TargetFilter } from 'src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util';+import { MessageCalendarTargetReadinessService } from 'src/engine/core-modules/target/services/message-calendar-target-readiness.service';@Injectable()export class GetMessagesService {constructor(private readonly timelineMessagingService: TimelineMessagingService,private readonly relatedPersonIdsService: RelatedPersonIdsService,+ private readonly messageCalendarTargetReadinessService: MessageCalendarTargetReadinessService,) {}async getMessagesFromPersonIds(@@ -19,6 +24,7 @@ export class GetMessagesService {workspaceId: string,page = 1,pageSize: number = TIMELINE_THREADS_DEFAULT_PAGE_SIZE,+ targetFilter?: TargetFilter,): Promise<TimelineThreadsWithTotalDTO> {const offset = (page - 1) * pageSize;@@ -28,6 +34,7 @@ export class GetMessagesService {workspaceId,offset,pageSize,+ targetFilter,);if (!messageThreads) {@@ -79,8 +86,14 @@ export class GetMessagesService {objectNameSingular,recordId,});+ const targetFilter =+ await this.messageCalendarTargetReadinessService.resolveTargetFilter({+ objectNameSingular,+ recordId,+ workspaceId,+ });- if (personIds.length === 0) {+ if (!isDefined(targetFilter) && personIds.length === 0) {return {totalNumberOfThreads: 0,timelineThreads: [],@@ -94,6 +107,7 @@ export class GetMessagesService {workspaceId,page,pageSize,+ targetFilter,);}}diff --git a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.tsindex 293c0ea542c..d7d68fd8574 100644--- a/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts+++ b/packages/twenty-server/src/engine/core-modules/messaging/services/timeline-messaging.service.ts@@ -5,13 +5,16 @@ import {MessageChannelVisibility,MessageParticipantRole,} from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import { In, type Repository } from 'typeorm';import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';import { type TimelineThreadDTO } from 'src/engine/core-modules/messaging/dtos/timeline-thread.dto';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { type TargetFilter } from 'src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';+import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { type MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';@@ -36,6 +39,7 @@ export class TimelineMessagingService {workspaceId: string,offset: number,pageSize: number,+ targetFilter?: TargetFilter,): Promise<{messageThreads: Omit<TimelineThreadDTO,@@ -55,30 +59,49 @@ export class TimelineMessagingService {'messageThread',);- const totalNumberOfThreads = await messageThreadRepository+ const totalQueryBuilder = messageThreadRepository.createQueryBuilder('messageThread').innerJoin('messageThread.messages', 'messages')- .innerJoin('messages.messageParticipants', 'messageParticipants')- .where('messageParticipants.personId IN(:...personIds)', {- personIds,- })- .groupBy('messageThread.id')- .getCount();-- const threadIdsQuery = await messageThreadRepository+ .groupBy('messageThread.id');+ const threadIdsQueryBuilder = messageThreadRepository.createQueryBuilder('messageThread').select('messageThread.id', 'id').addSelect('MAX(messages.receivedAt)', 'max_received_at').innerJoin('messageThread.messages', 'messages')- .innerJoin('messages.messageParticipants', 'messageParticipants')- .where('messageParticipants.personId IN (:...personIds)', {- personIds,- }).groupBy('messageThread.id').orderBy('max_received_at', 'DESC').offset(offset)- .limit(pageSize)- .getRawMany();+ .limit(pageSize);++ const applyRecordFilter = (+ queryBuilder: WorkspaceSelectQueryBuilder,+ ): void => {+ if (isDefined(targetFilter)) {+ queryBuilder+ .innerJoin(+ 'messageThread.messageThreadTargets',+ 'messageThreadTargets',+ )+ .where(+ `messageThreadTargets.${targetFilter.fieldName} = :targetRecordId`,+ { targetRecordId: targetFilter.recordId },+ );++ return;+ }++ queryBuilder+ .innerJoin('messages.messageParticipants', 'messageParticipants')+ .where('messageParticipants.personId IN(:...personIds)', {+ personIds,+ });+ };++ applyRecordFilter(totalQueryBuilder);+ applyRecordFilter(threadIdsQueryBuilder);++ const totalNumberOfThreads = await totalQueryBuilder.getCount();+ const threadIdsQuery = await threadIdsQueryBuilder.getRawMany();const messageThreadIds = threadIdsQuery.map((thread) => thread.id);diff --git a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.tsindex ad4cde44461..7378fdd89d1 100644--- a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.module.ts@@ -14,6 +14,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permiimport { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { TargetModule } from 'src/engine/core-modules/target/target.module';@Module({imports: [@@ -24,6 +25,7 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-FeatureFlagModule,PermissionsModule,RelatedPersonIdsModule,+ TargetModule,TypeOrmModule.forFeature([MessageChannelEntity,ConnectedAccountEntity,diff --git a/packages/twenty-server/src/engine/core-modules/target/constants/message-calendar-target-migration.constants.ts b/packages/twenty-server/src/engine/core-modules/target/constants/message-calendar-target-migration.constants.tsindex b1f5574b4da..479c8949089 100644--- a/packages/twenty-server/src/engine/core-modules/target/constants/message-calendar-target-migration.constants.ts+++ b/packages/twenty-server/src/engine/core-modules/target/constants/message-calendar-target-migration.constants.ts@@ -1,3 +1,2 @@export const MESSAGE_CALENDAR_TARGET_MIGRATION_VERSION = '2.37.0';export const MESSAGE_CALENDAR_TARGET_BACKFILL_TIMESTAMP = 1787832413051;-export const MESSAGE_CALENDAR_TARGET_BACKFILL_UPGRADE_COMMAND_NAME = `${MESSAGE_CALENDAR_TARGET_MIGRATION_VERSION}_BackfillMessageCalendarTargetsCommand_${MESSAGE_CALENDAR_TARGET_BACKFILL_TIMESTAMP}`;diff --git a/packages/twenty-server/src/engine/core-modules/target/services/message-calendar-target-readiness.service.ts b/packages/twenty-server/src/engine/core-modules/target/services/message-calendar-target-readiness.service.tsnew file mode 100644index 00000000000..3b5963ffe67--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/target/services/message-calendar-target-readiness.service.ts@@ -0,0 +1,65 @@+import { Injectable } from '@nestjs/common';++import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { FeatureFlagKey } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';++import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';+import {+ getTargetFieldNameForObjectRecord,+ type TargetFilter,+} from 'src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++@Injectable()+export class MessageCalendarTargetReadinessService {+ constructor(+ private readonly featureFlagService: FeatureFlagService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {}++ async resolveTargetFilter({+ objectNameSingular,+ recordId,+ workspaceId,+ }: {+ objectNameSingular: string;+ recordId: string;+ workspaceId: string;+ }): Promise<TargetFilter | undefined> {+ const fieldName = getTargetFieldNameForObjectRecord(objectNameSingular);++ if (!isDefined(fieldName) || !(await this.isReady(workspaceId))) {+ return undefined;+ }++ return { fieldName, recordId };+ }++ async isReady(workspaceId: string): Promise<boolean> {+ const isReadEnabled = await this.featureFlagService.isFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED,+ workspaceId,+ );++ if (!isReadEnabled) {+ return false;+ }++ // A premature flag flip on a workspace whose metadata sync has not run+ // must degrade to legacy reads, not break the timeline relation join.+ const { flatObjectMetadataMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatObjectMetadataMaps',+ ]);++ return [+ STANDARD_OBJECTS.calendarEventTarget.universalIdentifier,+ STANDARD_OBJECTS.messageThreadTarget.universalIdentifier,+ ].every((universalIdentifier) =>+ isDefined(+ flatObjectMetadataMaps.byUniversalIdentifier[universalIdentifier],+ ),+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/target/target.module.ts b/packages/twenty-server/src/engine/core-modules/target/target.module.tsnew file mode 100644index 00000000000..06bf7b7f6ef--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/target/target.module.ts@@ -0,0 +1,12 @@+import { Module } from '@nestjs/common';++import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { MessageCalendarTargetReadinessService } from 'src/engine/core-modules/target/services/message-calendar-target-readiness.service';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';++@Module({+ imports: [FeatureFlagModule, WorkspaceCacheModule],+ providers: [MessageCalendarTargetReadinessService],+ exports: [MessageCalendarTargetReadinessService],+})+export class TargetModule {}diff --git a/packages/twenty-server/src/engine/core-modules/target/utils/__tests__/get-target-field-name-for-object-record.util.spec.ts b/packages/twenty-server/src/engine/core-modules/target/utils/__tests__/get-target-field-name-for-object-record.util.spec.tsnew file mode 100644index 00000000000..26c96447b4c--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/target/utils/__tests__/get-target-field-name-for-object-record.util.spec.ts@@ -0,0 +1,19 @@+import { CoreObjectNameSingular } from 'twenty-shared/types';++import { getTargetFieldNameForObjectRecord } from 'src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util';++describe('getTargetFieldNameForObjectRecord', () => {+ it.each([+ [CoreObjectNameSingular.Person, 'targetPersonId'],+ [CoreObjectNameSingular.Company, 'targetCompanyId'],+ [CoreObjectNameSingular.Opportunity, 'targetOpportunityId'],+ ])('maps %s to %s', (objectNameSingular, targetFieldName) => {+ expect(getTargetFieldNameForObjectRecord(objectNameSingular)).toBe(+ targetFieldName,+ );+ });++ it('keeps custom objects on the related-person fallback', () => {+ expect(getTargetFieldNameForObjectRecord('pet')).toBeNull();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util.ts b/packages/twenty-server/src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util.tsnew file mode 100644index 00000000000..6438631a09a--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/target/utils/get-target-field-name-for-object-record.util.ts@@ -0,0 +1,26 @@+import { CoreObjectNameSingular } from 'twenty-shared/types';++export type TargetFieldName =+ | 'targetPersonId'+ | 'targetCompanyId'+ | 'targetOpportunityId';++export type TargetFilter = {+ fieldName: TargetFieldName;+ recordId: string;+};++export const getTargetFieldNameForObjectRecord = (+ objectNameSingular: string,+): TargetFieldName | null => {+ switch (objectNameSingular) {+ case CoreObjectNameSingular.Person:+ return 'targetPersonId';+ case CoreObjectNameSingular.Company:+ return 'targetCompanyId';+ case CoreObjectNameSingular.Opportunity:+ return 'targetOpportunityId';+ default:+ return null;+ }+};diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex 13a94c88b71..396f74dab38 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -8,6 +8,7 @@ const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {[FeatureFlagKey.IS_UNIQUE_INDEXES_ENABLED]: false,[FeatureFlagKey.IS_EMAIL_GROUP_ENABLED]: true,[FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED]: true,+ [FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED]: true,};type SeedFeatureFlagsArgs = {diff --git a/packages/twenty-server/test/integration/graphql/suites/timeline-from-object-record.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/timeline-from-object-record.integration-spec.tsindex cf9b46f102b..8f4f0ef65fc 100644--- a/packages/twenty-server/test/integration/graphql/suites/timeline-from-object-record.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/timeline-from-object-record.integration-spec.ts@@ -1,11 +1,14 @@import gql from 'graphql-tag';import { type DocumentNode } from 'graphql';import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';+import { deleteOneOperationFactory } from 'test/integration/graphql/utils/delete-one-operation-factory.util';import { destroyOneOperationFactory } from 'test/integration/graphql/utils/destroy-one-operation-factory.util';import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';+import { FeatureFlagKey } from 'twenty-shared/types';const PAGE_SIZE = 50;@@ -72,10 +75,12 @@ const requestTimeline = (query: DocumentNode,objectNameSingular: string,recordId: string,+ page = 1,+ pageSize = PAGE_SIZE,) =>makeGraphqlAPIRequest({query,- variables: { objectNameSingular, recordId, page: 1, pageSize: PAGE_SIZE },+ variables: { objectNameSingular, recordId, page, pageSize },});const TIMELINE_COMPANY_ID = '20202020-7e57-4000-8000-000000000001';@@ -86,10 +91,66 @@ const TIMELINE_MESSAGE_PARTICIPANT_ID = '20202020-7e57-4000-8000-000000000005';const TIMELINE_CALENDAR_EVENT_ID = '20202020-7e57-4000-8000-000000000006';const TIMELINE_CALENDAR_EVENT_PARTICIPANT_ID ='20202020-7e57-4000-8000-000000000007';+const TIMELINE_MESSAGE_THREAD_PERSON_TARGET_ID =+ '20202020-7e57-4000-8000-000000000008';+const TIMELINE_MESSAGE_THREAD_COMPANY_TARGET_ID =+ '20202020-7e57-4000-8000-000000000009';+const TIMELINE_CALENDAR_EVENT_PERSON_TARGET_ID =+ '20202020-7e57-4000-8000-00000000000a';+const TIMELINE_CALENDAR_EVENT_COMPANY_TARGET_ID =+ '20202020-7e57-4000-8000-00000000000b';+const TIMELINE_MANUAL_COMPANY_ID = '20202020-7e57-4000-8000-00000000000c';+const TIMELINE_MESSAGE_THREAD_MANUAL_COMPANY_TARGET_ID =+ '20202020-7e57-4000-8000-00000000000d';+const TIMELINE_CALENDAR_EVENT_MANUAL_COMPANY_TARGET_ID =+ '20202020-7e57-4000-8000-00000000000e';+const TIMELINE_SECOND_MESSAGE_THREAD_ID =+ '20202020-7e57-4000-8000-00000000000f';+const TIMELINE_SECOND_MESSAGE_ID = '20202020-7e57-4000-8000-000000000010';+const TIMELINE_SECOND_MESSAGE_THREAD_TARGET_ID =+ '20202020-7e57-4000-8000-000000000011';+const TIMELINE_SECOND_CALENDAR_EVENT_ID =+ '20202020-7e57-4000-8000-000000000012';+const TIMELINE_SECOND_CALENDAR_EVENT_TARGET_ID =+ '20202020-7e57-4000-8000-000000000013';+const TIMELINE_SECOND_MESSAGE_PARTICIPANT_ID =+ '20202020-7e57-4000-8000-000000000014';// Destroyed in afterAll in child-before-parent order to satisfy foreign keys.const TIMELINE_FIXTURES: { objectMetadataSingularName: string; id: string }[] =[+ {+ objectMetadataSingularName: 'calendarEventTarget',+ id: TIMELINE_SECOND_CALENDAR_EVENT_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'messageThreadTarget',+ id: TIMELINE_SECOND_MESSAGE_THREAD_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'calendarEventTarget',+ id: TIMELINE_CALENDAR_EVENT_MANUAL_COMPANY_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'messageThreadTarget',+ id: TIMELINE_MESSAGE_THREAD_MANUAL_COMPANY_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'calendarEventTarget',+ id: TIMELINE_CALENDAR_EVENT_COMPANY_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'calendarEventTarget',+ id: TIMELINE_CALENDAR_EVENT_PERSON_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'messageThreadTarget',+ id: TIMELINE_MESSAGE_THREAD_COMPANY_TARGET_ID,+ },+ {+ objectMetadataSingularName: 'messageThreadTarget',+ id: TIMELINE_MESSAGE_THREAD_PERSON_TARGET_ID,+ },{objectMetadataSingularName: 'calendarEventParticipant',id: TIMELINE_CALENDAR_EVENT_PARTICIPANT_ID,@@ -98,16 +159,33 @@ const TIMELINE_FIXTURES: { objectMetadataSingularName: string; id: string }[] =objectMetadataSingularName: 'calendarEvent',id: TIMELINE_CALENDAR_EVENT_ID,},+ {+ objectMetadataSingularName: 'calendarEvent',+ id: TIMELINE_SECOND_CALENDAR_EVENT_ID,+ },{objectMetadataSingularName: 'messageParticipant',id: TIMELINE_MESSAGE_PARTICIPANT_ID,},+ {+ objectMetadataSingularName: 'messageParticipant',+ id: TIMELINE_SECOND_MESSAGE_PARTICIPANT_ID,+ },{ objectMetadataSingularName: 'message', id: TIMELINE_MESSAGE_ID },+ {+ objectMetadataSingularName: 'message',+ id: TIMELINE_SECOND_MESSAGE_ID,+ },{objectMetadataSingularName: 'messageThread',id: TIMELINE_MESSAGE_THREAD_ID,},+ {+ objectMetadataSingularName: 'messageThread',+ id: TIMELINE_SECOND_MESSAGE_THREAD_ID,+ },{ objectMetadataSingularName: 'person', id: TIMELINE_PERSON_ID },+ { objectMetadataSingularName: 'company', id: TIMELINE_MANUAL_COMPANY_ID },{ objectMetadataSingularName: 'company', id: TIMELINE_COMPANY_ID },];@@ -131,6 +209,12 @@ describe('timeline from object record resolvers (integration)', () => {let personWithEvents: { id: string; companyId: string };beforeAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED,+ value: true,+ expectToFail: false,+ });+await createTimelineRecord('company', {id: TIMELINE_COMPANY_ID,name: 'Timeline Source Company',@@ -142,6 +226,11 @@ describe('timeline from object record resolvers (integration)', () => {companyId: TIMELINE_COMPANY_ID,});+ await createTimelineRecord('company', {+ id: TIMELINE_MANUAL_COMPANY_ID,+ name: 'Timeline Manual Company',+ });+await createTimelineRecord('messageThread', {id: TIMELINE_MESSAGE_THREAD_ID,});@@ -163,6 +252,51 @@ describe('timeline from object record resolvers (integration)', () => {displayName: 'Timeline Source',});+ await createTimelineRecord('messageThreadTarget', {+ id: TIMELINE_MESSAGE_THREAD_PERSON_TARGET_ID,+ messageThreadId: TIMELINE_MESSAGE_THREAD_ID,+ targetPersonId: TIMELINE_PERSON_ID,+ });++ await createTimelineRecord('messageThreadTarget', {+ id: TIMELINE_MESSAGE_THREAD_COMPANY_TARGET_ID,+ messageThreadId: TIMELINE_MESSAGE_THREAD_ID,+ targetCompanyId: TIMELINE_COMPANY_ID,+ });++ await createTimelineRecord('messageThreadTarget', {+ id: TIMELINE_MESSAGE_THREAD_MANUAL_COMPANY_TARGET_ID,+ messageThreadId: TIMELINE_MESSAGE_THREAD_ID,+ targetCompanyId: TIMELINE_MANUAL_COMPANY_ID,+ });++ await createTimelineRecord('messageThread', {+ id: TIMELINE_SECOND_MESSAGE_THREAD_ID,+ });++ await createTimelineRecord('message', {+ id: TIMELINE_SECOND_MESSAGE_ID,+ messageThreadId: TIMELINE_SECOND_MESSAGE_THREAD_ID,+ subject: 'Second timeline target thread',+ text: 'Second timeline target message body',+ receivedAt: new Date(Date.now() + 60_000).toISOString(),+ });++ await createTimelineRecord('messageParticipant', {+ id: TIMELINE_SECOND_MESSAGE_PARTICIPANT_ID,+ messageId: TIMELINE_SECOND_MESSAGE_ID,+ personId: TIMELINE_PERSON_ID,+ role: 'FROM',+ handle: '[email protected]',+ displayName: 'Timeline Source',+ });++ await createTimelineRecord('messageThreadTarget', {+ id: TIMELINE_SECOND_MESSAGE_THREAD_TARGET_ID,+ messageThreadId: TIMELINE_SECOND_MESSAGE_THREAD_ID,+ targetCompanyId: TIMELINE_MANUAL_COMPANY_ID,+ });+await createTimelineRecord('calendarEvent', {id: TIMELINE_CALENDAR_EVENT_ID,title: 'Timeline source event',@@ -181,6 +315,38 @@ describe('timeline from object record resolvers (integration)', () => {isOrganizer: true,});+ await createTimelineRecord('calendarEventTarget', {+ id: TIMELINE_CALENDAR_EVENT_PERSON_TARGET_ID,+ calendarEventId: TIMELINE_CALENDAR_EVENT_ID,+ targetPersonId: TIMELINE_PERSON_ID,+ });++ await createTimelineRecord('calendarEventTarget', {+ id: TIMELINE_CALENDAR_EVENT_COMPANY_TARGET_ID,+ calendarEventId: TIMELINE_CALENDAR_EVENT_ID,+ targetCompanyId: TIMELINE_COMPANY_ID,+ });++ await createTimelineRecord('calendarEventTarget', {+ id: TIMELINE_CALENDAR_EVENT_MANUAL_COMPANY_TARGET_ID,+ calendarEventId: TIMELINE_CALENDAR_EVENT_ID,+ targetCompanyId: TIMELINE_MANUAL_COMPANY_ID,+ });++ await createTimelineRecord('calendarEvent', {+ id: TIMELINE_SECOND_CALENDAR_EVENT_ID,+ title: 'Second timeline target event',+ isFullDay: false,+ startsAt: new Date(Date.now() + 60_000).toISOString(),+ endsAt: new Date(Date.now() + 120_000).toISOString(),+ });++ await createTimelineRecord('calendarEventTarget', {+ id: TIMELINE_SECOND_CALENDAR_EVENT_TARGET_ID,+ calendarEventId: TIMELINE_SECOND_CALENDAR_EVENT_ID,+ targetCompanyId: TIMELINE_MANUAL_COMPANY_ID,+ });+personWithThreads = {id: TIMELINE_PERSON_ID,companyId: TIMELINE_COMPANY_ID,@@ -255,6 +421,124 @@ describe('timeline from object record resolvers (integration)', () => {expect(companyEventCount).toBeGreaterThanOrEqual(personEventCount);});+ it('should expose manual company targets without a related person', async () => {+ const [threadResponse, calendarResponse] = await Promise.all([+ requestTimeline(+ GET_TIMELINE_THREADS,+ 'company',+ TIMELINE_MANUAL_COMPANY_ID,+ ),+ requestTimeline(+ GET_TIMELINE_CALENDAR_EVENTS,+ 'company',+ TIMELINE_MANUAL_COMPANY_ID,+ ),+ ]);++ expect(threadResponse.body.errors).toBeUndefined();+ expect(calendarResponse.body.errors).toBeUndefined();+ expect(+ threadResponse.body.data.getTimelineThreadsFromObjectRecord.timelineThreads.map(+ ({ id }: { id: string }) => id,+ ),+ ).toContain(TIMELINE_MESSAGE_THREAD_ID);+ expect(+ calendarResponse.body.data.getTimelineCalendarEventsFromObjectRecord.timelineCalendarEvents.map(+ ({ id }: { id: string }) => id,+ ),+ ).toContain(TIMELINE_CALENDAR_EVENT_ID);+ });++ it.each([+ {+ query: GET_TIMELINE_THREADS,+ resultField: 'getTimelineThreadsFromObjectRecord',+ recordsField: 'timelineThreads',+ totalField: 'totalNumberOfThreads',+ expectedIds: [+ TIMELINE_MESSAGE_THREAD_ID,+ TIMELINE_SECOND_MESSAGE_THREAD_ID,+ ],+ },+ {+ query: GET_TIMELINE_CALENDAR_EVENTS,+ resultField: 'getTimelineCalendarEventsFromObjectRecord',+ recordsField: 'timelineCalendarEvents',+ totalField: 'totalNumberOfCalendarEvents',+ expectedIds: [+ TIMELINE_CALENDAR_EVENT_ID,+ TIMELINE_SECOND_CALENDAR_EVENT_ID,+ ],+ },+ ])(+ 'should paginate target-backed $recordsField without changing the total',+ async ({ query, resultField, recordsField, totalField, expectedIds }) => {+ const [firstPageResponse, secondPageResponse] = await Promise.all([+ requestTimeline(query, 'company', TIMELINE_MANUAL_COMPANY_ID, 1, 1),+ requestTimeline(query, 'company', TIMELINE_MANUAL_COMPANY_ID, 2, 1),+ ]);++ expect(firstPageResponse.body.errors).toBeUndefined();+ expect(secondPageResponse.body.errors).toBeUndefined();++ const firstPage = firstPageResponse.body.data[resultField];+ const secondPage = secondPageResponse.body.data[resultField];+ const pageIds = [...firstPage[recordsField], ...secondPage[recordsField]]+ .map(({ id }: { id: string }) => id)+ .sort();++ expect(firstPage[totalField]).toBe(2);+ expect(secondPage[totalField]).toBe(2);+ expect(firstPage[recordsField]).toHaveLength(1);+ expect(secondPage[recordsField]).toHaveLength(1);+ expect(pageIds).toEqual([...expectedIds].sort());+ },+ );++ it('should exclude soft-deleted target tombstones', async () => {+ for (const [objectMetadataSingularName, recordId] of [+ ['messageThreadTarget', TIMELINE_MESSAGE_THREAD_MANUAL_COMPANY_TARGET_ID],+ ['calendarEventTarget', TIMELINE_CALENDAR_EVENT_MANUAL_COMPANY_TARGET_ID],+ ['messageThreadTarget', TIMELINE_SECOND_MESSAGE_THREAD_TARGET_ID],+ ['calendarEventTarget', TIMELINE_SECOND_CALENDAR_EVENT_TARGET_ID],+ ] as const) {+ const response = await makeGraphqlAPIRequest(+ deleteOneOperationFactory({+ objectMetadataSingularName,+ gqlFields: 'id',+ recordId,+ }),+ );++ expect(response.body.errors).toBeUndefined();+ }++ const [threadResponse, calendarResponse] = await Promise.all([+ requestTimeline(+ GET_TIMELINE_THREADS,+ 'company',+ TIMELINE_MANUAL_COMPANY_ID,+ ),+ requestTimeline(+ GET_TIMELINE_CALENDAR_EVENTS,+ 'company',+ TIMELINE_MANUAL_COMPANY_ID,+ ),+ ]);++ expect(threadResponse.body.errors).toBeUndefined();+ expect(calendarResponse.body.errors).toBeUndefined();++ expect(+ threadResponse.body.data.getTimelineThreadsFromObjectRecord+ .totalNumberOfThreads,+ ).toBe(0);+ expect(+ calendarResponse.body.data.getTimelineCalendarEventsFromObjectRecord+ .totalNumberOfCalendarEvents,+ ).toBe(0);+ });+it('should serve getTimelineThreadsFromPersonId identically to the object-record resolver', async () => {const [fromObjectRecord, fromLegacy] = await Promise.all([requestTimeline(GET_TIMELINE_THREADS, 'person', personWithThreads.id),diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex 60853090d12..caeb7903fa7 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -11,4 +11,5 @@ export enum FeatureFlagKey {IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED = 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED',IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',+ IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',}