refactor: introduce selectDraftMessageFromDraft

Author: khushal87

package/src/store/apis/getDraft.ts

@@ -1,3 +1,4 @@
+import { selectDraftMessageFromDraft } from './queries/selectDraftMessageFromDraft';
 import { selectMessageForId } from './queries/selectMessageById';
 
 import { mapStorableToDraft } from '../mappers/mapStorableToDraft';
@@ -16,23 +17,18 @@ export const getDraft = async ({
 }) => {
   SqliteClient.logger?.('info', 'getDraft', { cid, parent_id });
 
-  const query = createSelectQuery('draft', ['*'], { cid, parentId: parent_id });
+  const draftRowsWithMessage = await selectDraftMessageFromDraft([cid]);
 
-  const rows = await SqliteClient.executeSql.apply(null, query);
+  const draftRowWithMessage = draftRowsWithMessage[0];
 
-  if (!rows.length) return null;
-
-  const draftRow = rows[0];
-
-  const draftMessageQuery = createSelectQuery('draftMessage', ['*'], {
-    id: draftRow.draftMessageId,
-  });
-  const draftMessageRows = await SqliteClient.executeSql.apply(null, draftMessageQuery);
+  if (!draftRowWithMessage) {
+    return undefined;
+  }
 
   const channelQuery = createSelectQuery('channels', ['*'], { cid });
   const channelRows = await SqliteClient.executeSql.apply(null, channelQuery);
 
-  const quotedMessageRows = await selectMessageForId(draftRow.quotedMessageId);
+  const quotedMessageRows = await selectMessageForId(draftRowWithMessage.quotedMessageId);
 
   const polls = (await SqliteClient.executeSql.apply(
     null,
@@ -44,8 +40,7 @@ export const getDraft = async ({
   return mapStorableToDraft({
     channelRow: channelRows[0] as unknown as TableRow<'channels'>,
     currentUserId,
-    draftMessageRow: draftMessageRows[0] as unknown as TableRow<'draftMessage'>,
-    draftRow: draftRow as unknown as TableRow<'draft'>,
+    draftRow: draftRowWithMessage,
     pollRow: polls[0],
     quotedMessageRow: quotedMessageRows,
   });

package/src/store/apis/getDraftsForChannels.ts

@@ -1,5 +1,6 @@
 import { DraftResponse } from 'stream-chat';
 
+import { selectDraftMessageFromDraft } from './queries/selectDraftMessageFromDraft';
 import { selectMessageForId } from './queries/selectMessageById';
 
 import { mapStorableToDraft } from '../mappers/mapStorableToDraft';
@@ -16,25 +17,18 @@ export const getDraftForChannels = async ({
 }) => {
   SqliteClient.logger?.('info', 'getDraftsForChannel', { channelIds });
 
-  const query = createSelectQuery('draft', ['*'], { cid: channelIds });
-
-  const rows = await SqliteClient.executeSql.apply(null, query);
+  const draftRowsWithMessage = await selectDraftMessageFromDraft(channelIds);
 
   /**
    * Filter out drafts without a parent ID, as we will not show them in the channel.
    * The above `createSelectQuery` was not able to filter out drafts without a parent ID.
    * TODO: Fix the query to filter out drafts without a parent ID. This can be a bit faster.
    */
-  const rowsWithoutParentID = rows.filter((row) => row.parentId === null);
+  const rowsWithoutParentID = draftRowsWithMessage.filter((row) => row.parentId === null);
 
   const cidVsDrafts: Record<string, DraftResponse> = {};
 
   for (const row of rowsWithoutParentID) {
-    const draftMessageQuery = createSelectQuery('draftMessage', ['*'], {
-      id: row.draftMessageId,
-    });
-    const draftMessageRows = await SqliteClient.executeSql.apply(null, draftMessageQuery);
-
     const channelQuery = createSelectQuery('channels', ['*'], { cid: row.cid });
     const channelRows = await SqliteClient.executeSql.apply(null, channelQuery);
 
@@ -50,8 +44,7 @@ export const getDraftForChannels = async ({
     cidVsDrafts[row.cid] = mapStorableToDraft({
       channelRow: channelRows[0] as unknown as TableRow<'channels'>,
       currentUserId,
-      draftMessageRow: draftMessageRows[0] as unknown as TableRow<'draftMessage'>,
-      draftRow: row as unknown as TableRow<'draft'>,
+      draftRow: row,
       pollRow: polls[0],
       quotedMessageRow,
     });

package/src/store/apis/queries/selectDraftMessageFromDraft.ts

@@ -0,0 +1,41 @@
+import { tables } from '../../schema';
+import { SqliteClient } from '../../SqliteClient';
+import type { TableRowJoinedDraftMessage } from '../../types';
+
+export const selectDraftMessageFromDraft = async (
+  cids?: string[],
+): Promise<TableRowJoinedDraftMessage<'draft'>[]> => {
+  if (!cids || cids.length === 0) {
+    return [];
+  }
+
+  const questionMarks = Array(cids.length).fill('?').join(',');
+  const draftColumnNames = Object.keys(tables.draft.columns)
+    .map((name) => `'${name}', a.${name}`)
+    .join(', ');
+  const draftMessageColumnNames = Object.keys(tables.draftMessage.columns)
+    .map((name) => `'${name}', b.${name}`)
+    .join(', ');
+
+  SqliteClient.logger?.('info', 'selectDraft', {
+    cids,
+  });
+
+  const result = await SqliteClient.executeSql(
+    `SELECT
+      json_object(
+        'draftMessage', json_object(
+          ${draftMessageColumnNames}
+        ),
+        ${draftColumnNames}
+      ) as value
+    FROM draft a
+    LEFT JOIN
+      draftMessage b
+    ON b.id = a.draftMessageId
+    WHERE cid in (${questionMarks}) ORDER BY datetime(a.createdAt) DESC`,
+    cids,
+  );
+
+  return result.map((r) => JSON.parse(r.value));
+};

package/src/store/mappers/mapStorableToDraft.ts

@@ -5,26 +5,24 @@ import { mapStorableToDraftMessage } from './mapStorableToDraftMessage';
 
 import { mapStorableToMessage } from './mapStorableToMessage';
 
-import type { TableRow, TableRowJoinedUser } from '../types';
+import type { TableRow, TableRowJoinedDraftMessage, TableRowJoinedUser } from '../types';
 
 export const mapStorableToDraft = ({
   currentUserId,
   draftRow,
-  draftMessageRow,
   channelRow,
   pollRow,
   quotedMessageRow,
 }: {
   currentUserId: string;
-  draftRow: TableRow<'draft'>;
-  draftMessageRow: TableRow<'draftMessage'>;
+  draftRow: TableRowJoinedDraftMessage<'draft'>;
   channelRow: TableRow<'channels'>;
   pollRow: TableRow<'poll'>;
   quotedMessageRow?: TableRowJoinedUser<'messages'>;
 }): DraftResponse => {
   const { createdAt, cid, parentId } = draftRow;
 
-  const message = mapStorableToDraftMessage(draftMessageRow);
+  const message = mapStorableToDraftMessage(draftRow.draftMessage);
 
   const channel = mapStorableToChannel(channelRow);
 

package/src/store/types.ts

@@ -8,6 +8,10 @@ export type TableRowJoinedUser<T extends Table> = Schema[T] & {
   user: TableRow<'users'>;
 };
 
+export type TableRowJoinedDraftMessage<T extends Table> = Schema[T] & {
+  draftMessage: TableRow<'draftMessage'>;
+};
+
 export type TableColumnNames<T extends Table> = keyof Schema[T];
 export type TableColumnValue = string | boolean | number | undefined;
 export type Scalar = string | number | boolean | null | ArrayBuffer | ArrayBufferView;