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..5a1789d81 --- /dev/null +++ b/src/sequelize/migrations/20181109132609-microservice-rename-updatedBy-to-userId.js @@ -0,0 +1,11 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('Microservices', 'updated_by', 'user_id') + }, + + down: (queryInterface, Sequelize) => { + 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..bb29277f6 --- /dev/null +++ b/src/sequelize/migrations/20181109132704-microservice-port-rename-updatedBy-to-userId.js @@ -0,0 +1,11 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.renameColumn('MicroservicePorts', 'updated_by', 'user_id') + }, + + down: (queryInterface, Sequelize) => { + 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 + ) + } +}; 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/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/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/iofog-service.js b/src/services/iofog-service.js index 99c36a5c2..bd6afd6ae 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() }; 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))