From 172f4fcf3478b07e57a93924653fadbc7209504f Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Mon, 3 Oct 2022 13:04:52 +0200 Subject: [PATCH] fix: Fix missing board memberships loading --- server/api/controllers/projects/index.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/api/controllers/projects/index.js b/server/api/controllers/projects/index.js index 4e4c47ac..b4f2123d 100755 --- a/server/api/controllers/projects/index.js +++ b/server/api/controllers/projects/index.js @@ -7,7 +7,7 @@ module.exports = { let boardMemberships = await sails.helpers.users.getBoardMemberships(currentUser.id); - let membershipBoardIds = sails.helpers.utils.mapRecords(boardMemberships, 'boardId'); + const membershipBoardIds = sails.helpers.utils.mapRecords(boardMemberships, 'boardId'); let membershipBoards = await sails.helpers.boards.getMany({ id: membershipBoardIds, @@ -21,16 +21,6 @@ module.exports = { membershipProjectIds = sails.helpers.utils.mapRecords(membershipProjects); - membershipBoards = membershipBoards.filter((membershipBoard) => - membershipProjectIds.includes(membershipBoard.projectId), - ); - - membershipBoardIds = sails.helpers.utils.mapRecords(membershipBoards); - - boardMemberships = boardMemberships.filter((boardMembership) => - membershipBoardIds.includes(boardMembership.boardId), - ); - const projectIds = [...managerProjectIds, ...membershipProjectIds]; const projects = [...managerProjects, ...membershipProjects]; @@ -40,7 +30,17 @@ module.exports = { const users = await sails.helpers.users.getMany(userIds); const managerBoards = await sails.helpers.projects.getBoards(managerProjectIds); + + membershipBoards = membershipBoards.filter((membershipBoard) => + membershipProjectIds.includes(membershipBoard.projectId), + ); + const boards = [...managerBoards, ...membershipBoards]; + const boardIds = sails.helpers.utils.mapRecords(boards); + + boardMemberships = boardMemberships.filter((boardMembership) => + boardIds.includes(boardMembership.boardId), + ); return { items: projects,