diff --git a/server/api/controllers/attachments/create.js b/server/api/controllers/attachments/create.js index bab6e13..1ffe962 100644 --- a/server/api/controllers/attachments/create.js +++ b/server/api/controllers/attachments/create.js @@ -44,7 +44,7 @@ module.exports = { async fn(inputs, exits) { const { currentUser } = this.req; - const { card } = await sails.helpers.cards + const { card, board } = await sails.helpers.cards .getProjectPath(inputs.cardId) .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND); @@ -88,6 +88,7 @@ module.exports = { card, creatorUser: currentUser, }, + board, requestId: inputs.requestId, request: this.req, }); diff --git a/server/api/controllers/comment-actions/delete.js b/server/api/controllers/comment-actions/delete.js index b09ce26..97c9879 100755 --- a/server/api/controllers/comment-actions/delete.js +++ b/server/api/controllers/comment-actions/delete.js @@ -36,7 +36,7 @@ module.exports = { .intercept('pathNotFound', () => Errors.COMMENT_ACTION_NOT_FOUND); let { action } = path; - const { board, project } = path; + const { board, project, card } = path; const isProjectManager = await sails.helpers.users.isProjectManager(currentUser.id, project.id); @@ -61,6 +61,7 @@ module.exports = { action = await sails.helpers.actions.deleteOne.with({ board, + card, record: action, request: this.req, }); diff --git a/server/api/controllers/comment-actions/update.js b/server/api/controllers/comment-actions/update.js index fc5dffb..a385ae8 100755 --- a/server/api/controllers/comment-actions/update.js +++ b/server/api/controllers/comment-actions/update.js @@ -40,7 +40,7 @@ module.exports = { .intercept('pathNotFound', () => Errors.COMMENT_ACTION_NOT_FOUND); let { action } = path; - const { board, project } = path; + const { board, project, card } = path; const isProjectManager = await sails.helpers.users.isProjectManager(currentUser.id, project.id); @@ -69,6 +69,7 @@ module.exports = { action = await sails.helpers.actions.updateOne.with({ values, + card, board, record: action, request: this.req, diff --git a/server/api/controllers/lists/delete.js b/server/api/controllers/lists/delete.js index 44cb48b..982b0f7 100755 --- a/server/api/controllers/lists/delete.js +++ b/server/api/controllers/lists/delete.js @@ -28,7 +28,8 @@ module.exports = { async fn(inputs) { const { currentUser } = this.req; - let { list } = await sails.helpers.lists + // eslint-disable-next-line prefer-const + let { list, board } = await sails.helpers.lists .getProjectPath(inputs.id) .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND); @@ -47,6 +48,7 @@ module.exports = { list = await sails.helpers.lists.deleteOne.with({ record: list, + board, request: this.req, }); diff --git a/server/api/controllers/tasks/create.js b/server/api/controllers/tasks/create.js index b7c935a..ff4b052 100755 --- a/server/api/controllers/tasks/create.js +++ b/server/api/controllers/tasks/create.js @@ -62,8 +62,8 @@ module.exports = { values: { ...values, card, - board, }, + board, request: this.req, }); diff --git a/server/api/helpers/actions/delete-one.js b/server/api/helpers/actions/delete-one.js index 3051272..ba862f8 100644 --- a/server/api/helpers/actions/delete-one.js +++ b/server/api/helpers/actions/delete-one.js @@ -4,6 +4,10 @@ module.exports = { type: 'ref', required: true, }, + card: { + type: 'ref', + required: true, + }, board: { type: 'ref', required: true, @@ -31,6 +35,7 @@ module.exports = { data: action, projectId: inputs.board.projectId, user: inputs.request.currentUser, + card: inputs.card, board: inputs.board, }); } diff --git a/server/api/helpers/actions/update-one.js b/server/api/helpers/actions/update-one.js index 35136bb..cdca79c 100644 --- a/server/api/helpers/actions/update-one.js +++ b/server/api/helpers/actions/update-one.js @@ -8,6 +8,10 @@ module.exports = { type: 'json', required: true, }, + card: { + type: 'ref', + required: true, + }, board: { type: 'ref', required: true, @@ -37,6 +41,7 @@ module.exports = { data: action, projectId: inputs.board.projectId, user: inputs.request.currentUser, + card: inputs.card, board: inputs.board, }); } diff --git a/server/api/helpers/attachments/create-one.js b/server/api/helpers/attachments/create-one.js index 088a414..0a5923b 100644 --- a/server/api/helpers/attachments/create-one.js +++ b/server/api/helpers/attachments/create-one.js @@ -21,6 +21,10 @@ module.exports = { custom: valuesValidator, required: true, }, + board: { + type: 'ref', + required: true, + }, requestId: { type: 'string', isNotEmptyString: true, @@ -31,7 +35,7 @@ module.exports = { }, async fn(inputs) { - const { values } = inputs; + const { values, board } = inputs; const attachment = await Attachment.create({ ...values, @@ -55,16 +59,18 @@ module.exports = { values: { coverAttachmentId: attachment.id, }, + board, + request: inputs.request, }); } await sails.helpers.utils.sendWebhook.with({ event: 'ATTACHMENT_CREATE', data: attachment, - projectId: values.card.board.projectId, + projectId: board.projectId, user: inputs.request.currentUser, card: values.card, - board: values.card.board, + board, }); return attachment; diff --git a/server/api/helpers/lists/delete-one.js b/server/api/helpers/lists/delete-one.js index 5f5b6f8..d4f7c49 100644 --- a/server/api/helpers/lists/delete-one.js +++ b/server/api/helpers/lists/delete-one.js @@ -4,6 +4,10 @@ module.exports = { type: 'ref', required: true, }, + board: { + type: 'ref', + required: true, + }, request: { type: 'ref', }, @@ -25,9 +29,9 @@ module.exports = { await sails.helpers.utils.sendWebhook.with({ event: 'LIST_DELETE', data: list, - projectId: list.board.projectId, + projectId: inputs.board.projectId, user: inputs.request.currentUser, - board: list.board, + board: inputs.board, }); }