add merge logic

twentyhq · Jan 23, 2024 · dbde765 · dbde765
1 parent fa863dc
commit dbde765
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 268 deletions.
diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts
@@ -61,20 +61,6 @@ export class GmailFullSyncService {
       return;
     }
 
-    // const {
-    //   savedMessageIds,
-    //   savedThreadIds
-    // } = await this.utils.getSavedMessageIdsAndThreadIds(
-    //   messageExternalIds,
-    //   connectedAccountId,
-    //   dataSourceMetadata,
-    //   workspaceDataSource,
-    // );
-
-    // const messageIdsToSave = messageExternalIds.filter(
-    //   (messageId) => !savedMessageIds.includes(messageId),
-    // );
-
     const messageQueries =
       this.utils.createQueriesFromMessageIds(messageExternalIds);
 
@@ -88,19 +74,6 @@ export class GmailFullSyncService {
       return;
     }
 
-    // const threads = this.utils.getThreadsFromMessages(messagesToSave);
-
-    // const threadsToSave = threads.filter(
-    //   (threadId) => !savedThreadIds.includes(threadId.id),
-    // );
-
-    // await this.utils.saveMessageThreads(
-    //   threadsToSave,
-    //   dataSourceMetadata,
-    //   workspaceDataSource,
-    //   connectedAccount.id,
-    // );
-
     await this.utils.saveMessages(
       messagesToSave,
       dataSourceMetadata,

diff --git a/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts b/packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
@@ -127,57 +127,15 @@ export class GmailPartialSyncService {
     const { messagesAdded, messagesDeleted } =
       await this.getMessageIdsAndThreadIdsFromHistory(history);
 
-    const {
-      savedMessageIds: messagesAddedAlreadySaved,
-      savedThreadIds: threadsAddedAlreadySaved,
-    } = await this.utils.getSavedMessageIdsAndThreadIds(
-      messagesAdded,
-      connectedAccountId,
-      dataSourceMetadata,
-      workspaceDataSource,
-    );
-
-    const messageExternalIdsToSave = messagesAdded.filter(
-      (messageId) =>
-        !messagesAddedAlreadySaved.includes(messageId) &&
-        !messagesDeleted.includes(messageId),
-    );
-
-    const { savedMessageIds: messagesDeletedAlreadySaved } =
-      await this.utils.getSavedMessageIdsAndThreadIds(
-        messagesDeleted,
-        connectedAccountId,
-        dataSourceMetadata,
-        workspaceDataSource,
-      );
-
-    const messageExternalIdsToDelete = messagesDeleted.filter((messageId) =>
-      messagesDeletedAlreadySaved.includes(messageId),
-    );
-
-    const messageQueries = this.utils.createQueriesFromMessageIds(
-      messageExternalIdsToSave,
-    );
+    const messageQueries =
+      this.utils.createQueriesFromMessageIds(messagesAdded);
 
     const { messages: messagesToSave, errors } =
       await this.fetchMessagesByBatchesService.fetchAllMessages(
         messageQueries,
         accessToken,
       );
 
-    const threads = this.utils.getThreadsFromMessages(messagesToSave);
-
-    const threadsToSave = threads.filter(
-      (thread) => !threadsAddedAlreadySaved.includes(thread.id),
-    );
-
-    await this.utils.saveMessageThreads(
-      threadsToSave,
-      dataSourceMetadata,
-      workspaceDataSource,
-      connectedAccount.id,
-    );
-
     await this.utils.saveMessages(
       messagesToSave,
       dataSourceMetadata,
@@ -186,15 +144,9 @@ export class GmailPartialSyncService {
       gmailMessageChannelId,
     );
 
-    await this.utils.deleteMessages(
-      messageExternalIdsToDelete,
-      dataSourceMetadata,
-      workspaceDataSource,
-    );
-
-    await this.utils.deleteEmptyThreads(
+    await this.utils.deleteMessageChannelMessages(
       messagesDeleted,
-      connectedAccountId,
+      gmailMessageChannelId,
       dataSourceMetadata,
       workspaceDataSource,
     );