update dependencies version to the latest

didinj · didinj · commit 37e8d0f687a9 · 2020-07-02T07:44:24.000+07:00
diff --git a/controllers/classroom.js b/controllers/classroom.js
@@ -20,7 +20,7 @@ module.exports = {
 
   getById(req, res) {
     return Classroom
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Student,
           as: 'students'
@@ -34,7 +34,10 @@ module.exports = {
         }
         return res.status(200).send(classroom);
       })
-      .catch((error) => res.status(400).send(error));
+      .catch((error) => {
+        console.log(error);
+        res.status(400).send(error);
+      });
   },
 
   add(req, res) {
@@ -63,7 +66,7 @@ module.exports = {
 
   update(req, res) {
     return Classroom
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Student,
           as: 'students'
@@ -87,7 +90,7 @@ module.exports = {
 
   delete(req, res) {
     return Classroom
-      .findById(req.params.id)
+      .findByPk(req.params.id)
       .then(classroom => {
         if (!classroom) {
           return res.status(400).send({
diff --git a/controllers/course.js b/controllers/course.js
@@ -24,7 +24,7 @@ module.exports = {
 
   getById(req, res) {
     return Course
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Course,
           as: 'course'
@@ -52,7 +52,7 @@ module.exports = {
 
   update(req, res) {
     return Course
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Course,
           as: 'course'
@@ -76,7 +76,7 @@ module.exports = {
 
   delete(req, res) {
     return Course
-      .findById(req.params.id)
+      .findByPk(req.params.id)
       .then(course => {
         if (!course) {
           return res.status(400).send({
diff --git a/controllers/lecturer.js b/controllers/lecturer.js
@@ -20,7 +20,7 @@ module.exports = {
 
   getById(req, res) {
     return Lecturer
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Course,
           as: 'course'
@@ -63,7 +63,7 @@ module.exports = {
 
   update(req, res) {
     return Lecturer
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Course,
           as: 'course'
@@ -87,7 +87,7 @@ module.exports = {
 
   delete(req, res) {
     return Lecturer
-      .findById(req.params.id)
+      .findByPk(req.params.id)
       .then(lecturer => {
         if (!lecturer) {
           return res.status(400).send({
diff --git a/controllers/student.js b/controllers/student.js
@@ -24,7 +24,7 @@ module.exports = {
 
   getById(req, res) {
     return Student
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Classroom,
           as: 'classroom'
@@ -56,7 +56,7 @@ module.exports = {
 
   addCourse(req, res) {
     return Student
-      .findById(req.body.student_id, {
+      .findByPk(req.body.student_id, {
         include: [{
           model: Classroom,
           as: 'classroom'
@@ -71,7 +71,7 @@ module.exports = {
             message: 'Student Not Found',
           });
         }
-        Course.findById(req.body.course_id).then((course) => {
+        Course.findByPk(req.body.course_id).then((course) => {
           if (!course) {
             return res.status(404).send({
               message: 'Course Not Found',
@@ -86,7 +86,7 @@ module.exports = {
 
   update(req, res) {
     return Student
-      .findById(req.params.id, {
+      .findByPk(req.params.id, {
         include: [{
           model: Classroom,
           as: 'classroom'
@@ -103,7 +103,7 @@ module.exports = {
         }
         return student
           .update({
-            student_name: req.body.student_name || classroom.student_name,
+            student_name: req.body.student_name || student.student_name,
           })
           .then(() => res.status(200).send(student))
           .catch((error) => res.status(400).send(error));
@@ -113,7 +113,7 @@ module.exports = {
 
   delete(req, res) {
     return Student
-      .findById(req.params.id)
+      .findByPk(req.params.id)
       .then(student => {
         if (!student) {
           return res.status(400).send({
diff --git a/models/classroom.js b/models/classroom.js
@@ -1,17 +1,22 @@
 'use strict';
-
+const {
+  Model
+} = require('sequelize');
 module.exports = (sequelize, DataTypes) => {
-  var Classroom = sequelize.define('Classroom', {
+  class Classroom extends Model {
+    static associate(models) {
+      Classroom.hasMany(models.Student, {
+        foreignKey: 'classroom_id',
+        as: 'students',
+      });
+    }
+  };
+  Classroom.init({
     id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false },
     class_name: DataTypes.STRING
-  }, {});
-
-  Classroom.associate = function(models) {
-    Classroom.hasMany(models.Student, {
-      foreignKey: 'classroom_id',
-      as: 'students',
-    });
-  };
-
+  }, {
+    sequelize,
+    modelName: 'Classroom',
+  });
   return Classroom;
 };
diff --git a/models/course.js b/models/course.js
@@ -1,22 +1,27 @@
 'use strict';
-
+const {
+  Model
+} = require('sequelize');
 module.exports = (sequelize, DataTypes) => {
-  var Course = sequelize.define('Course', {
+  class Course extends Model {
+    static associate(models) {
+      Course.belongsToMany(models.Student, {
+        through: 'StudentCourse',
+        as: 'students',
+        foreignKey: 'course_id'
+      });
+      Course.belongsTo(models.Lecturer, {
+        foreignKey: 'lecturer_id',
+        as: 'lecturer'
+      });
+    }
+  };
+  Course.init({
     lecturer_id: DataTypes.INTEGER,
     course_name: DataTypes.STRING
-  }, {});
-
-  Course.associate = function(models) {
-    Course.belongsToMany(models.Student, {
-      through: 'StudentCourse',
-      as: 'students',
-      foreignKey: 'course_id'
-    });
-    Course.belongsTo(models.Lecturer, {
-      foreignKey: 'lecturer_id',
-      as: 'lecturer'
-    });
-  };
-
+  }, {
+    sequelize,
+    modelName: 'Course',
+  });
   return Course;
 };
diff --git a/models/index.js b/models/index.js
@@ -1,17 +1,18 @@
 'use strict';
 
-var fs        = require('fs');
-var path      = require('path');
-var Sequelize = require('sequelize');
-var basename  = path.basename(__filename);
-var env       = process.env.NODE_ENV || 'development';
-var config    = require(__dirname + '/../config/config.json')[env];
-var db        = {};
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../config/config.json')[env];
+const db = {};
 
+let sequelize;
 if (config.use_env_variable) {
-  var sequelize = new Sequelize(process.env[config.use_env_variable], config);
+  sequelize = new Sequelize(process.env[config.use_env_variable], config);
 } else {
-  var sequelize = new Sequelize(config.database, config.username, config.password, config);
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
 }
 
 fs
@@ -20,7 +21,7 @@ fs
     return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
   })
   .forEach(file => {
-    var model = sequelize['import'](path.join(__dirname, file));
+    const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
     db[model.name] = model;
   });
 
diff --git a/models/lecturer.js b/models/lecturer.js
@@ -1,16 +1,21 @@
 'use strict';
-
+const {
+  Model
+} = require('sequelize');
 module.exports = (sequelize, DataTypes) => {
-  var Lecturer = sequelize.define('Lecturer', {
-    lecturer_name: DataTypes.STRING
-  }, {});
-
-  Lecturer.associate = function(models) {
-    Lecturer.hasOne(models.Course, {
-      foreignKey: 'lecturer_id',
-      as: 'course',
-    });
+  class Lecturer extends Model {
+    static associate(models) {
+      Lecturer.hasOne(models.Course, {
+        foreignKey: 'lecturer_id',
+        as: 'course',
+      });
+    }
   };
-
+  Lecturer.init({
+    lecturer_name: DataTypes.STRING
+  }, {
+    sequelize,
+    modelName: 'Lecturer',
+  });
   return Lecturer;
 };
diff --git a/models/student.js b/models/student.js
@@ -1,22 +1,27 @@
 'use strict';
-
+const {
+  Model
+} = require('sequelize');
 module.exports = (sequelize, DataTypes) => {
-  var Student = sequelize.define('Student', {
+  class Student extends Model {
+    static associate(models) {
+      Student.belongsTo(models.Classroom, {
+        foreignKey: 'classroom_id',
+        as: 'classroom'
+      });
+      Student.belongsToMany(models.Course, {
+        through: 'StudentCourse',
+        as: 'courses',
+        foreignKey: 'student_id'
+      });
+    }
+  };
+  Student.init({
     classroom_id: DataTypes.INTEGER,
     student_name: DataTypes.STRING
-  }, {});
-
-  Student.associate = function(models) {
-    Student.belongsTo(models.Classroom, {
-      foreignKey: 'classroom_id',
-      as: 'classroom'
-    });
-    Student.belongsToMany(models.Course, {
-      through: 'StudentCourse',
-      as: 'courses',
-      foreignKey: 'student_id'
-    });
-  };
-
+  }, {
+    sequelize,
+    modelName: 'Student',
+  });
   return Student;
 };
diff --git a/models/studentcourse.js b/models/studentcourse.js
@@ -1,11 +1,19 @@
 'use strict';
+const {
+  Model
+} = require('sequelize');
 module.exports = (sequelize, DataTypes) => {
-  var StudentCourse = sequelize.define('StudentCourse', {
+  class StudentCourse extends Model {
+    static associate(models) {
+      // define association here
+    }
+  };
+  StudentCourse.init({
     student_id: DataTypes.INTEGER,
     course_id: DataTypes.INTEGER
-  }, {});
-  StudentCourse.associate = function(models) {
-    // associations can be defined here
-  };
+  }, {
+    sequelize,
+    modelName: 'StudentCourse',
+  });
   return StudentCourse;
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
