Merge messages and threads #1 (#3583)

* Merge messages and threads

* rename messageChannelSync to messageChannelMessage

* add merge logic

* remove deprecated methods

* restore enqueue GmailFullSyncJob after connectedAccount creation

packages/twenty-server/src/core/auth/services/google-gmail.service.ts

@@ -21,13 +21,14 @@ export class GoogleGmailService {
     private readonly messageQueueService: MessageQueueService,
   ) {}
 
+  providerName = 'google';
+
   async saveConnectedAccount(
     saveConnectedAccountInput: SaveConnectedAccountInput,
   ) {
     const {
       handle,
       workspaceId,
-      provider,
       accessToken,
       refreshToken,
       workspaceMemberId,
@@ -43,7 +44,7 @@ export class GoogleGmailService {
 
     const connectedAccount = await workspaceDataSource?.query(
       `SELECT * FROM ${dataSourceMetadata.schema}."connectedAccount" WHERE "handle" = $1 AND "provider" = $2 AND "accountOwnerId" = $3`,
-      [handle, provider, workspaceMemberId],
+      [handle, this.providerName, workspaceMemberId],
     );
 
     if (connectedAccount.length > 0) {
@@ -60,7 +61,7 @@ export class GoogleGmailService {
         [
           connectedAccountId,
           handle,
-          provider,
+          this.providerName,
           accessToken,
           refreshToken,
           workspaceMemberId,
@@ -69,7 +70,7 @@ export class GoogleGmailService {
 
       await manager.query(
         `INSERT INTO ${dataSourceMetadata.schema}."messageChannel" ("visibility", "handle", "connectedAccountId", "type") VALUES ($1, $2, $3, $4)`,
-        ['share_everything', handle, connectedAccountId, 'gmail'],
+        ['share_everything', handle, connectedAccountId, 'email'],
       );
     });
 

packages/twenty-server/src/core/messaging/timeline-messaging.resolver.ts

@@ -10,7 +10,7 @@ import { TimelineMessagingService } from 'src/core/messaging/timeline-messaging.
 
 @Entity({ name: 'timelineThread', schema: 'core' })
 @ObjectType('TimelineThread')
-class TimelineThread {
+export class TimelineThread {
   @Field()
   @Column()
   read: boolean;

packages/twenty-server/src/core/messaging/timeline-messaging.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
+import { TimelineThread } from 'src/core/messaging/timeline-messaging.resolver';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 
@@ -10,7 +11,10 @@ export class TimelineMessagingService {
     private readonly typeORMService: TypeORMService,
   ) {}
 
-  async getMessagesFromPersonIds(workspaceId: string, personIds: string[]) {
+  async getMessagesFromPersonIds(
+    workspaceId: string,
+    personIds: string[],
+  ): Promise<TimelineThread[]> {
     const dataSourceMetadata =
       await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
         workspaceId,