From 6f79fc45ebf1beb76043e21275388e7a42ba2d11 Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Sun, 8 Jan 2023 22:10:41 +0100 Subject: [PATCH] ref: Little refactoring --- server/api/helpers/cards/create-one.js | 2 +- server/api/helpers/cards/update-one.js | 2 +- server/api/helpers/projects/update-one.js | 4 ++-- server/api/helpers/users/create-one.js | 2 +- server/api/helpers/users/update-one.js | 4 ++-- .../20220523131229_add_image_to_attachment_table.js | 6 ++---- .../migrations/20221225224651_remove_board_types.js.js | 10 +++++----- ...20221226210239_improve_quality_of_resized_images.js | 1 - 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/server/api/helpers/cards/create-one.js b/server/api/helpers/cards/create-one.js index 0999c27d..e1a96b42 100644 --- a/server/api/helpers/cards/create-one.js +++ b/server/api/helpers/cards/create-one.js @@ -3,7 +3,7 @@ const valuesValidator = (value) => { return false; } - if (!_.isFinite(value.position)) { + if (!_.isUndefined(value.position) && !_.isFinite(value.position)) { return false; } diff --git a/server/api/helpers/cards/update-one.js b/server/api/helpers/cards/update-one.js index 7f86892d..1a78f8db 100644 --- a/server/api/helpers/cards/update-one.js +++ b/server/api/helpers/cards/update-one.js @@ -99,7 +99,7 @@ module.exports = { throw 'userMustBePresent'; } - if (!_.isNil(values.position)) { + if (!_.isUndefined(values.position)) { const boardId = values.boardId || inputs.record.boardId; const listId = values.listId || inputs.record.listId; diff --git a/server/api/helpers/projects/update-one.js b/server/api/helpers/projects/update-one.js index e14c8a40..71e095f1 100644 --- a/server/api/helpers/projects/update-one.js +++ b/server/api/helpers/projects/update-one.js @@ -6,11 +6,11 @@ const valuesValidator = (value) => { return false; } - if (value.background && !_.isPlainObject(value.background)) { + if (!_.isNil(value.background) && !_.isPlainObject(value.background)) { return false; } - if (value.backgroundImage && !_.isPlainObject(value.backgroundImage)) { + if (!_.isNil(value.backgroundImage) && !_.isPlainObject(value.backgroundImage)) { return false; } diff --git a/server/api/helpers/users/create-one.js b/server/api/helpers/users/create-one.js index 4c628869..8df1d146 100644 --- a/server/api/helpers/users/create-one.js +++ b/server/api/helpers/users/create-one.js @@ -13,7 +13,7 @@ const valuesValidator = (value) => { return false; } - if (value.username && !_.isString(value.username)) { + if (!_.isNil(value.username) && !_.isString(value.username)) { return false; } diff --git a/server/api/helpers/users/update-one.js b/server/api/helpers/users/update-one.js index 314b9d7e..26533da7 100644 --- a/server/api/helpers/users/update-one.js +++ b/server/api/helpers/users/update-one.js @@ -16,11 +16,11 @@ const valuesValidator = (value) => { return false; } - if (value.username && !_.isString(value.username)) { + if (!_.isNil(value.username) && !_.isString(value.username)) { return false; } - if (value.avatar && !_.isPlainObject(value.avatar)) { + if (!_.isNil(value.avatar) && !_.isPlainObject(value.avatar)) { return false; } diff --git a/server/db/migrations/20220523131229_add_image_to_attachment_table.js b/server/db/migrations/20220523131229_add_image_to_attachment_table.js index cf88e5d4..989f6957 100644 --- a/server/db/migrations/20220523131229_add_image_to_attachment_table.js +++ b/server/db/migrations/20220523131229_add_image_to_attachment_table.js @@ -63,11 +63,9 @@ module.exports.down = async (knex) => { .where('id', attachment.id); } - await knex.schema.table('attachment', (table) => { + return knex.schema.table('attachment', (table) => { table.dropColumn('image'); - }); - return knex.schema.alterTable('attachment', (table) => { - table.boolean('is_image').notNullable().alter(); + table.dropNullable('is_image'); }); }; diff --git a/server/db/migrations/20221225224651_remove_board_types.js.js b/server/db/migrations/20221225224651_remove_board_types.js.js index 56a67d90..7877e6e6 100644 --- a/server/db/migrations/20221225224651_remove_board_types.js.js +++ b/server/db/migrations/20221225224651_remove_board_types.js.js @@ -3,8 +3,8 @@ module.exports.up = async (knex) => { table.dropColumn('type'); }); - return knex.schema.alterTable('card', (table) => { - table.bigInteger('list_id').notNullable().alter(); + return knex.schema.table('card', (table) => { + table.dropNullable('list_id'); }); }; @@ -12,10 +12,10 @@ module.exports.down = async (knex) => { await knex.schema.table('board', (table) => { /* Columns */ - table.text('type').notNullable().defaultTo('kanban'); + table.text('type').notNullable().defaultTo('kanban'); // FIXME: drop default }); - return knex.schema.alterTable('card', (table) => { - table.bigInteger('list_id').alter(); + return knex.schema.table('card', (table) => { + table.setNullable('list_id'); }); }; diff --git a/server/db/migrations/20221226210239_improve_quality_of_resized_images.js b/server/db/migrations/20221226210239_improve_quality_of_resized_images.js index ffc40cd6..cfa96ca0 100644 --- a/server/db/migrations/20221226210239_improve_quality_of_resized_images.js +++ b/server/db/migrations/20221226210239_improve_quality_of_resized_images.js @@ -100,7 +100,6 @@ const processAttachmentImage = async (attachment, attachmentsPath) => { module.exports.up = async (knex) => { const config = await getConfig(); - const users = await knex('user_account').whereNotNull('avatar'); // eslint-disable-next-line no-restricted-syntax