fix votes when deleting a note

Author: mateo-ivc

server/src/api/event_filter.go

@@ -95,6 +95,21 @@ func parseParticipantUpdated(data interface{}) (*dto.BoardSession, error) {
 	return ret, nil
 }
 
+func parseVotesDeleted(data interface{}) ([]*dto.Vote, error) {
+	var ret []*dto.Vote
+
+	b, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(b, &ret)
+	if err != nil {
+		return nil, err
+	}
+	return ret, nil
+
+}
+
 func filterColumns(eventColumns []*dto.Column) []*dto.Column {
 	var visibleColumns = make([]*dto.Column, 0, len(eventColumns))
 	for _, column := range eventColumns {
@@ -305,6 +320,27 @@ func (boardSubscription *BoardSubscription) eventFilter(event *realtime.BoardEve
 		}
 	}
 
+	if event.Type == realtime.BoardEventVotesDeleted {
+		//filter deleted votes after user
+		votes, err := parseVotesDeleted(event.Data)
+		if err != nil {
+			logger.Get().Errorw("unable to parse deleteVotes in event filter", "board", boardSubscription.boardSettings.ID, "session", userID, "err", err)
+		}
+		userVotes := make([]*dto.Vote, 0)
+		for _, v := range votes {
+			if v.User == userID {
+				userVotes = append(userVotes, v)
+			}
+		}
+
+		ret := realtime.BoardEvent{
+			Type: event.Type,
+			Data: userVotes,
+		}
+
+		return &ret
+	}
+
 	// returns, if no filter match occured
 	return event
 }

server/src/realtime/boards.go

@@ -22,7 +22,7 @@ const (
 	BoardEventReactionAdded         BoardEventType = "REACTION_ADDED"
 	BoardEventReactionDeleted       BoardEventType = "REACTION_DELETED"
 	BoardEventReactionUpdated       BoardEventType = "REACTION_UPDATED"
-	BoardEventVotesUpdated          BoardEventType = "VOTES_UPDATED"
+	BoardEventVotesDeleted          BoardEventType = "VOTES_DELETED"
 	BoardEventSessionRequestCreated BoardEventType = "REQUEST_CREATED"
 	BoardEventSessionRequestUpdated BoardEventType = "REQUEST_UPDATED"
 	BoardEventParticipantCreated    BoardEventType = "PARTICIPANT_CREATED"

server/src/services/boards/columns.go

@@ -150,7 +150,7 @@ func (s *BoardService) DeletedColumn(user, board, column uuid.UUID) {
 		}
 	}
 	_ = s.realtime.BroadcastToBoard(board, realtime.BoardEvent{
-		Type: realtime.BoardEventVotesUpdated,
+		Type: realtime.BoardEventVotesDeleted,
 		Data: personalVotes,
 	})
 }

server/src/services/notes/notes.go

@@ -128,12 +128,11 @@ func (s *NoteService) Delete(ctx context.Context, body dto.NoteDeleteRequest, id
 	board := ctx.Value(identifiers.BoardIdentifier).(uuid.UUID)
 	note := ctx.Value(identifiers.NoteIdentifier).(uuid.UUID)
 	voteFilter := filter.VoteFilter{
-		User:  &user,
 		Board: board,
 		Note:  &note,
 	}
 
-	votes, err := s.database.GetVotes(voteFilter)
+	deletedVotes, err := s.database.GetVotes(voteFilter)
 	if err != nil {
 		log.Errorw("unable to retrieve votes for a note delete", "err", err)
 	}
@@ -144,7 +143,7 @@ func (s *NoteService) Delete(ctx context.Context, body dto.NoteDeleteRequest, id
 		return err
 	}
 
-	s.DeletedNote(user, board, note, votes, body.DeleteStack)
+	s.DeletedNote(user, board, note, deletedVotes, body.DeleteStack)
 	return err
 }
 
@@ -165,7 +164,7 @@ func (s *NoteService) UpdatedNotes(board uuid.UUID) {
 	})
 }
 
