[dev] dependencies updated to the latest ones

Author: mkozhukh

controllers/form.js

@@ -3,10 +3,10 @@ var db = require('../db');
 
 module.exports = {
 	getData: function(req, res){
-		db.User.findById(req.params.recordId).then(data => res.json(data));
+		db.User.findByPk(req.params.recordId).then(data => res.json(data));
 	},
 	saveData: function(req, res){
-		db.User.findById(req.body.id)
+		db.User.findByPk(req.body.id)
 			.then((user) => 
 				user.update({
 					name: 		req.body.name,

controllers/grid-dynamic.js

@@ -1,20 +1,18 @@
-var db = require("../db");
+const db = require("../db");
+const Op = require('sequelize').Op
 
 module.exports = {
 	getData : function(req, res){
 		var limit = (req.query.count || 20)*1;
 		var offset = (req.query.start || 0)*1;
 
-		var where = req.query.filter ? { name:{ $like:"%"+req.query.filter.name+"%" }}: {};
+		var where = (req.query.filter && req.query.filter.name)  ? { name:{ [Op.like]:"%"+req.query.filter.name+"%" }}: {};
 		var order = req.query.sort ? [["name", req.query.sort.name ]] : [];
 
-		var count = db.Document.findAndCountAll({ where });
-		var page = db.Document.findAll({
-			where, limit, offset, order
-		});
-
-		Promise.all([count, page]).then(data => res.json({
-			pos:offset, total_count:data[0], data:data[1] 
+		var page = db.Document.findAndCountAll({ where, limit, offset, order });
+		
+		page.then(data => res.json({
+			pos:offset, total_count:data.count, data:data.rows
 		}));
 	}
 };

controllers/grid.js

@@ -7,23 +7,39 @@ module.exports = {
 
 
 	removeData: function(req, res){
-		db.User.findById(req.params.userId)
+		db.User.findByPk(req.params.userId)
 			.then((user) => 
 				user.destroy())
 			.then(() => 
 				res.json({}));
 	},
 
 	addData: function(req, res){
+		const data = req.body;
+		// force null values
+		if (!data.birthday)
+			data.birthday = null;
+		if (!data.group_id)
+			data.group_id = null;
+		if (!data.age)
+			data.age = 0;
+
 		db.User.create(req.body).then((obj) => 
 				res.json({ id: obj.id }));
 	},
 	updateData: function(req, res){
-		var { username, email, name, birthday, age, group_id } = req.body;
-		console.log(username, birthday)
-		db.User.findById(req.params.userId)
+		const data = req.body;
+		// force null values
+		if (!data.birthday)
+			data.birthday = null;
+		if (!data.group_id)
+			data.group_id = null;
+		if (!data.age)
+			data.age = 0;
+
+		db.User.findByPk(req.params.userId)
 			.then((user) => 
-				user.update(req.body))
+				user.update(data))
 			.then(() => 
 				res.json({}));
 	}

package.json

@@ -22,12 +22,12 @@
   },
   "homepage": "https://github.com/webix-hub/webix-nodejs-demo",
   "dependencies": {
-    "body-parser": "^1.17.2",
-    "express": "~3.5.1",
-    "express-handlebars": "^3.0.0",
-    "formidable": "^1.1.1",
-    "mongoskin": "~1.3.20",
-    "mysql2": "^1.3.5",
-    "sequelize": "^4.1.0"
+    "body-parser": "^1.19.0",
+    "express": "^4.17.1",
+    "express-handlebars": "^3.1.0",
+    "formidable": "^1.2.1",
+    "mongoskin": "^2.1.0",
+    "mysql2": "^1.7.0",
+    "sequelize": "^5.21.1"
   }
 }