Prepare for collection board type, refactoring, update dependencies

server/api/controllers/attachments/update.js

@@ -43,7 +43,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name']);
-
     attachment = await sails.helpers.updateAttachment(attachment, values, board, this.req);
 
     if (!attachment) {

server/api/controllers/boards/create.js

@@ -11,6 +11,11 @@ module.exports = {
       regex: /^[0-9]+$/,
       required: true,
     },
+    type: {
+      type: 'string',
+      isIn: Board.TYPES,
+      required: true,
+    },
     position: {
       type: 'number',
       required: true,
@@ -39,8 +44,7 @@ module.exports = {
       throw Errors.PROJECT_NOT_FOUND;
     }
 
-    const values = _.pick(inputs, ['position', 'name']);
-
+    const values = _.pick(inputs, ['type', 'position', 'name']);
     const board = await sails.helpers.createBoard(project, values, this.req);
 
     sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed

server/api/controllers/boards/show.js

@@ -40,10 +40,10 @@ module.exports = {
       throw Errors.BOARD_NOT_FOUND; // Forbidden
     }
 
-    const lists = await sails.helpers.getListsForBoard(board.id);
     const labels = await sails.helpers.getLabelsForBoard(board.id);
+    const lists = await sails.helpers.getListsForBoard(board.id);
 
-    const cards = await sails.helpers.getCardsForBoard(board.id);
+    const cards = await sails.helpers.getCardsForBoard(board);
     const cardIds = sails.helpers.mapRecords(cards);
 
     const cardSubscriptions = await sails.helpers.getSubscriptionsByUserForCard(
@@ -75,8 +75,8 @@ module.exports = {
     return exits.success({
       item: board,
       included: {
-        lists,
         labels,
+        lists,
         cards,
         cardMemberships,
         cardLabels,

server/api/controllers/boards/update.js

@@ -34,7 +34,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['position', 'name']);
-
     board = await sails.helpers.updateBoard(board, values, this.req);
 
     if (!board) {

server/api/controllers/cards/create.js

@@ -1,21 +1,33 @@
 const moment = require('moment');
 
 const Errors = {
+  BOARD_NOT_FOUND: {
+    boardNotFound: 'Board not found',
+  },
   LIST_NOT_FOUND: {
     listNotFound: 'List not found',
   },
+  LIST_MUST_BE_PRESENT: {
+    listMustBePresent: 'List must be present',
+  },
+  POSITION_MUST_BE_PRESENT: {
+    positionMustBePresent: 'Position must be present',
+  },
 };
 
 module.exports = {
   inputs: {
-    listId: {
+    boardId: {
       type: 'string',
       regex: /^[0-9]+$/,
       required: true,
     },
+    listId: {
+      type: 'string',
+      regex: /^[0-9]+$/,
+    },
     position: {
       type: 'number',
-      required: true,
     },
     name: {
       type: 'string',
@@ -32,26 +44,49 @@ module.exports = {
     },
     timer: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) &&
-        _.size(value) === 2 &&
-        (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
-        _.isFinite(value.total),
+      custom: (value) => {
+        if (!_.isPlainObject(value) || _.size(value) !== 2) {
+          return false;
+        }
+
+        if (
+          !_.isNull(value.startedAt) &&
+          _.isString(value.startedAt) &&
+          !moment(value.startedAt, moment.ISO_8601, true).isValid()
+        ) {
+          return false;
+        }
+
+        if (!_.isFinite(value.total)) {
+          return false;
+        }
+
+        return true;
+      },
     },
   },
 
   exits: {
+    boardNotFound: {
+      responseType: 'notFound',
+    },
     listNotFound: {
       responseType: 'notFound',
     },
+    listMustBePresent: {
+      responseType: 'unprocessableEntity',
+    },
+    positionMustBePresent: {
+      responseType: 'unprocessableEntity',
+    },
   },
 
   async fn(inputs, exits) {
     const { currentUser } = this.req;
 
-    const { list, project } = await sails.helpers
-      .getListToProjectPath(inputs.listId)
-      .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
+    const { board, project } = await sails.helpers
+      .getBoardToProjectPath(inputs.boardId)
+      .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -62,9 +97,24 @@ module.exports = {
       throw Errors.LIST_NOT_FOUND; // Forbidden
     }
 
+    let list;
+    if (!_.isUndefined(inputs.listId)) {
+      list = await List.findOne({
+        id: inputs.listId,
+        boardId: board.id,
+      });
+
+      if (!list) {
+        throw Errors.LIST_NOT_FOUND;
+      }
+    }
+
     const values = _.pick(inputs, ['position', 'name', 'description', 'dueDate', 'timer']);
 
-    const card = await sails.helpers.createCard(list, values, currentUser, this.req);
+    const card = await sails.helpers
+      .createCard(board, list, values, currentUser, this.req)
+      .intercept('listMustBePresent', () => Errors.LIST_MUST_BE_PRESENT)
+      .intercept('positionMustBeInValues', () => Errors.POSITION_MUST_BE_PRESENT);
 
     return exits.success({
       item: card,

server/api/controllers/cards/index.js

@@ -0,0 +1,79 @@
+const Errors = {
+  BOARD_NOT_FOUND: {
+    boardNotFound: 'Board not found',
+  },
+};
+
+module.exports = {
+  inputs: {
+    boardId: {
+      type: 'string',
+      regex: /^[0-9]+$/,
+      required: true,
+    },
+    beforeId: {
+      type: 'string',
+      regex: /^[0-9]+$/,
+    },
+  },
+
+  exits: {
+    boardNotFound: {
+      responseType: 'notFound',
+    },
+  },
+
+  async fn(inputs, exits) {
+    const { currentUser } = this.req;
+
+    const { board, project } = await sails.helpers
+      .getBoardToProjectPath(inputs.boardId)
+      .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
+
+    const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
+      project.id,
+      currentUser.id,
+    );
+
+    if (!isUserMemberForProject) {
+      throw Errors.BOARD_NOT_FOUND; // Forbidden
+    }
+
+    const cards = await sails.helpers.getCardsForBoard(board, inputs.beforeId);
+    const cardIds = sails.helpers.mapRecords(cards);
+
+    const cardSubscriptions = await sails.helpers.getSubscriptionsByUserForCard(
+      cardIds,
+      currentUser.id,
+    );
+
+    const cardMemberships = await sails.helpers.getMembershipsForCard(cardIds);
+    const cardLabels = await sails.helpers.getCardLabelsForCard(cardIds);
+
+    const tasks = await sails.helpers.getTasksForCard(cardIds);
+    const attachments = await sails.helpers.getAttachmentsForCard(cardIds);
+
+    const isSubscribedByCardId = cardSubscriptions.reduce(
+      (result, cardSubscription) => ({
+        ...result,
+        [cardSubscription.cardId]: true,
+      }),
+      {},
+    );
+
+    cards.map((card) => ({
+      ...card,
+      isSubscribed: isSubscribedByCardId[card.id] || false,
+    }));
+
+    return exits.success({
+      items: cards,
+      included: {
+        cardMemberships,
+        cardLabels,
+        tasks,
+        attachments,
+      },
+    });
+  },
+};

server/api/controllers/cards/update.js

@@ -4,9 +4,18 @@ const Errors = {
   CARD_NOT_FOUND: {
     cardNotFound: 'Card not found',
   },
+  BOARD_NOT_FOUND: {
+    boardNotFound: 'Board not found',
+  },
   LIST_NOT_FOUND: {
     listNotFound: 'List not found',
   },
+  LIST_MUST_BE_PRESENT: {
+    listMustBePresent: 'List must be present',
+  },
+  POSITION_MUST_BE_PRESENT: {
+    positionMustBePresent: 'Position must be present',
+  },
 };
 
 module.exports = {
@@ -16,11 +25,11 @@ module.exports = {
       regex: /^[0-9]+$/,
       required: true,
     },
-    listId: {
+    boardId: {
       type: 'string',
       regex: /^[0-9]+$/,
     },
-    boardId: {
+    listId: {
       type: 'string',
       regex: /^[0-9]+$/,
     },
@@ -48,11 +57,25 @@ module.exports = {
     },
     timer: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) &&
-        _.size(value) === 2 &&
-        (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
-        _.isFinite(value.total),
+      custom: (value) => {
+        if (!_.isPlainObject(value) || _.size(value) !== 2) {
+          return false;
+        }
+
+        if (
+          !_.isNull(value.startedAt) &&
+          _.isString(value.startedAt) &&
+          !moment(value.startedAt, moment.ISO_8601, true).isValid()
+        ) {
+          return false;
+        }
+
+        if (!_.isFinite(value.total)) {
+          return false;
+        }
+
+        return true;
+      },
     },
     isSubscribed: {
       type: 'boolean',
@@ -63,9 +86,18 @@ module.exports = {
     cardNotFound: {
       responseType: 'notFound',
     },
+    boardNotFound: {
+      responseType: 'notFound',
+    },
     listNotFound: {
       responseType: 'notFound',
     },
+    listMustBePresent: {
+      responseType: 'unprocessableEntity',
+    },
+    positionMustBePresent: {
+      responseType: 'unprocessableEntity',
+    },
   },
 
   async fn(inputs, exits) {
@@ -87,22 +119,11 @@ module.exports = {
       throw Errors.CARD_NOT_FOUND; // Forbidden
     }
 
-    let toList;
     let toBoard;
-
-    if (!_.isUndefined(inputs.listId) && inputs.listId !== list.id) {
-      toList = await List.findOne({
-        id: inputs.listId,
-        boardId: inputs.boardId || card.boardId,
-      });
-
-      if (!toList) {
-        throw Errors.LIST_NOT_FOUND;
-      }
-
+    if (!_.isUndefined(inputs.boardId)) {
       ({ board: toBoard, project } = await sails.helpers
-        .getListToProjectPath(toList.id)
-        .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND));
+        .getBoardToProjectPath(inputs.boardId)
+        .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND));
 
       isUserMemberForProject = await sails.helpers.isUserMemberForProject(
         project.id,
@@ -110,6 +131,18 @@ module.exports = {
       );
 
       if (!isUserMemberForProject) {
+        throw Errors.BOARD_NOT_FOUND; // Forbidden
+      }
+    }
+
+    let toList;
+    if (!_.isUndefined(inputs.listId)) {
+      toList = await List.findOne({
+        id: inputs.listId,
+        boardId: (toBoard || board).id,
+      });
+
+      if (!toList) {
         throw Errors.LIST_NOT_FOUND; // Forbidden
       }
     }
@@ -124,16 +157,10 @@ module.exports = {
       'isSubscribed',
     ]);
 
-    card = await sails.helpers.updateCard(
-      card,
-      values,
-      toList,
-      toBoard,
-      list,
-      board,
-      currentUser,
-      this.req,
-    );
+    card = await sails.helpers
+      .updateCard(card, toBoard, toList, values, board, list, currentUser, this.req)
+      .intercept('toListMustBePresent', () => Errors.LIST_MUST_BE_PRESENT)
+      .intercept('positionMustBeInValues', () => Errors.POSITION_MUST_BE_PRESENT);
 
     if (!card) {
       throw Errors.CARD_NOT_FOUND;

server/api/controllers/labels/create.js

@@ -46,7 +46,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name', 'color']);
-
     const label = await sails.helpers.createLabel(board, values, this.req);
 
     return exits.success({

server/api/controllers/labels/update.js

@@ -49,7 +49,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name', 'color']);
-
     label = await sails.helpers.updateLabel(label, values, this.req);
 
     return exits.success({

server/api/controllers/lists/create.js

@@ -44,7 +44,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['position', 'name']);
-
     const list = await sails.helpers.createList(board, values, this.req);
 
     return exits.success({

server/api/controllers/lists/update.js

@@ -46,7 +46,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['position', 'name']);
-
     list = await sails.helpers.updateList(list, values, this.req);
 
     if (!list) {

server/api/controllers/projects/create.js

@@ -12,8 +12,8 @@ module.exports = {
     const values = _.pick(inputs, ['name']);
 
     const { project, projectMembership } = await sails.helpers.createProject(
-      values,
       currentUser,
+      values,
       this.req,
       true,
     );

server/api/controllers/projects/index.js

@@ -3,7 +3,6 @@ module.exports = {
     const { currentUser } = this.req;
 
     const projectIds = await sails.helpers.getMembershipProjectIdsForUser(currentUser.id);
-
     const projects = await sails.helpers.getProjects(projectIds);
 
     const { userIds, projectMemberships } = await sails.helpers.getMembershipUserIdsForProject(
@@ -12,7 +11,6 @@ module.exports = {
     );
 
     const users = await sails.helpers.getUsers(userIds);
-
     const boards = await sails.helpers.getBoardsForProject(projectIds);
 
     return exits.success({

server/api/controllers/projects/update.js

@@ -65,7 +65,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name', 'background', 'backgroundImage']);
-
     project = await sails.helpers.updateProject(project, values, this.req);
 
     if (!project) {

server/api/controllers/tasks/create.js

@@ -43,7 +43,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name', 'isCompleted']);
-
     const task = await sails.helpers.createTask(card, values, this.req);
 
     return exits.success({

server/api/controllers/tasks/update.js

@@ -46,7 +46,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['name', 'isCompleted']);
-
     task = await sails.helpers.updateTask(task, values, board, this.req);
 
     if (!task) {

server/api/controllers/users/update-password.js

@@ -60,7 +60,6 @@ module.exports = {
     }
 
     const values = _.pick(inputs, ['password']);
-
     user = await sails.helpers.updateUser(user, values, this.req);
 
     if (!user) {

server/api/helpers/create-card-membership.js

@@ -6,7 +6,7 @@ module.exports = {
     },
     userOrUserId: {
       type: 'ref',
-      custom: (value) => _.isPlainObject(value) || _.isString(value),
+      custom: (value) => _.isObjectLike(value) || _.isString(value),
       required: true,
     },
     request: {

server/api/helpers/create-card.js

@@ -1,12 +1,25 @@
 module.exports = {
   inputs: {
-    list: {
+    board: {
       type: 'ref',
       required: true,
     },
+    list: {
+      type: 'ref',
+    },
     values: {
       type: 'json',
-      custom: (value) => _.isPlainObject(value) && _.isFinite(value.position),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     user: {
@@ -18,36 +31,61 @@ module.exports = {
     },
   },
 
+  exits: {
+    listMustBePresent: {},
+    listMustBelongToBoard: {},
+    positionMustBeInValues: {},
+  },
+
   async fn(inputs, exits) {
-    const cards = await sails.helpers.getCardsForList(inputs.list.id);
+    const { values } = inputs;
 
-    const { position, repositions } = sails.helpers.insertToPositionables(
-      inputs.values.position,
-      cards,
-    );
+    values.boardId = inputs.board.id;
 
-    repositions.forEach(async ({ id, position: nextPosition }) => {
-      await Card.update({
-        id,
-        listId: inputs.list.id,
-      }).set({
-        position: nextPosition,
-      });
+    if (inputs.board.type === 'kanban') {
+      if (!inputs.list) {
+        throw 'listMustBePresent';
+      }
 
-      sails.sockets.broadcast(`board:${list.boardId}`, 'cardUpdate', {
-        item: {
+      if (inputs.list.boardId !== inputs.board.id) {
+        throw 'listMustBelongToBoard';
+      }
+
+      values.listId = inputs.list.id;
+
+      if (_.isUndefined(values.position)) {
+        throw 'positionMustBeInValues';
+      }
+
+      const cards = await sails.helpers.getCardsForList(inputs.list.id);
+
+      const { position, repositions } = sails.helpers.insertToPositionables(
+        inputs.values.position,
+        cards,
+      );
+
+      repositions.forEach(async ({ id, position: nextPosition }) => {
+        await Card.update({
           id,
+          listId: inputs.list.id,
+        }).set({
           position: nextPosition,
-        },
-      });
-    });
+        });
 
-    const card = await Card.create({
-      ...inputs.values,
-      position,
-      listId: inputs.list.id,
-      boardId: inputs.list.boardId,
-    }).fetch();
+        sails.sockets.broadcast(`board:${inputs.board.id}`, 'cardUpdate', {
+          item: {
+            id,
+            position: nextPosition,
+          },
+        });
+      });
+
+      values.position = position;
+    } else if (inputs.board.type === 'collection') {
+      delete values.position;
+    }
+
+    const card = await Card.create(values).fetch();
 
     if (inputs.user.subscribeToOwnCards) {
       await CardSubscription.create({
@@ -60,6 +98,7 @@ module.exports = {
       card.isSubscribed = false;
     }
 
+    // FIXME: broadcast subscription separately
     sails.sockets.broadcast(
       `board:${card.boardId}`,
       'cardCreate',
@@ -75,14 +114,12 @@ module.exports = {
       inputs.request,
     );
 
-    const values = {
+    await sails.helpers.createAction(card, inputs.user, {
       type: 'createCard',
       data: {
         list: _.pick(inputs.list, ['id', 'name']),
       },
-    };
-
-    await sails.helpers.createAction(card, inputs.user, values);
+    });
 
     return exits.success(card);
   },

server/api/helpers/create-project-membership.js

@@ -47,7 +47,6 @@ module.exports = {
     });
 
     const users = await sails.helpers.getUsers(userIds);
-
     const boards = await sails.helpers.getBoardsForProject(projectMembership.projectId);
 
     sails.sockets.broadcast(`user:${projectMembership.userId}`, 'projectCreate', {

server/api/helpers/create-project.js

@@ -1,13 +1,13 @@
 module.exports = {
   inputs: {
-    values: {
-      type: 'json',
-      required: true,
-    },
     user: {
       type: 'ref',
       required: true,
     },
+    values: {
+      type: 'json',
+      required: true,
+    },
     request: {
       type: 'ref',
     },

server/api/helpers/create-user.js

@@ -4,11 +4,25 @@ module.exports = {
   inputs: {
     values: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) &&
-        _.isString(value.email) &&
-        _.isString(value.password) &&
-        (!value.username || _.isString(value.username)),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isString(value.email)) {
+          return false;
+        }
+
+        if (!_.isString(value.password)) {
+          return false;
+        }
+
+        if (value.username && !_.isString(value.username)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     request: {

server/api/helpers/delete-project-membership.js

@@ -11,7 +11,6 @@ module.exports = {
 
   async fn(inputs, exits) {
     const boards = await sails.helpers.getBoardsForProject(inputs.record.projectId);
-
     const boardIds = sails.helpers.mapRecords(boards);
 
     const cards = await sails.helpers.getCardsForBoard(boardIds);

server/api/helpers/delete-user.js

@@ -31,11 +31,8 @@ module.exports = {
 
     if (user) {
       const adminUserIds = await sails.helpers.getAdminUserIds();
-
       const projectIds = await sails.helpers.getMembershipProjectIdsForUser(user.id);
-
       const userIdsForProject = await sails.helpers.getMembershipUserIdsForProject(projectIds);
-
       const userIds = _.union([user.id], adminUserIds, userIdsForProject);
 
       userIds.forEach((userId) => {

server/api/helpers/get-card-to-project-path.js

@@ -17,14 +17,26 @@ module.exports = {
       throw 'pathNotFound';
     }
 
-    const path = await sails.helpers
-      .getListToProjectPath(card.listId)
-      .intercept('pathNotFound', (nodes) => ({
-        pathNotFound: {
-          card,
-          ...nodes,
-        },
-      }));
+    let path;
+    if (card.listId) {
+      path = await sails.helpers
+        .getListToProjectPath(card.listId)
+        .intercept('pathNotFound', (nodes) => ({
+          pathNotFound: {
+            card,
+            ...nodes,
+          },
+        }));
+    } else {
+      path = await sails.helpers
+        .getBoardToProjectPath(card.boardId)
+        .intercept('pathNotFound', (nodes) => ({
+          pathNotFound: {
+            card,
+            ...nodes,
+          },
+        }));
+    }
 
     return exits.success({
       card,

server/api/helpers/get-cards-for-board.js

@@ -1,16 +1,42 @@
+const LIMIT = 10;
+
 module.exports = {
   inputs: {
-    id: {
-      type: 'json',
-      custom: (value) => _.isString(value) || _.isArray(value),
+    recordOrId: {
+      type: 'ref',
+      custom: (value) => _.isObjectLike(value) || _.isString(value) || _.every(value, _.isString),
       required: true,
     },
+    beforeId: {
+      type: 'string',
+    },
   },
 
   async fn(inputs, exits) {
-    const cards = await sails.helpers.getCards({
-      boardId: inputs.id,
-    });
+    const criteria = {};
+
+    let sort;
+    let limit;
+
+    if (_.isObjectLike(inputs.recordOrId)) {
+      criteria.boardId = inputs.recordOrId.id;
+
+      if (inputs.recordOrId.type === 'kanban') {
+        sort = 'position';
+      } else if (inputs.recordOrId.type === 'collection') {
+        if (inputs.beforeId) {
+          criteria.id = {
+            '<': inputs.beforeId,
+          };
+        }
+
+        limit = LIMIT;
+      }
+    } else {
+      criteria.boardId = inputs.recordOrId;
+    }
+
+    const cards = await sails.helpers.getCards(criteria, sort, limit);
 
     return exits.success(cards);
   },

server/api/helpers/get-cards.js

@@ -4,10 +4,17 @@ module.exports = {
       type: 'json',
       custom: (value) => _.isArray(value) || _.isPlainObject(value),
     },
+    sort: {
+      type: 'json',
+      defaultsTo: 'id DESC',
+    },
+    limit: {
+      type: 'number',
+    },
   },
 
   async fn(inputs, exits) {
-    const cards = await Card.find(inputs.criteria).sort('position');
+    const cards = await Card.find(inputs.criteria).sort(inputs.sort).limit(inputs.limit);
 
     return exits.success(cards);
   },

server/api/helpers/get-label-ids-for-card.js

@@ -9,7 +9,6 @@ module.exports = {
 
   async fn(inputs, exits) {
     const cardLabels = await sails.helpers.getCardLabelsForCard(inputs.id);
-
     const labelIds = sails.helpers.mapRecords(cardLabels, 'labelId', _.isArray(inputs.id));
 
     return exits.success(labelIds);

server/api/helpers/get-labels-for-card.js

@@ -9,7 +9,6 @@ module.exports = {
 
   async fn(inputs, exits) {
     const labelIds = await sails.helpers.getLabelIdsForCard(inputs.id);
-
     const labels = await sails.helpers.getLabels(labelIds);
 
     return exits.success(labels);

server/api/helpers/get-membership-user-ids-for-project.js

@@ -13,7 +13,6 @@ module.exports = {
 
   async fn(inputs, exits) {
     const projectMemberships = await sails.helpers.getMembershipsForProject(inputs.id);
-
     const userIds = sails.helpers.mapRecords(projectMemberships, 'userId', _.isArray(inputs.id));
 
     return exits.success(

server/api/helpers/update-board.js

@@ -6,8 +6,17 @@ module.exports = {
     },
     values: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     request: {

server/api/helpers/update-card.js

@@ -4,24 +4,33 @@ module.exports = {
       type: 'ref',
       required: true,
     },
-    values: {
-      type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
-      required: true,
+    toBoard: {
+      type: 'ref',
     },
     toList: {
       type: 'ref',
     },
-    toBoard: {
+    values: {
+      type: 'json',
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
+          return false;
+        }
+
+        return true;
+      },
+      required: true,
+    },
+    board: {
       type: 'ref',
     },
     list: {
       type: 'ref',
     },
-    board: {
-      type: 'ref',
-    },
     user: {
       type: 'ref',
     },
@@ -31,41 +40,72 @@ module.exports = {
   },
 
   exits: {
-    invalidParams: {},
+    boardMustBePresent: {},
+    listMustBePresent: {},
+    toListMustBelongToBoard: {},
+    toListMustBePresent: {},
+    positionMustBeInValues: {},
+    userMustBePresent: {},
   },
 
   async fn(inputs, exits) {
     const { isSubscribed, ...values } = inputs.values;
 
-    if (inputs.toList) {
-      if (!inputs.list || !inputs.user) {
-        throw 'invalidParams';
+    if (inputs.toBoard || inputs.toList || !_.isUndefined(values.position)) {
+      if (!inputs.board) {
+        throw 'boardMustBePresent';
       }
 
-      if (inputs.toList.id === inputs.list.id) {
-        delete inputs.toList; // eslint-disable-line no-param-reassign
-      } else {
-        values.listId = inputs.toList.id;
+      if (inputs.toBoard) {
+        if (inputs.toBoard.id === inputs.board.id) {
+          delete inputs.toBoard; // eslint-disable-line no-param-reassign
+        } else {
+          values.boardId = inputs.toBoard.id;
+        }
+      }
 
-        if (inputs.toBoard) {
-          if (!inputs.board) {
-            throw 'invalidParams';
-          }
+      const board = inputs.toBoard || inputs.board;
 
-          if (inputs.toBoard.id === inputs.board.id) {
-            delete inputs.toBoard; // eslint-disable-line no-param-reassign
-          } else {
-            values.boardId = inputs.toBoard.id;
-          }
+      if (inputs.toList) {
+        if (inputs.board.type === 'kanban' && !inputs.list) {
+          throw 'listMustBePresent';
+        }
+
+        if (inputs.toList.boardId !== board.id) {
+          throw 'toListMustBelongToBoard';
+        }
+
+        if (
+          board.type === 'collection' ||
+          (inputs.board.type === 'kanban' && inputs.toList.id === inputs.list.id)
+        ) {
+          delete inputs.toList; // eslint-disable-line no-param-reassign
+        } else {
+          values.listId = inputs.toList.id;
+        }
+      }
+
+      if (inputs.toList) {
+        if (_.isUndefined(values.position)) {
+          throw 'positionMustBeInValues';
+        }
+      } else if (inputs.toBoard) {
+        if (inputs.toBoard.type === 'kanban') {
+          throw 'toListMustBePresent';
+        }
+
+        if (inputs.board.type === 'kanban') {
+          values.listId = null;
+          values.position = null;
         }
       }
     }
 
-    if (!_.isUndefined(isSubscribed) && !inputs.user) {
-      throw 'invalidParams';
+    if ((!_.isUndefined(isSubscribed) || inputs.toBoard || inputs.toList) && !inputs.user) {
+      throw 'userMustBePresent';
     }
 
-    if (!_.isUndefined(values.position)) {
+    if (!_.isNil(values.position)) {
       const cards = await sails.helpers.getCardsForList(
         values.listId || inputs.record.listId,
         inputs.record.id,
@@ -73,8 +113,6 @@ module.exports = {
 
       const { position, repositions } = sails.helpers.insertToPositionables(values.position, cards);
 
-      values.position = position;
-
       repositions.forEach(async ({ id, position: nextPosition }) => {
         await Card.update({
           id,
@@ -83,19 +121,21 @@ module.exports = {
           position: nextPosition,
         });
 
-        sails.sockets.broadcast(`board:${inputs.record.boardId}`, 'cardUpdate', {
+        sails.sockets.broadcast(`board:${values.boardId || inputs.record.boardId}`, 'cardUpdate', {
           item: {
             id,
             position: nextPosition,
           },
         });
       });
+
+      values.position = position;
     }
 
     let card;
     if (!_.isEmpty(values)) {
       let prevLabels;
-      if (inputs.toList && inputs.toBoard) {
+      if (inputs.toBoard) {
         if (inputs.toBoard.projectId !== inputs.board.projectId) {
           const userIds = await sails.helpers.getMembershipUserIdsForProject(
             inputs.toBoard.projectId,
@@ -129,7 +169,7 @@ module.exports = {
         return exits.success(card);
       }
 
-      if (inputs.toList && inputs.toBoard) {
+      if (inputs.toBoard) {
         sails.sockets.broadcast(
           `board:${inputs.board.id}`,
           'cardDelete',
@@ -204,7 +244,7 @@ module.exports = {
         );
       }
 
-      if (inputs.toList) {
+      if (!inputs.toBoard && inputs.toList) {
         // TODO: add transfer action
         await sails.helpers.createAction(card, inputs.user, {
           type: 'moveCard',

server/api/helpers/update-list.js

@@ -6,8 +6,17 @@ module.exports = {
     },
     values: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     request: {

server/api/helpers/update-project.js

@@ -9,12 +9,25 @@ module.exports = {
     },
     values: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) &&
-        (_.isUndefined(value.background) ||
-          _.isNull(value.background) ||
-          _.isPlainObject(value.background)) &&
-        (_.isUndefined(value.backgroundImage) || _.isNull(value.backgroundImage)),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (
+          !_.isUndefined(value.background) &&
+          !_.isNull(value.background) &&
+          !_.isPlainObject(value.background)
+        ) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.backgroundImage) && !_.isNull(value.backgroundImage)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     request: {
@@ -23,7 +36,7 @@ module.exports = {
   },
 
   exits: {
-    invalidParams: {},
+    backgroundImageDirnameMustBeNotNullInValues: {},
   },
 
   async fn(inputs, exits) {
@@ -50,7 +63,7 @@ module.exports = {
     let project;
     if (inputs.values.background && inputs.values.background.type === 'image') {
       if (_.isNull(inputs.values.backgroundImageDirname)) {
-        throw 'invalidParams';
+        throw 'backgroundImageDirnameMustBeNotNullInValues';
       }
 
       if (_.isUndefined(inputs.values.backgroundImageDirname)) {

server/api/helpers/update-user.js

@@ -10,12 +10,29 @@ module.exports = {
     },
     values: {
       type: 'json',
-      custom: (value) =>
-        _.isPlainObject(value) &&
-        (_.isUndefined(value.email) || _.isString(value.email)) &&
-        (_.isUndefined(value.password) || _.isString(value.password)) &&
-        (!value.username || _.isString(value.username)) &&
-        (_.isUndefined(value.avatarUrl) || _.isNull(value.avatarUrl)),
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.email) && !_.isString(value.email)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.password) && !_.isString(value.password)) {
+          return false;
+        }
+
+        if (value.username && !_.isString(value.username)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.avatarUrl) && !_.isNull(value.avatarUrl)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     request: {
@@ -88,11 +105,8 @@ module.exports = {
 
       if (!isOnlyPasswordChange) {
         const adminUserIds = await sails.helpers.getAdminUserIds();
-
         const projectIds = await sails.helpers.getMembershipProjectIdsForUser(user.id);
-
         const userIdsForProject = await sails.helpers.getMembershipUserIdsForProject(projectIds);
-
         const userIds = _.union([user.id], adminUserIds, userIdsForProject);
 
         userIds.forEach((userId) => {

server/api/models/Board.js

@@ -5,12 +5,21 @@
  * @docs        :: https://sailsjs.com/docs/concepts/models-and-orm/models
  */
 
+const TYPES = ['kanban', 'collection'];
+
 module.exports = {
+  TYPES,
+
   attributes: {
     //  ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦  ╦╔═╗╔═╗
     //  ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
     //  ╩  ╩╚═╩╩ ╩╩ ╩ ╩ ╚╝ ╚═╝╚═╝
 
+    type: {
+      type: 'string',
+      isIn: TYPES,
+      required: true,
+    },
     position: {
       type: 'number',
       required: true,

server/api/models/Card.js

@@ -13,7 +13,7 @@ module.exports = {
 
     position: {
       type: 'number',
-      required: true,
+      allowNull: true,
     },
     name: {
       type: 'string',
@@ -40,16 +40,15 @@ module.exports = {
     //  ╠═╣╚═╗╚═╗║ ║║  ║╠═╣ ║ ║║ ║║║║╚═╗
     //  ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝
 
-    listId: {
-      model: 'List',
-      required: true,
-      columnName: 'list_id',
-    },
     boardId: {
       model: 'Board',
       required: true,
       columnName: 'board_id',
     },
+    listId: {
+      model: 'List',
+      columnName: 'list_id',
+    },
     coverAttachmentId: {
       model: 'Attachment',
       columnName: 'cover_attachment_id',