From bbf8cadd130da6888bd04d2beef5b15c6a620c63 Mon Sep 17 00:00:00 2001 From: Roc Wu Date: Mon, 23 Aug 2021 11:51:36 +0800 Subject: [PATCH] fix(deps): update sequelize to v5 --- core/services/client-manager.js | 2 +- core/services/deployments.js | 4 +- core/services/package-manager.js | 24 +++---- models/deployments.js | 2 +- package-lock.json | 109 +++++++++++++++---------------- package.json | 2 +- 6 files changed, 68 insertions(+), 75 deletions(-) diff --git a/core/services/client-manager.js b/core/services/client-manager.js index 7d2a1bfe..6ab73b3d 100644 --- a/core/services/client-manager.js +++ b/core/services/client-manager.js @@ -181,7 +181,7 @@ proto.updateCheck = function (deploymentKey, appVersion, label, packageHash, cli if (_.eq(packageId, 0)) { return; } - return models.Packages.findById(packageId) + return models.Packages.findByPk(packageId) .then((packages) => { if ( packages && diff --git a/core/services/deployments.js b/core/services/deployments.js index cc7c0395..10014a89 100644 --- a/core/services/deployments.js +++ b/core/services/deployments.js @@ -33,7 +33,7 @@ proto.existDeloymentName = function (appId, name) { proto.addDeloyment = function (name, appId, uid) { var self = this; - return models.Users.findById(uid).then((user) => { + return models.Users.findByPk(uid).then((user) => { if (_.isEmpty(user)) { throw new AppError.AppError("can't find user"); } @@ -115,7 +115,7 @@ proto.findPackagesAndOtherInfos = function (packageId) { userInfo: models.Users.findOne({ where: { id: packageInfo.released_by }, }), - deploymentsVersions: models.DeploymentsVersions.findById( + deploymentsVersions: models.DeploymentsVersions.findByPk( packageInfo.deployment_version_id, ), }); diff --git a/core/services/package-manager.js b/core/services/package-manager.js index 6c19a935..ee9fa740 100644 --- a/core/services/package-manager.js +++ b/core/services/package-manager.js @@ -31,14 +31,14 @@ proto.findPackageInfoByDeploymentIdAndLabel = function (deploymentId, label) { }; proto.findLatestPackageInfoByDeployVersion = function (deploymentsVersionsId) { - return models.DeploymentsVersions.findById(deploymentsVersionsId).then( + return models.DeploymentsVersions.findByPk(deploymentsVersionsId).then( (deploymentsVersions) => { if (!deploymentsVersions || deploymentsVersions.current_package_id < 0) { var e = new AppError.AppError('not found last packages'); log.debug(e); throw e; } - return models.Packages.findById(deploymentsVersions.current_package_id); + return models.Packages.findByPk(deploymentsVersions.current_package_id); }, ); }; @@ -100,7 +100,7 @@ proto.isMatchPackageHash = function (packageId, packageHash) { log.debug(`isMatchPackageHash packageId is 0`); return Promise.resolve(false); } - return models.Packages.findById(packageId).then((data) => { + return models.Packages.findByPk(packageId).then((data) => { if (data && _.eq(data.get('package_hash'), packageHash)) { log.debug(`isMatchPackageHash data:`, data.get()); log.debug(`isMatchPackageHash packageHash exist`); @@ -352,7 +352,7 @@ proto.createDiffPackagesByLastNums = function (appId, originalPackage, num) { order: [['id', 'asc']], limit: 2, }), - models.Apps.findById(appId), + models.Apps.findByPk(appId), ]) .spread((lastNumsPackages, basePackages, appInfo) => { return [ @@ -437,7 +437,7 @@ proto.releasePackage = function (appId, deploymentId, packageInfo, filePath, rel ]) .spread((blobHash) => { return security.uploadPackageType(directoryPath).then((type) => { - return models.Apps.findById(appId).then((appInfo) => { + return models.Apps.findByPk(appId).then((appInfo) => { if (type > 0 && appInfo.os > 0 && appInfo.os != type) { var e = new AppError.AppError('it must be publish it by ios type'); log.debug(e); @@ -518,7 +518,7 @@ proto.modifyReleasePackage = function (packageId, params) { var isMandatory = _.get(params, 'isMandatory'); var isDisabled = _.get(params, 'isDisabled'); var rollout = _.get(params, 'rollout'); - return models.Packages.findById(packageId) + return models.Packages.findByPk(packageId) .then((packageInfo) => { if (!packageInfo) { throw new AppError.AppError(`packageInfo not found`); @@ -535,7 +535,7 @@ proto.modifyReleasePackage = function (packageId, params) { app_version: appVersion, }, }), - models.DeploymentsVersions.findById(packageInfo.deployment_version_id), + models.DeploymentsVersions.findByPk(packageInfo.deployment_version_id), ]) .spread((v1, v2) => { if (v1 && !_.eq(v1.id, v2.id)) { @@ -594,7 +594,7 @@ proto.promotePackage = function (sourceDeploymentInfo, destDeploymentInfo, param if (!sourcePack) { throw new AppError.AppError('label does not exist.'); } - return models.DeploymentsVersions.findById( + return models.DeploymentsVersions.findByPk( sourcePack.deployment_version_id, ).then((deploymentsVersions) => { if (!deploymentsVersions) { @@ -615,13 +615,13 @@ proto.promotePackage = function (sourceDeploymentInfo, destDeploymentInfo, param if (_.lte(lastDeploymentVersionId, 0)) { throw new AppError.AppError(`does not exist last_deployment_version_id.`); } - return models.DeploymentsVersions.findById(lastDeploymentVersionId) + return models.DeploymentsVersions.findByPk(lastDeploymentVersionId) .then((deploymentsVersions) => { var sourcePackId = _.get(deploymentsVersions, 'current_package_id', 0); if (_.lte(sourcePackId, 0)) { throw new AppError.AppError(`packageInfo not found.`); } - return models.Packages.findById(sourcePackId).then((sourcePack) => { + return models.Packages.findByPk(sourcePackId).then((sourcePack) => { if (!sourcePack) { throw new AppError.AppError(`packageInfo not found.`); } @@ -706,11 +706,11 @@ proto.promotePackage = function (sourceDeploymentInfo, destDeploymentInfo, param proto.rollbackPackage = function (deploymentVersionId, targetLabel, rollbackUid) { var self = this; - return models.DeploymentsVersions.findById(deploymentVersionId).then((deploymentsVersions) => { + return models.DeploymentsVersions.findByPk(deploymentVersionId).then((deploymentsVersions) => { if (!deploymentsVersions) { throw new AppError.AppError('您之前还没有发布过版本'); } - return models.Packages.findById(deploymentsVersions.current_package_id) + return models.Packages.findByPk(deploymentsVersions.current_package_id) .then((currentPackageInfo) => { if (targetLabel) { return models.Packages.findAll({ diff --git a/models/deployments.js b/models/deployments.js index 25b726a8..02308906 100644 --- a/models/deployments.js +++ b/models/deployments.js @@ -33,7 +33,7 @@ module.exports = function (sequelize, DataTypes) { var self = this; return sequelize.transaction(function (t) { return self - .findById(deploymentId, { transaction: t, lock: t.LOCK.UPDATE }) + .findByPk(deploymentId, { transaction: t, lock: t.LOCK.UPDATE }) .then(function (data) { if (_.isEmpty(data)) { throw new AppError.AppError('does not find deployment'); diff --git a/package-lock.json b/package-lock.json index 7687738a..f86f6135 100644 --- a/package-lock.json +++ b/package-lock.json @@ -384,11 +384,6 @@ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" }, - "@types/geojson": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz", - "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==" - }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -3463,11 +3458,6 @@ "is-property": "^1.0.2" } }, - "generic-pool": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz", - "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==" - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -6445,22 +6435,11 @@ "dev": true }, "retry-as-promised": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz", - "integrity": "sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-3.2.0.tgz", + "integrity": "sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg==", "requires": { - "bluebird": "^3.4.6", - "debug": "^2.6.9" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - } + "any-promise": "^1.3.0" } }, "reusify": { @@ -6590,29 +6569,45 @@ "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=" }, "sequelize": { - "version": "4.44.4", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.44.4.tgz", - "integrity": "sha512-nkHmYkbwQK7uwpgW9VBalCBnQqQ8mslTdgcBthtJLORuPvAYRPlfkXZMVUU9TLLJt9CX+/y0MYg0DpcP6ywsEQ==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.22.0.tgz", + "integrity": "sha512-m7Qw2MplbaLw2hA4lu8CwzH6+1cG/W4lu5fVJY8S256Rma8ma0tR9yufC7dZGQ1QsL6KnTaEYwztAbgfQbd3Lw==", "requires": { "bluebird": "^3.5.0", "cls-bluebird": "^2.1.0", - "debug": "^3.1.0", - "depd": "^1.1.0", + "debug": "^4.1.1", "dottie": "^2.0.0", - "generic-pool": "3.5.0", "inflection": "1.12.0", - "lodash": "^4.17.1", - "moment": "^2.20.0", - "moment-timezone": "^0.5.14", - "retry-as-promised": "^2.3.2", - "semver": "^5.5.0", - "terraformer-wkt-parser": "^1.1.2", + "lodash": "^4.17.15", + "moment": "^2.24.0", + "moment-timezone": "^0.5.21", + "retry-as-promised": "^3.2.0", + "semver": "^6.3.0", + "sequelize-pool": "^2.3.0", "toposort-class": "^1.0.1", - "uuid": "^3.2.1", - "validator": "^10.4.0", - "wkx": "^0.4.1" + "uuid": "^3.3.3", + "validator": "^10.11.0", + "wkx": "^0.4.8" }, "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, "validator": { "version": "10.11.0", "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", @@ -6620,6 +6615,11 @@ } } }, + "sequelize-pool": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-2.3.0.tgz", + "integrity": "sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA==" + }, "serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -7147,7 +7147,17 @@ "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==" + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } }, "stringify-package": { "version": "1.0.1", @@ -7342,23 +7352,6 @@ } } }, - "terraformer": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.12.tgz", - "integrity": "sha512-MokUp0+MFal4CmJDVL6VAO1bKegeXcBM2RnPVfqcFIp2IIv8EbPAjG0j/vEy/vuKB8NVMMSF2vfpVS/QLe4DBg==", - "requires": { - "@types/geojson": "^7946.0.0 || ^1.0.0" - } - }, - "terraformer-wkt-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.1.tgz", - "integrity": "sha512-+CJyNLWb3lJ9RsZMTM66BY0MT3yIo4l4l22Jd9CrZuwzk54fsu4Sc7zejuS9fCITTuTQy3p06d4MZMVI7v5wSg==", - "requires": { - "@types/geojson": "^1.0.0", - "terraformer": "~1.0.5" - } - }, "text-extensions": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", diff --git a/package.json b/package.json index 6cca368e..efc19c1d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "recursive-readdir": "2.2.2", "redis": "3.1.2", "request": "2.88.2", - "sequelize": "4.44.4", + "sequelize": "5.22.0", "serve-favicon": "2.5.0", "slash": "3.0.0", "upyun": "3.4.4",