-func (s *NoteService) DeletedNote(user, board, note uuid.UUID, votes []database.Vote, deleteStack bool) {
+func (s *NoteService) DeletedNote(user, board, note uuid.UUID, deletedVotes []database.Vote, deleteStack bool) {
 	noteData := map[string]interface{}{
 		"note":        note,
 		"deleteStack": deleteStack,
@@ -175,14 +174,8 @@ func (s *NoteService) DeletedNote(user, board, note uuid.UUID, votes []database.
 		Data: noteData,
 	})
 
-	personalVotes := []*dto.Vote{}
-	for _, vote := range votes {
-		if vote.User == user {
-			personalVotes = append(personalVotes, new(dto.Vote).From(vote))
-		}
-	}
 	_ = s.realtime.BroadcastToBoard(board, realtime.BoardEvent{
-		Type: realtime.BoardEventVotesUpdated,
-		Data: personalVotes,
+		Type: realtime.BoardEventVotesDeleted,
+		Data: deletedVotes,
 	})
 }

server/src/services/notes/notes_test.go

@@ -254,7 +254,7 @@ func (suite *NoteServiceTestSuite) TestDeleteNote() {
 		Data: deletedNoteRealTimeUpdate,
 	}
 	publishEventVotesUpdated := realtime.BoardEvent{
-		Type: realtime.BoardEventVotesUpdated,
+		Type: realtime.BoardEventVotesDeleted,
 		Data: []*dto.Vote{},
 	}
 	clientMock.On("Publish", publishSubject, publishEventNoteDeleted).Return(nil)

src/store/features/board/thunks.ts

@@ -11,7 +11,7 @@ import {deletedNote, syncNotes, updatedNotes} from "../notes";
 import {addedReaction, deletedReaction, updatedReaction} from "../reactions";
 import {createdParticipant, setParticipants, updatedParticipant} from "../participants";
 import {createdVoting, updatedVoting} from "../votings";
-import {updatedVotes} from "../votes";
+import {deletedVotes} from "../votes";
 import {createJoinRequest, updateJoinRequest} from "../requests";
 import {addedBoardReaction, removeBoardReaction} from "../boardReactions";
 import {EditBoardRequest} from "./types";
@@ -126,9 +126,9 @@ export const permittedBoardAccess = createAsyncThunk<
         dispatch(updatedVoting({voting: message.data.voting, notes: message.data.notes}));
       }
 
-      if (message.type === "VOTES_UPDATED") {
+      if (message.type === "VOTES_DELETED") {
         const votes = message.data;
-        dispatch(updatedVotes(votes));
+        dispatch(deletedVotes(votes));
       }
 
       if (message.type === "REQUEST_CREATED") {

src/store/features/votes/actions.ts

@@ -6,3 +6,5 @@ export const createdVote = createAction<Vote>("votes/createdVote");
 export const updatedVotes = createAction<Vote[]>("votes/updatedVotes");
 
 export const deletedVote = createAction<Vote>("votes/deletedVote");
+
+export const deletedVotes = createAction<Vote[]>("votes/deletedVotes");

src/store/features/votes/reducer.ts

@@ -1,7 +1,7 @@
 import {createReducer} from "@reduxjs/toolkit";
 import {VotesState} from "./types";
 import {initializeBoard} from "../board";
-import {createdVote, deletedVote, updatedVotes} from "./actions";
+import {createdVote, deletedVote, deletedVotes, updatedVotes} from "./actions";
 import {createdVoting} from "../votings";
 
 const initialState: VotesState = [];
@@ -13,6 +13,7 @@ export const votesReducer = createReducer(initialState, (builder) =>
       state.push(action.payload);
     })
     .addCase(updatedVotes, (_state, action) => action.payload)
+    .addCase(deletedVotes, (_state, action) => _state.filter((vote) => !action.payload.some((deleteVote) => deleteVote.note === vote.note)))
     .addCase(deletedVote, (state, action) => {
       const newVotes = state.slice();
       const index = newVotes.findIndex((v) => v.voting === action.payload.voting && v.note === action.payload.note);

src/types/websocket.ts

@@ -117,8 +117,8 @@ export interface VotingUpdatedEvent {
   };
 }
 
-export interface UpdatedVotesEvent {
-  type: "VOTES_UPDATED";
+export interface DeleteVotesEvent {
+  type: "VOTES_DELETED";
   data: Vote[];
 }
 
@@ -147,5 +147,5 @@ export type ServerEvent =
   | ParticipantsUpdatedEvent
   | VotingCreatedEvent
   | VotingUpdatedEvent
-  | UpdatedVotesEvent
+  | DeleteVotesEvent
   | AddedBoardReactionEvent;