fix(deps): update sequelize to v5

shm-open · Aug 23, 2021 · bbf8cad · bbf8cad
1 parent 09050a9
commit bbf8cad
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 75 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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",