Avoid slack-messages-count sequential queries to SQL when generating …

…contentFragment (#2676)
dust-tt · Nov 27, 2023 · 5987509 · 5987509
1 parent f0e1175
commit 5987509
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/connectors/src/connectors/slack/bot.ts b/connectors/src/connectors/slack/bot.ts
@@ -626,6 +626,15 @@ async function makeContentFragment(
   let next_cursor = undefined;
 
   let shouldTake = false;
+
+  const slackBotMessages = await SlackChatBotMessage.findAll({
+    where: {
+      connectorId: connector.id,
+      channelId: channelId,
+      threadTs: threadTs,
+    },
+  });
+
   do {
     const replies: ConversationsRepliesResponse =
       await slackClient.conversations.replies({
@@ -657,15 +666,8 @@ async function makeContentFragment(
         continue;
       }
       if (shouldTake) {
-        const slackChatBotMessage = await SlackChatBotMessage.findOne({
-          where: {
-            connectorId: connector.id,
-            messageTs: m.ts,
-            channelId: channelId,
-          },
-        });
-        if (slackChatBotMessage) {
-          // If this message is a mention to the bot, we don't send it as a content fragment
+        if (slackBotMessages.find((sbm) => sbm.messageTs === m.ts)) {
+          // If this message is a mention to the bot, we don't send it as a content fragment.
           continue;
         }
         allMessages.push(m);

diff --git a/connectors/src/lib/models/slack.ts b/connectors/src/lib/models/slack.ts
@@ -281,6 +281,7 @@ SlackChatBotMessage.init(
   {
     sequelize: sequelize_conn,
     modelName: "slack_chat_bot_messages",
+    indexes: [{ fields: ["connectorId", "channelId", "threadTs"] }],
   }
 );
 Connector.hasOne(SlackChatBotMessage);