fix: properly resolve own_votes and latest_answers

Author: isekovanic

package/src/components/Chat/hooks/handleEventToSyncDB.ts

@@ -233,13 +233,14 @@ export const handleEventToSyncDB = <
       'poll.vote_removed',
     ].includes(type)
   ) {
-    const { poll, poll_vote } = event;
+    const { poll, poll_vote, type } = event;
     if (poll) {
       return updatePollMessage({
-        client,
+        eventType: type,
         flush,
         poll,
         poll_vote,
+        userID: client?.userID || '',
       });
     }
   }

package/src/store/apis/updatePollMessage.ts

@@ -1,4 +1,4 @@
-import { isVoteAnswer, PollAnswer, PollResponse, PollVote, StreamChat } from 'stream-chat';
+import { isVoteAnswer, PollAnswer, PollResponse, PollVote } from 'stream-chat';
 
 import { DefaultStreamChatGenerics } from '../../types/types';
 import { mapPollToStorable } from '../mappers/mapPollToStorable';
@@ -11,13 +11,15 @@ import type { PreparedQueries } from '../types';
 export const updatePollMessage = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
-  client,
+  eventType,
   flush = true,
   poll,
   poll_vote,
+  userID,
 }: {
-  client: StreamChat<StreamChatGenerics>;
+  eventType: string;
   poll: PollResponse<StreamChatGenerics>;
+  userID: string;
   flush?: boolean;
   poll_vote?: PollVote<StreamChatGenerics> | PollAnswer<StreamChatGenerics>;
 }) => {
@@ -33,21 +35,37 @@ export const updatePollMessage = <
   for (const pollFromDB of pollsFromDB) {
     const serializedPoll = mapStorableToPoll(pollFromDB);
     const { latest_answers = [], own_votes = [] } = serializedPoll;
-    const newOwnVotes =
-      poll_vote && poll_vote.user?.id === client.userID
-        ? [poll_vote, ...own_votes.filter((vote) => vote.id !== poll_vote.id)]
-        : own_votes;
-    const newLatestAnswers =
-      poll_vote && isVoteAnswer(poll_vote)
-        ? [poll_vote, ...latest_answers.filter((answer) => answer.id !== poll_vote?.id)]
-        : latest_answers;
+    console.log(eventType);
+    let newOwnVotes = own_votes;
+    if (poll_vote && poll_vote.user?.id === userID) {
+      newOwnVotes =
+        eventType === 'poll.vote_removed'
+          ? newOwnVotes.filter((vote) => vote.id !== poll_vote.id)
+          : [poll_vote, ...newOwnVotes.filter((vote) => vote.id !== poll_vote.id)];
+    }
+    let newLatestAnswers = latest_answers;
+    if (poll_vote && isVoteAnswer(poll_vote)) {
+      newLatestAnswers =
+        eventType === 'poll.vote_removed'
+          ? newLatestAnswers.filter((answer) => answer.id !== poll_vote?.id)
+          : [poll_vote, ...newLatestAnswers.filter((answer) => answer.id !== poll_vote?.id)];
+    }
+    // const newOwnVotes =
+    //   poll_vote && poll_vote.user?.id === userID
+    //     ? [poll_vote, ...own_votes.filter((vote) => vote.id !== poll_vote.id)]
+    //     : own_votes;
+    // const newLatestAnswers =
+    //   poll_vote && isVoteAnswer(poll_vote)
+    //     ? [poll_vote, ...latest_answers.filter((answer) => answer.id !== poll_vote?.id)]
+    //     : latest_answers;
+
     const storablePoll = mapPollToStorable({
       ...poll,
       latest_answers: newLatestAnswers,
       own_votes: newOwnVotes,
     });
 
-    console.log('STORABLE POLL: ', storablePoll);
+    console.log('STORABLE POLL: ', newOwnVotes);
 
     queries.push(
       createUpdateQuery('poll', storablePoll, {

package/src/store/mappers/mapMessageToStorable.ts

@@ -2,8 +2,6 @@ import type { FormatMessageResponse, MessageResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
-import { mapPollToStorable } from './mapPollToStorable';
-
 import type { TableRow } from '../types';
 
 export const mapMessageToStorable = (
@@ -20,6 +18,7 @@ export const mapMessageToStorable = (
     message_text_updated_at,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     own_reactions,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     poll,
     poll_id,
     reaction_groups,
@@ -30,8 +29,6 @@ export const mapMessageToStorable = (
     ...extraData
   } = message;
 
-  const pollInMessage = poll && mapPollToStorable(poll);
-
   return {
     attachments: JSON.stringify(attachments),
     cid: cid || '',
@@ -46,6 +43,5 @@ export const mapMessageToStorable = (
     type,
     updatedAt: mapDateTimeToStorable(updated_at),
     userId: user?.id,
-    ...(pollInMessage ? { poll: pollInMessage } : {}),
   };
 };

package/src/store/schema.ts

@@ -103,7 +103,6 @@ export const tables: Tables = {
       extraData: 'TEXT',
       id: 'TEXT',
       messageTextUpdatedAt: 'TEXT',
-      poll: 'TEXT',
       poll_id: 'TEXT',
       reactionGroups: 'TEXT',
       text: "TEXT DEFAULT ''",
@@ -298,7 +297,6 @@ export type Schema = {
     extraData: string;
     id: string;
     messageTextUpdatedAt: string;
-    poll: string;
     poll_id: string;
     reactionGroups: string;
     type: MessageLabel;