From ea4789ce2a3e9bca0608ffbb0c943b900cad3f5a Mon Sep 17 00:00:00 2001 From: dbusel Date: Thu, 1 Nov 2018 13:18:44 +0300 Subject: [PATCH 1/2] exclude fields on get list --- src/sequelize/managers/flow-manager.js | 12 ++++++++++++ src/services/flow-service.js | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/sequelize/managers/flow-manager.js b/src/sequelize/managers/flow-manager.js index 798d9aa66..88edbc6af 100644 --- a/src/sequelize/managers/flow-manager.js +++ b/src/sequelize/managers/flow-manager.js @@ -36,6 +36,18 @@ class FlowManager extends BaseManager { attributes: ['id'] }, {transaction: transaction}) } + + async findAllExcludeFields(where, transaction) { + return Flow.findAll({ + where: where, + attributes: { + exclude: [ + 'created_at', + 'updated_at', + 'updatedById', + 'userId' + ]}}, {transaction: transaction}) + } } diff --git a/src/services/flow-service.js b/src/services/flow-service.js index 0dea51423..ebac9b869 100644 --- a/src/services/flow-service.js +++ b/src/services/flow-service.js @@ -22,7 +22,7 @@ const ChangeTrackingManager = require('../sequelize/managers/change-tracking-man const _createFlow = async function (flowData, user, isCLI, transaction) { await Validation.validate(flowData, Validation.schemas.flowCreate); - await isFlowExist(flowData.name, transaction); + //await isFlowExist(flowData.name, transaction); await _checkForDuplicateName(flowData.name, {}, transaction); const flowToCreate = { @@ -117,7 +117,7 @@ const _getUserFlows = async function (user, isCLI, transaction) { userId: user.id }; - return await FlowManager.findAll(flow, transaction) + return await FlowManager.findAllExcludeFields(flow, transaction) }; const _getAllFlows = async function (isCLI, transaction) { From 16d011a63f9ab4932494c7755fa7e54a9a1acf50 Mon Sep 17 00:00:00 2001 From: dbusel Date: Thu, 1 Nov 2018 13:19:40 +0300 Subject: [PATCH 2/2] remove useless method --- src/services/flow-service.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/flow-service.js b/src/services/flow-service.js index ebac9b869..7a90fdf26 100644 --- a/src/services/flow-service.js +++ b/src/services/flow-service.js @@ -21,8 +21,7 @@ const ChangeTrackingManager = require('../sequelize/managers/change-tracking-man const _createFlow = async function (flowData, user, isCLI, transaction) { await Validation.validate(flowData, Validation.schemas.flowCreate); - - //await isFlowExist(flowData.name, transaction); + await _checkForDuplicateName(flowData.name, {}, transaction); const flowToCreate = {