feat: upgrade sequelize version (#110)

eggjs · Jun 18, 2019 · 1fd7cd5 · 1fd7cd5
1 parent 0730b76
commit 1fd7cd5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/sequelize-ts/package.json b/sequelize-ts/package.json
@@ -15,7 +15,7 @@
     "egg-mock": "^3.19.2",
     "factory-girl": "^5.0.2",
     "lodash": "^4.17.10",
-    "sequelize-cli": "^4.0.0"
+    "sequelize-cli": "^5.0.0"
   },
   "engines": {
     "node": ">=8.9.0"

diff --git a/sequelize/app/service/post.js b/sequelize/app/service/post.js
@@ -19,7 +19,7 @@ class Post extends Service {
   }
 
   async find(id) {
-    const post = await this.ctx.model.Post.findById(id, {
+    const post = await this.ctx.model.Post.findByPk(id, {
       include: [{
         model: this.ctx.model.User,
         as: 'user',

diff --git a/sequelize/app/service/user.js b/sequelize/app/service/user.js
@@ -12,7 +12,7 @@ class User extends Service {
   }
 
   async find(id) {
-    const user = await this.ctx.model.User.findById(id);
+    const user = await this.ctx.model.User.findByPk(id);
     if (!user) {
       this.ctx.throw(404, 'user not found');
     }
@@ -24,15 +24,15 @@ class User extends Service {
   }
 
   async update({ id, updates }) {
-    const user = await this.ctx.model.User.findById(id);
+    const user = await this.ctx.model.User.findByPk(id);
     if (!user) {
       this.ctx.throw(404, 'user not found');
     }
     return user.update(updates);
   }
 
   async del(id) {
-    const user = await this.ctx.model.User.findById(id);
+    const user = await this.ctx.model.User.findByPk(id);
     if (!user) {
       this.ctx.throw(404, 'user not found');
     }

diff --git a/sequelize/package.json b/sequelize/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "egg": "^2.10.0",
-    "egg-sequelize": "^4.0.1",
+    "egg-sequelize": "^5.0.1",
     "mysql2": "^1.6.1"
   },
   "devDependencies": {
@@ -14,7 +14,7 @@
     "egg-mock": "^3.19.2",
     "factory-girl": "^5.0.2",
     "lodash": "^4.17.10",
-    "sequelize-cli": "^4.0.0"
+    "sequelize-cli": "^5.0.0"
   },
   "engines": {
     "node": ">=8.9.0"

diff --git a/sequelize/test/app/service/post.test.js b/sequelize/test/app/service/post.test.js
@@ -144,7 +144,7 @@ describe('test/app/service/post.test.js', () => {
 
     it('should throw 404 when id not found', async () => {
       try {
-        await ctx.service.post.destroy({ id: 1 });
+        await ctx.service.post.destroy({ id: 1, user_id: 1 });
         throw new Error('should not execute');
       } catch (error) {
         assert(error.status === 404);