Activity as standard object (#6219)

In this PR I layout the first steps to migrate Activity to a traditional Standard objects Since this is a big transition, I'd rather split it into several deployments / PRs <img width="1512" alt="image" src="https://github.com/user-attachments/assets/012e2bbf-9d1b-4723-aaf6-269ef588b050"> --------- Co-authored-by: Charles Bochet <charles@twenty.com> Co-authored-by: bosiraphael <71827178+bosiraphael@users.noreply.github.com> Co-authored-by: Weiko <corentin@twenty.com> Co-authored-by: Faisal-imtiyaz123 <142205282+Faisal-imtiyaz123@users.noreply.github.com> Co-authored-by: Prateek Jain <prateekj1171998@gmail.com>
2024-07-31 15:36:11 +02:00
parent defcee2a02
commit 80c0fc7ff1
239 changed files with 18418 additions and 8671 deletions
--- a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
@ -1,11 +1,11 @@
 import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
-import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
+import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

@Processor(MessageQueue.entityEventsToDbQueue)
 export class UpsertTimelineActivityFromInternalEvent {
@ -37,8 +37,8 @@ export class UpsertTimelineActivityFromInternalEvent {
    // We ignore every that is not a LinkedObject or a Business Object
    if (
      data.objectMetadata.isSystem &&
-      data.objectMetadata.nameSingular !== 'activityTarget' &&
-      data.objectMetadata.nameSingular !== 'activity'
+      data.objectMetadata.nameSingular !== 'noteTarget' &&
+      data.objectMetadata.nameSingular !== 'taskTarget'
    ) {
      return;
    }
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@ -21,13 +21,18 @@ export class TimelineActivityService {
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
  ) {}

+  private targetObjects: Record<string, string> = {
+    note: 'noteTarget',
+    task: 'taskTarget',
+  };
+
  async upsertEvent(event: ObjectRecordBaseEvent) {
    const events = await this.transformEvent(event);

    if (!events || events.length === 0) return;

    for (const event of events) {
-      return await this.timelineActivityRepository.upsertOne(
+      await this.timelineActivityRepository.upsertOne(
        event.name,
        event.properties,
        event.objectName ?? event.objectMetadata.nameSingular,
@ -44,12 +49,21 @@ export class TimelineActivityService {
  private async transformEvent(
    event: ObjectRecordBaseEvent,
  ): Promise<TransformedEvent[]> {
+    if (['note', 'task'].includes(event.objectMetadata.nameSingular)) {
+      const linkedObjects = await this.handleLinkedObjects(event);
+
+      // 2 timelines, one for the linked object and one for the task/note
+      if (linkedObjects?.length > 0) return [...linkedObjects, event];
+    }
+
    if (
-      ['activity', 'messageParticipant', 'activityTarget'].includes(
+      ['noteTarget', 'taskTarget', 'messageParticipant'].includes(
        event.objectMetadata.nameSingular,
      )
    ) {
-      return await this.handleLinkedObjects(event);
+      const linkedObjects = await this.handleLinkedObjects(event);
+
+      return linkedObjects;
    }

    return [event];
@ -61,10 +75,17 @@ export class TimelineActivityService {
    );

    switch (event.objectMetadata.nameSingular) {
-      case 'activityTarget':
-        return this.processActivityTarget(event, dataSourceSchema);
-      case 'activity':
-        return this.processActivity(event, dataSourceSchema);
+      case 'noteTarget':
+        return this.processActivityTarget(event, dataSourceSchema, 'note');
+      case 'taskTarget':
+        return this.processActivityTarget(event, dataSourceSchema, 'task');
+      case 'note':
+      case 'task':
+        return this.processActivity(
+          event,
+          dataSourceSchema,
+          event.objectMetadata.nameSingular,
+        );
      default:
        return [];
    }
@ -73,17 +94,18 @@ export class TimelineActivityService {
  private async processActivity(
    event: ObjectRecordBaseEvent,
    dataSourceSchema: string,
+    activityType: string,
  ) {
    const activityTargets =
      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT * FROM ${dataSourceSchema}."activityTarget"
-          WHERE "activityId" = $1`,
+        `SELECT * FROM ${dataSourceSchema}."${this.targetObjects[activityType]}"
+          WHERE "${activityType}Id" = $1`,
        [event.recordId],
        event.workspaceId,
      );

    const activity = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."activity"
+      `SELECT * FROM ${dataSourceSchema}."${activityType}"
          WHERE "id" = $1`,
      [event.recordId],
      event.workspaceId,
@ -96,7 +118,10 @@ export class TimelineActivityService {
      .map((activityTarget) => {
        const targetColumn: string[] = Object.entries(activityTarget)
          .map(([columnName, columnValue]: [string, string]) => {
-            if (columnName === 'activityId' || !columnName.endsWith('Id'))
+            if (
+              columnName === activityType + 'Id' ||
+              !columnName.endsWith('Id')
+            )
              return;
            if (columnValue === null) return;

@ -108,7 +133,7 @@ export class TimelineActivityService {

        return {
          ...event,
-          name: activity[0].type.toLowerCase() + '.' + event.name.split('.')[1],
+          name: 'linked-' + event.name,
          objectName: targetColumn[0].replace(/Id$/, ''),
          recordId: activityTarget[targetColumn[0]],
          linkedRecordCachedName: activity[0].title,
@ -122,10 +147,11 @@ export class TimelineActivityService {
  private async processActivityTarget(
    event: ObjectRecordBaseEvent,
    dataSourceSchema: string,
+    activityType: string,
  ) {
    const activityTarget =
      await this.workspaceDataSourceService.executeRawQuery(
-        `SELECT * FROM ${dataSourceSchema}."activityTarget"
+        `SELECT * FROM ${dataSourceSchema}."${this.targetObjects[activityType]}"
            WHERE "id" = $1`,
        [event.recordId],
        event.workspaceId,
@ -134,7 +160,7 @@ export class TimelineActivityService {
    if (activityTarget.length === 0) return;

    const activity = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."activity"
+      `SELECT * FROM ${dataSourceSchema}."${activityType}"
          WHERE "id" = $1`,
      [activityTarget[0].activityId],
      event.workspaceId,
@ -143,12 +169,13 @@ export class TimelineActivityService {
    if (activity.length === 0) return;

    const activityObjectMetadataId = event.objectMetadata.fields.find(
-      (field) => field.name === 'activity',
+      (field) => field.name === activityType,
    )?.toRelationMetadata?.fromObjectMetadataId;

    const targetColumn: string[] = Object.entries(activityTarget[0])
      .map(([columnName, columnValue]: [string, string]) => {
-        if (columnName === 'activityId' || !columnName.endsWith('Id')) return;
+        if (columnName === activityType + 'Id' || !columnName.endsWith('Id'))
+          return;
        if (columnValue === null) return;

        return columnName;
@ -160,7 +187,7 @@ export class TimelineActivityService {
    return [
      {
        ...event,
-        name: activity[0].type.toLowerCase() + '.' + event.name.split('.')[1],
+        name: 'linked-' + event.name,
        properties: {},
        objectName: targetColumn[0].replace(/Id$/, ''),
        recordId: activityTarget[0][targetColumn[0]],
--- a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
@ -17,8 +17,10 @@ import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-re
 import { TIMELINE_ACTIVITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 import { CompanyWorkspaceEntity } from 'src/modules/company/standard-objects/company.workspace-entity';
+import { NoteWorkspaceEntity } from 'src/modules/note/standard-objects/note.workspace-entity';
 import { OpportunityWorkspaceEntity } from 'src/modules/opportunity/standard-objects/opportunity.workspace-entity';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
+import { TaskWorkspaceEntity } from 'src/modules/task/standard-objects/task.workspace-entity';
 import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

@ -153,6 +155,36 @@ export class TimelineActivityWorkspaceEntity extends BaseWorkspaceEntity {
  @WorkspaceJoinColumn('opportunity')
  opportunityId: string | null;

+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.note,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Note',
+    description: 'Event note',
+    icon: 'IconTargetArrow',
+    inverseSideTarget: () => NoteWorkspaceEntity,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  note: Relation<NoteWorkspaceEntity> | null;
+
+  @WorkspaceJoinColumn('note')
+  noteId: string | null;
+
+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.task,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Task',
+    description: 'Event task',
+    icon: 'IconTargetArrow',
+    inverseSideTarget: () => TaskWorkspaceEntity,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  task: Relation<TaskWorkspaceEntity> | null;
+
+  @WorkspaceJoinColumn('task')
+  taskId: string | null;
+
  @WorkspaceRelation({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.workflow,
    type: RelationMetadataType.MANY_TO_ONE,