Skip to content

The open alternative to Salesforce, designed for AI.

Emit both sides of junction repoints (#24657)

Félix Malfait2bc348272547
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
index 2884b99238b..dc727db890d 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
@@ -88,35 +88,14 @@ export class TimelineActivityTargetQueryService {
return targetsBySourceRecordId;
}
- resolveTargetFromJunctionRecord({
- rule,
- junctionRecord,
- }: {
- rule: TimelineActivityRule;
- junctionRecord: Record<string, unknown> | undefined;
- }): ResolvedTimelineActivityTarget | undefined {
- if (!isDefined(junctionRecord)) {
- return undefined;
- }
-
- if (rule.targetShape.kind !== 'JUNCTION') {
- return undefined;
- }
-
- return readTargetFromRecord(
- junctionRecord,
- rule.targetShape.targetJoinColumns,
- );
- }
-
- resolveTargetFromDirectRelationRecord({
+ resolveTargetFromRecord({
rule,
record,
}: {
rule: TimelineActivityRule;
record: Record<string, unknown> | undefined;
}): ResolvedTimelineActivityTarget | undefined {
- if (!isDefined(record) || rule.targetShape.kind !== 'DIRECT_RELATION') {
+ if (!isDefined(record) || rule.targetShape.kind === 'SELF') {
return undefined;
}
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index d4e64a994a3..42f83f16d38 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -33,18 +33,7 @@ import { resolveTimelineActivityHappensAt } from 'src/modules/timeline/utils/res
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
import { doesTimelineActivityLinkChange } from 'src/modules/timeline/utils/does-timeline-activity-link-change.util';
-import { resolveTimelineActivitySourceRuleAction } from 'src/modules/timeline/utils/resolve-timeline-activity-source-rule-action.util';
-
-// An event on the junction object is a change to the link, not to the linked
-// record. `updated` is filtered to join-column changes below.
-const JUNCTION_EVENT_ACTIONS: Partial<
- Record<DatabaseEventAction, TimelineActivityRuleAction>
-> = {
- created: 'linked',
- restored: 'linked',
- updated: 'linked',
- deleted: 'unlinked',
-};
+import { resolveTimelineActivityRuleAction } from 'src/modules/timeline/utils/resolve-timeline-activity-rule-action.util';
type BuildPayloadsForRuleArgs = {
rule: TimelineActivityRule;
@@ -65,6 +54,21 @@ const keepDiffOnly = (
return isDefined(diff) && Object.keys(diff).length > 0 ? { diff } : {};
};
+const resolveEventRecordForRuleAction = ({
+ event,
+ eventAction,
+ ruleAction,
+}: {
+ event: ObjectRecordBaseEvent;
+ eventAction: DatabaseEventAction;
+ ruleAction: TimelineActivityRuleAction;
+}): ObjectRecord | undefined =>
+ (eventAction === 'deleted' || ruleAction === 'unlinked'
+ ? (event.properties.before ?? event.properties.after)
+ : (event.properties.after ?? event.properties.before)) as
+ | ObjectRecord
+ | undefined;
+
const buildLinkedPayload = ({
rule,
timelineActivityType,
@@ -262,10 +266,11 @@ export class TimelineActivityService {
flatFieldMetadataMaps,
resolveTimelineActivityType,
}: BuildPayloadsForRuleArgs): Promise<TimelineActivityPayload[]> {
- const ruleAction = resolveTimelineActivitySourceRuleAction({
+ const ruleAction = resolveTimelineActivityRuleAction({
actions: rule.actions,
targetShape: rule.targetShape,
eventAction: action,
+ eventSource: 'SOURCE',
});
if (!isDefined(ruleAction)) {
@@ -330,15 +335,16 @@ export class TimelineActivityService {
if (rule.targetShape.kind === 'DIRECT_RELATION') {
return matchingEvents.flatMap((event) => {
- const record = (
- action === 'deleted' || ruleAction === 'unlinked'
- ? (event.properties.before ?? event.properties.after)
- : (event.properties.after ?? event.properties.before)
- ) as ObjectRecord | undefined;
+ const record = resolveEventRecordForRuleAction({
+ event,
+ eventAction: action,
+ ruleAction,
+ });
const target =
- this.timelineActivityTargetQueryService.resolveTargetFromDirectRelationRecord(
- { rule, record },
- );
+ this.timelineActivityTargetQueryService.resolveTargetFromRecord({
+ rule,
+ record,
+ });
if (!isDefined(target)) {
return [];
@@ -400,7 +406,12 @@ export class TimelineActivityService {
flatFieldMetadataMaps,
resolveTimelineActivityType,
}: BuildPayloadsForRuleArgs): Promise<TimelineActivityPayload[]> {
- const ruleAction = JUNCTION_EVENT_ACTIONS[action];
+ const ruleAction = resolveTimelineActivityRuleAction({
+ actions: rule.actions,
+ targetShape: rule.targetShape,
+ eventAction: action,
+ eventSource: 'JUNCTION',
+ });
if (!isDefined(ruleAction) || rule.targetShape.kind !== 'JUNCTION') {
return [];
@@ -436,14 +447,17 @@ export class TimelineActivityService {
)
.filter((event) => this.ruleMatchesEvent({ rule, ruleAction, event }))
.map((event) => {
- const junctionRecord = event.properties.after as
- | ObjectRecord
- | undefined;
+ const junctionRecord = resolveEventRecordForRuleAction({
+ event,
+ eventAction: action,
+ ruleAction,
+ });
const target =
- this.timelineActivityTargetQueryService.resolveTargetFromJunctionRecord(
- { rule, junctionRecord },
- );
+ this.timelineActivityTargetQueryService.resolveTargetFromRecord({
+ rule,
+ record: junctionRecord,
+ });
const sourceRecordId = junctionRecord?.[junctionSourceJoinColumnName];
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-source-rule-action.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-rule-action.util.spec.ts
similarity index 51%
rename from packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-source-rule-action.util.spec.ts
rename to packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-rule-action.util.spec.ts
index add87265fae..1bd8a255100 100644
--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-source-rule-action.util.spec.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-rule-action.util.spec.ts
@@ -1,15 +1,23 @@
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';
import { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
-import { resolveTimelineActivitySourceRuleAction } from 'src/modules/timeline/utils/resolve-timeline-activity-source-rule-action.util';
+import { resolveTimelineActivityRuleAction } from 'src/modules/timeline/utils/resolve-timeline-activity-rule-action.util';
const DIRECT_RELATION_TARGET_SHAPE: TimelineActivityRuleTargetShape = {
kind: 'DIRECT_RELATION',
targetJoinColumns: [],
};
-describe('resolveTimelineActivitySourceRuleAction', () => {
- const cases: {
+const JUNCTION_TARGET_SHAPE: TimelineActivityRuleTargetShape = {
+ kind: 'JUNCTION',
+ junctionObjectMetadataId: 'junction-object-id',
+ junctionObjectNameSingular: 'junctionObject',
+ junctionSourceJoinColumnName: 'sourceId',
+ targetJoinColumns: [],
+};
+
+describe('resolveTimelineActivityRuleAction', () => {
+ const sourceCases: {
eventAction: DatabaseEventAction;
declaredAction: TimelineActivityRuleAction;
expectedAction: TimelineActivityRuleAction;
@@ -51,25 +59,73 @@ describe('resolveTimelineActivitySourceRuleAction', () => {
},
];
- it.each(cases)(
+ it.each(sourceCases)(
'maps $eventAction to $expectedAction for a direct $declaredAction rule',
({ eventAction, declaredAction, expectedAction }) => {
expect(
- resolveTimelineActivitySourceRuleAction({
+ resolveTimelineActivityRuleAction({
actions: [declaredAction],
targetShape: DIRECT_RELATION_TARGET_SHAPE,
eventAction,
+ eventSource: 'SOURCE',
}),
).toBe(expectedAction);
},
);
- it('does not derive link actions for non-direct source rules', () => {
+ it.each([
+ {
+ eventAction: DatabaseEventAction.CREATED,
+ declaredAction: 'linked' as const,
+ },
+ {
+ eventAction: DatabaseEventAction.RESTORED,
+ declaredAction: 'linked' as const,
+ },
+ {
+ eventAction: DatabaseEventAction.DELETED,
+ declaredAction: 'unlinked' as const,
+ },
+ {
+ eventAction: DatabaseEventAction.UPDATED,
+ declaredAction: 'linked' as const,
+ },
+ {
+ eventAction: DatabaseEventAction.UPDATED,
+ declaredAction: 'unlinked' as const,
+ },
+ ])(
+ 'maps a junction $eventAction to $declaredAction',
+ ({ eventAction, declaredAction }) => {
+ expect(
+ resolveTimelineActivityRuleAction({
+ actions: [declaredAction],
+ targetShape: JUNCTION_TARGET_SHAPE,
+ eventAction,
+ eventSource: 'JUNCTION',
+ }),
+ ).toBe(declaredAction);
+ },
+ );
+
+ it('does not treat a junction-row update as a source-record update', () => {
+ expect(
+ resolveTimelineActivityRuleAction({
+ actions: ['updated'],
+ targetShape: JUNCTION_TARGET_SHAPE,
+ eventAction: DatabaseEventAction.UPDATED,
+ eventSource: 'JUNCTION',
+ }),
+ ).toBeUndefined();
+ });
+
+ it('does not derive link actions for self rules', () => {
expect(
- resolveTimelineActivitySourceRuleAction({
+ resolveTimelineActivityRuleAction({
actions: ['linked'],
targetShape: { kind: 'SELF' },
eventAction: DatabaseEventAction.CREATED,
+ eventSource: 'SOURCE',
}),
).toBeUndefined();
});
diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-source-rule-action.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-rule-action.util.ts
similarity index 77%
rename from packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-source-rule-action.util.ts
rename to packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-rule-action.util.ts
index 0a0da1689c7..843db24e9ae 100644
--- a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-source-rule-action.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-rule-action.util.ts
@@ -13,22 +13,31 @@ const SOURCE_EVENT_ACTIONS: Partial<
restored: 'restored',
};
-export const resolveTimelineActivitySourceRuleAction = ({
+export const resolveTimelineActivityRuleAction = ({
actions,
targetShape,
eventAction,
+ eventSource,
}: {
actions: TimelineActivityRuleAction[];
targetShape: TimelineActivityRuleTargetShape;
eventAction: DatabaseEventAction;
+ eventSource: 'SOURCE' | 'JUNCTION';
}): TimelineActivityRuleAction | undefined => {
const sourceEventAction = SOURCE_EVENT_ACTIONS[eventAction];
- if (isDefined(sourceEventAction) && actions.includes(sourceEventAction)) {
+ if (
+ eventSource === 'SOURCE' &&
+ isDefined(sourceEventAction) &&
+ actions.includes(sourceEventAction)
+ ) {
return sourceEventAction;
}
- if (targetShape.kind !== 'DIRECT_RELATION') {
+ if (
+ (eventSource === 'SOURCE' && targetShape.kind !== 'DIRECT_RELATION') ||
+ (eventSource === 'JUNCTION' && targetShape.kind !== 'JUNCTION')
+ ) {
return undefined;
}