From e8dddbb8534edbd0a5a5a3645fadaa48e0bfdd7d Mon Sep 17 00:00:00 2001 From: dbusel Date: Fri, 9 Nov 2018 15:40:49 +0300 Subject: [PATCH 1/4] rename updatedBy to userId --- .../migrations/20180930164635-create-flow.js | 6 ---- .../20181001062956-create-microservice.js | 6 ++-- ...20181001070828-create-microservice-port.js | 4 +-- src/sequelize/models/flow.js | 9 ------ src/sequelize/models/microservice.js | 4 +-- src/sequelize/models/microserviceport.js | 4 +-- src/sequelize/models/user.js | 8 +++++ src/services/flow-service.js | 1 - src/services/microservices-service.js | 32 +++++++++---------- 9 files changed, 33 insertions(+), 41 deletions(-) diff --git a/src/sequelize/migrations/20180930164635-create-flow.js b/src/sequelize/migrations/20180930164635-create-flow.js index 4540bef37..05910c033 100644 --- a/src/sequelize/migrations/20180930164635-create-flow.js +++ b/src/sequelize/migrations/20180930164635-create-flow.js @@ -40,12 +40,6 @@ module.exports = { field: 'user_id', references: { model: 'Users', key: 'id' }, onDelete: 'cascade' - }, - updatedBy: { - type: Sequelize.INTEGER, - field: 'updated_by', - references: { model: 'Users', key: 'id' }, - onDelete: 'set null' } }); }, diff --git a/src/sequelize/migrations/20181001062956-create-microservice.js b/src/sequelize/migrations/20181001062956-create-microservice.js index 0d6117b37..be1ea98b1 100644 --- a/src/sequelize/migrations/20181001062956-create-microservice.js +++ b/src/sequelize/migrations/20181001062956-create-microservice.js @@ -64,11 +64,11 @@ module.exports = { references: { model: 'Fogs', key: 'uuid' }, onDelete: 'set null' }, - updatedBy: { + userId: { type: Sequelize.INTEGER, - field: 'updated_by', + field: 'user_id', references: { model: 'Users', key: 'id' }, - onDelete: 'set null' + onDelete: 'cascade' }, catalogItemId: { type: Sequelize.INTEGER, diff --git a/src/sequelize/migrations/20181001070828-create-microservice-port.js b/src/sequelize/migrations/20181001070828-create-microservice-port.js index 1c53f4e5a..3e7ebf6b1 100644 --- a/src/sequelize/migrations/20181001070828-create-microservice-port.js +++ b/src/sequelize/migrations/20181001070828-create-microservice-port.js @@ -37,9 +37,9 @@ module.exports = { references: { model: 'Microservices', key: 'uuid' }, onDelete: 'cascade' }, - updatedBy: { + userId: { type: Sequelize.INTEGER, - field: 'updated_by', + field: 'user_id', references: { model: 'Users', key: 'id' }, onDelete: 'cascade' } diff --git a/src/sequelize/models/flow.js b/src/sequelize/models/flow.js index b12f7942f..a4e8439f5 100644 --- a/src/sequelize/models/flow.js +++ b/src/sequelize/models/flow.js @@ -39,15 +39,6 @@ module.exports = (sequelize, DataTypes) => { onDelete: 'cascade' }); - Flow.belongsTo(models.User, { - foreignKey: { - name: 'updatedById', - field: 'updated_by' - }, - as: 'updatedBy', - onDelete: 'set null' - }); - Flow.hasMany(models.Microservice, { foreignKey: { name: 'flowId', diff --git a/src/sequelize/models/microservice.js b/src/sequelize/models/microservice.js index 5e64cb234..a96c22d32 100644 --- a/src/sequelize/models/microservice.js +++ b/src/sequelize/models/microservice.js @@ -92,8 +92,8 @@ module.exports = (sequelize, DataTypes) => { Microservice.belongsTo(models.User, { foreignKey: { - name: 'updatedBy', - field: 'updated_by' + name: 'userId', + field: 'user_id' }, as: 'user', onDelete: 'cascade' diff --git a/src/sequelize/models/microserviceport.js b/src/sequelize/models/microserviceport.js index f397d6ebe..cca3aeedc 100644 --- a/src/sequelize/models/microserviceport.js +++ b/src/sequelize/models/microserviceport.js @@ -37,8 +37,8 @@ module.exports = (sequelize, DataTypes) => { MicroservicePort.belongsTo(models.User, { foreignKey: { - name: 'updatedBy', - field: 'updated_by' + name: 'userId', + field: 'user_id' }, as: 'user', onDelete: 'cascade' diff --git a/src/sequelize/models/user.js b/src/sequelize/models/user.js index 519535f4b..f18b1fa83 100644 --- a/src/sequelize/models/user.js +++ b/src/sequelize/models/user.js @@ -63,6 +63,14 @@ module.exports = (sequelize, DataTypes) => { as: 'fog' }); + User.hasMany(models.Microservice, { + foreignKey: { + name: 'userId', + field: 'user_id' + }, + as: 'microservice' + }); + }; return User; }; \ No newline at end of file diff --git a/src/services/flow-service.js b/src/services/flow-service.js index d1f2458eb..b422499dd 100644 --- a/src/services/flow-service.js +++ b/src/services/flow-service.js @@ -84,7 +84,6 @@ const _updateFlow = async function (flowData, flowId, user, isCLI, transaction) name: flowData.name, description: flowData.description, isActivated: flowData.isActivated, - updatedBy: user.id }; const updateFlowData = AppHelper.deleteUndefinedFields(flow); diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js index 830544eff..b1fb6d42b 100644 --- a/src/services/microservices-service.js +++ b/src/services/microservices-service.js @@ -99,7 +99,7 @@ const _createMicroservice = async function (microserviceData, user, isCLI, trans iofogUuid: microserviceData.iofogUuid, rootHostAccess: microserviceData.rootHostAccess, logSize: microserviceData.logLimit, - updatedBy: user.id + userId: user.id }; newMicroservice = AppHelper.deleteUndefinedFields(newMicroservice); @@ -150,14 +150,14 @@ const _updateMicroservice = async function (microserviceUuid, microserviceData, rootHostAccess: microserviceData.rootHostAccess, logSize: microserviceData.logLimit, volumeMappings: microserviceData.volumeMappings, - updatedBy: user.id + userId: user.id }; const microserviceDataUpdate = AppHelper.deleteUndefinedFields(microserviceToUpdate); const microservice = await MicroserviceManager.findOne({ uuid: microserviceUuid, - updatedBy: user.id + userId: user.id }, transaction); if (microserviceDataUpdate.name) { @@ -208,7 +208,7 @@ const _deleteMicroservice = async function (microserviceUuid, deleteWithCleanUp, ? { uuid: microserviceUuid, - updatedBy: user.id + userId: user.id } : { @@ -257,12 +257,12 @@ const _checkForDuplicateName = async function (name, item, userId, transaction) { name: name, uuid: {[Op.ne]: item.id}, - updatedBy: userId + userId: userId } : { name: name, - updatedBy: userId + userId: userId }; const result = await MicroserviceManager.findOne(where, transaction); @@ -292,7 +292,7 @@ const _validateMicroserviceOnGet = async function (userId, microserviceUuid, tra async function _createRoute(sourceMicroserviceUuid, destMicroserviceUuid, user, isCLI, transaction) { const sourceWhere = isCLI ? {uuid: sourceMicroserviceUuid} - : {uuid: sourceMicroserviceUuid, updatedBy: user.id}; + : {uuid: sourceMicroserviceUuid, userId: user.id}; const sourceMicroservice = await MicroserviceManager.findOne(sourceWhere, transaction); if (!sourceMicroservice) { @@ -301,7 +301,7 @@ async function _createRoute(sourceMicroserviceUuid, destMicroserviceUuid, user, const destWhere = isCLI ? {uuid: destMicroserviceUuid} - : {uuid: destMicroserviceUuid, updatedBy: user.id}; + : {uuid: destMicroserviceUuid, userId: user.id}; const destMicroservice = await MicroserviceManager.findOne(destWhere, transaction); if (!destMicroservice) { @@ -447,7 +447,7 @@ async function _createNetworkMicroserviceForMaster(masterMicroservice, sourceNet iofogUuid: masterMicroservice.iofogUuid, rootHostAccess: false, logSize: 50, - updatedBy: user.id, + userId: user.id, configLastUpdated: Date.now() }; @@ -468,7 +468,7 @@ async function _switchOnUpdateFlagsForMicroservicesInRoute(sourceMicroservice, d async function _deleteRoute(sourceMicroserviceUuid, destMicroserviceUuid, user, isCLI, transaction) { const sourceWhere = isCLI ? {uuid: sourceMicroserviceUuid} - : {uuid: sourceMicroserviceUuid, updatedBy: user.id}; + : {uuid: sourceMicroserviceUuid, userId: user.id}; const sourceMicroservice = await MicroserviceManager.findOne(sourceWhere, transaction); if (!sourceMicroservice) { @@ -477,7 +477,7 @@ async function _deleteRoute(sourceMicroserviceUuid, destMicroserviceUuid, user, const destWhere = isCLI ? {uuid: destMicroserviceUuid} - : {uuid: destMicroserviceUuid, updatedBy: user.id}; + : {uuid: destMicroserviceUuid, userId: user.id}; const destMicroservice = await MicroserviceManager.findOne(destWhere, transaction); if (!destMicroservice) { @@ -527,7 +527,7 @@ async function _createPortMapping(microserviceUuid, portMappingData, user, isCLI const where = isCLI ? {uuid: microserviceUuid} - : {uuid: microserviceUuid, updatedBy: user.id}; + : {uuid: microserviceUuid, userId: user.id}; const microservice = await MicroserviceManager.findOne(where, transaction) if (!microservice) { @@ -567,7 +567,7 @@ async function _createSimplePortMapping(microservice, portMappingData, user, tra isPublic: false, portInternal: portMappingData.internal, portExternal: portMappingData.external, - updatedBy: user.id, + userId: user.id, microserviceUuid: microservice.uuid } @@ -625,7 +625,7 @@ async function _createPortMappingOverConnector(microservice, portMappingData, us isPublic: true, portInternal: portMappingData.internal, portExternal: portMappingData.external, - updatedBy: user.id, + userId: user.id, microserviceUuid: microservice.uuid } @@ -663,7 +663,7 @@ async function _switchOnUpdateFlagsForMicroservicesForPortMapping(microservice, async function _deletePortMapping(microserviceUuid, internalPort, user, isCLI, transaction) { const where = isCLI ? {uuid: microserviceUuid} - : {uuid: microserviceUuid, updatedBy: user.id} + : {uuid: microserviceUuid, userId: user.id} const microservice = await MicroserviceManager.findOne(where, transaction); if (!microservice) { @@ -748,7 +748,7 @@ async function _buildPortsList(portsPairs, transaction) { async function _getPortMappingList(microserviceUuid, user, isCLI, transaction) { const where = isCLI ? {uuid: microserviceUuid} - : {uuid: microserviceUuid, updatedBy: user.id}; + : {uuid: microserviceUuid, userId: user.id}; const microservice = await MicroserviceManager.findOne(where, transaction) if (!microservice) { throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, microserviceUuid)) From 9132c93593234ed55ee56a5fbb823f43be77edbe Mon Sep 17 00:00:00 2001 From: dbusel Date: Fri, 9 Nov 2018 15:45:04 +0300 Subject: [PATCH 2/4] rename updatedBy to userId --- src/services/diagnostic-service.js | 4 ++-- src/services/iofog-service.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/services/diagnostic-service.js b/src/services/diagnostic-service.js index 9f72706a9..c74999185 100644 --- a/src/services/diagnostic-service.js +++ b/src/services/diagnostic-service.js @@ -84,7 +84,7 @@ const postMicroserviceImageSnapshotCreate = async function (microserviceUuid, us : { uuid: microserviceUuid, - updatedBy: user.id + userId: user.id }; @@ -108,7 +108,7 @@ const getMicroserviceImageSnapshot = async function (microserviceUuid, user, isC : { uuid: microserviceUuid, - updatedBy: user.id + userId: user.id }; const microservice = await MicroserviceManager.findOneWithDependencies(where, {}, transaction); if (microservice.iofogUuid === null) { diff --git a/src/services/iofog-service.js b/src/services/iofog-service.js index 2ee18a7fd..5be725229 100644 --- a/src/services/iofog-service.js +++ b/src/services/iofog-service.js @@ -78,7 +78,7 @@ async function _createFog(fogData, user, isCli, transaction) { iofogUuid: fog.uuid, rootHostAccess: true, logSize: 50, - updatedBy: user.id, + userId: user.id, configLastUpdated: Date.now() }; @@ -97,7 +97,7 @@ async function _createFog(fogData, user, isCli, transaction) { iofogUuid: fog.uuid, rootHostAccess: true, logSize: 50, - updatedBy: user.id, + userId: user.id, configLastUpdated: Date.now() }; @@ -174,7 +174,7 @@ async function _updateFog(fogData, user, isCli, transaction) { iofogUuid: fogData.uuid, rootHostAccess: true, logSize: 50, - updatedBy: user.id, + userId: user.id, configLastUpdated: Date.now() }; @@ -206,7 +206,7 @@ async function _updateFog(fogData, user, isCli, transaction) { iofogUuid: fogData.uuid, rootHostAccess: true, logSize: 50, - updatedBy: user.id, + userId: user.id, configLastUpdated: Date.now() }; From 389212ee286cd0c64f59a52141030ecfbcd3e25a Mon Sep 17 00:00:00 2001 From: dbusel Date: Fri, 9 Nov 2018 16:38:39 +0300 Subject: [PATCH 3/4] resolve pr comments --- .../migrations/20180930164635-create-flow.js | 6 ++++++ .../20181001062956-create-microservice.js | 6 +++--- .../20181001070828-create-microservice-port.js | 4 ++-- ...9-microservice-rename-updatedBy-to-userId.js | 17 +++++++++++++++++ ...roservice-port-rename-updatedBy-to-userId.js | 17 +++++++++++++++++ .../20181109132723-flow-remove-updatedBy.js | 14 ++++++++++++++ 6 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js create mode 100644 src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js create mode 100644 src/sequelize/migrations/20181109132723-flow-remove-updatedBy.js diff --git a/src/sequelize/migrations/20180930164635-create-flow.js b/src/sequelize/migrations/20180930164635-create-flow.js index 05910c033..4540bef37 100644 --- a/src/sequelize/migrations/20180930164635-create-flow.js +++ b/src/sequelize/migrations/20180930164635-create-flow.js @@ -40,6 +40,12 @@ module.exports = { field: 'user_id', references: { model: 'Users', key: 'id' }, onDelete: 'cascade' + }, + updatedBy: { + type: Sequelize.INTEGER, + field: 'updated_by', + references: { model: 'Users', key: 'id' }, + onDelete: 'set null' } }); }, diff --git a/src/sequelize/migrations/20181001062956-create-microservice.js b/src/sequelize/migrations/20181001062956-create-microservice.js index be1ea98b1..0d6117b37 100644 --- a/src/sequelize/migrations/20181001062956-create-microservice.js +++ b/src/sequelize/migrations/20181001062956-create-microservice.js @@ -64,11 +64,11 @@ module.exports = { references: { model: 'Fogs', key: 'uuid' }, onDelete: 'set null' }, - userId: { + updatedBy: { type: Sequelize.INTEGER, - field: 'user_id', + field: 'updated_by', references: { model: 'Users', key: 'id' }, - onDelete: 'cascade' + onDelete: 'set null' }, catalogItemId: { type: Sequelize.INTEGER, diff --git a/src/sequelize/migrations/20181001070828-create-microservice-port.js b/src/sequelize/migrations/20181001070828-create-microservice-port.js index 3e7ebf6b1..1c53f4e5a 100644 --- a/src/sequelize/migrations/20181001070828-create-microservice-port.js +++ b/src/sequelize/migrations/20181001070828-create-microservice-port.js @@ -37,9 +37,9 @@ module.exports = { references: { model: 'Microservices', key: 'uuid' }, onDelete: 'cascade' }, - userId: { + updatedBy: { type: Sequelize.INTEGER, - field: 'user_id', + field: 'updated_by', references: { model: 'Users', key: 'id' }, onDelete: 'cascade' } diff --git a/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js b/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js new file mode 100644 index 000000000..d47ad80f0 --- /dev/null +++ b/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js @@ -0,0 +1,17 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('Microservices', 'updated_by', 'user_id') + .then(() => { + return queryInterface.renameColumn('Microservices', 'updated_by', 'user_id') + }) + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('Microservices', 'user_id', 'updated_by') + .then(() => { + return queryInterface.renameColumn('Microservices', 'user_id', 'updated_by') + }) + } +}; diff --git a/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js b/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js new file mode 100644 index 000000000..dc7adab2d --- /dev/null +++ b/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js @@ -0,0 +1,17 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('MicroservicePorts', 'updated_by', 'user_id') + .then(() => { + return queryInterface.renameColumn('MicroservicePorts', 'updated_by', 'user_id') + }) + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('MicroservicePorts', 'user_id', 'updated_by') + .then(() => { + return queryInterface.renameColumn('MicroservicePorts', 'user_id', 'updated_by') + }) + } +}; diff --git a/src/sequelize/migrations/20181109132723-flow-remove-updatedBy.js b/src/sequelize/migrations/20181109132723-flow-remove-updatedBy.js new file mode 100644 index 000000000..85d4fd00f --- /dev/null +++ b/src/sequelize/migrations/20181109132723-flow-remove-updatedBy.js @@ -0,0 +1,14 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.removeColumn('Flows', 'updated_by') + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.addColumn('Flows', + 'updated_by', + Sequelize.INTEGER + ) + } +}; From 998c5fbc26c17a27eeda67ca7c504e3127964c4a Mon Sep 17 00:00:00 2001 From: dbusel Date: Fri, 9 Nov 2018 16:43:25 +0300 Subject: [PATCH 4/4] remove duplicates --- ...0181109132609-microservice-rename-updatedBy-to-userId.js | 6 ------ ...09132704-microservice-port-rename-updatedBy-to-userId.js | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js b/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js index d47ad80f0..5a1789d81 100644 --- a/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js +++ b/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js @@ -3,15 +3,9 @@ module.exports = { up: (queryInterface, Sequelize) => { return queryInterface.renameColumn('Microservices', 'updated_by', 'user_id') - .then(() => { - return queryInterface.renameColumn('Microservices', 'updated_by', 'user_id') - }) }, down: (queryInterface, Sequelize) => { return queryInterface.renameColumn('Microservices', 'user_id', 'updated_by') - .then(() => { - return queryInterface.renameColumn('Microservices', 'user_id', 'updated_by') - }) } }; diff --git a/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js b/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js index dc7adab2d..bb29277f6 100644 --- a/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js +++ b/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js @@ -3,15 +3,9 @@ module.exports = { up: (queryInterface, Sequelize) => { return queryInterface.renameColumn('MicroservicePorts', 'updated_by', 'user_id') - .then(() => { - return queryInterface.renameColumn('MicroservicePorts', 'updated_by', 'user_id') - }) }, down: (queryInterface, Sequelize) => { return queryInterface.renameColumn('MicroservicePorts', 'user_id', 'updated_by') - .then(() => { - return queryInterface.renameColumn('MicroservicePorts', 'user_id', 'updated_by') - }) } };