From 69c5e08c639345939bf58b73b8613f71ecab234a Mon Sep 17 00:00:00 2001
From: Foad Ardalan <foad.ardalan@outlook.fr>
Date: Fri, 23 Mar 2018 12:25:02 +0100
Subject: [PATCH 1/2] adapting to front

---
 .../controllers/tasks.server.controller.js    | 21 +++++++++++--------
 .../sequelize/task.server.model.sequelize.js  |  5 +++++
 .../server/routes/tasks.server.routes.js      |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/server/modules/tasks/server/controllers/tasks.server.controller.js b/server/modules/tasks/server/controllers/tasks.server.controller.js
index d2940fb63..0765a0fac 100644
--- a/server/modules/tasks/server/controllers/tasks.server.controller.js
+++ b/server/modules/tasks/server/controllers/tasks.server.controller.js
@@ -11,6 +11,7 @@ exports.getAllTasks = function (req, res) {
   orm.Task.findAll().then(function (tasks) {
     res.status(200).send(tasks);
   }).catch(function (error) {
+    console.log(error)
     res.status(500).send(error);
   });
 
@@ -42,14 +43,14 @@ exports.addTask = function (req, res) {
 };
 
 exports.updateTask = function (req, res) {
-
-  orm.Task.update(req.body, {
-    where: {
-      id: req.body.id
-    }
-  }).then(function (tasks) {
-    res.status(200).send(tasks);
+  console.log('req.body', req.body);
+  orm.Task.update(
+    { description: req.body.description, title: req.body.title },
+    { where: { id: req.body.id }
+  }).then(function (task) {
+    res.status(200).send(req.body);
   }).catch(function (error) {
+    console.log(error)
     res.status(500).send(error);
   });
 
@@ -57,12 +58,14 @@ exports.updateTask = function (req, res) {
 
 exports.deleteTask = function (req, res) {
 
+  const taskId = req.params.id
+
   orm.Task.destroy({
     where: {
-      id: req.body.id
+      id: taskId
     }
   }).then(function (tasks) {
-    res.status(200).send(tasks);
+    res.status(200).send({ taskId });
   }).catch(function (error) {
     res.status(500).send(error);
   });
diff --git a/server/modules/tasks/server/models/sequelize/task.server.model.sequelize.js b/server/modules/tasks/server/models/sequelize/task.server.model.sequelize.js
index d67f2b0fb..296987df7 100644
--- a/server/modules/tasks/server/models/sequelize/task.server.model.sequelize.js
+++ b/server/modules/tasks/server/models/sequelize/task.server.model.sequelize.js
@@ -12,6 +12,11 @@ module.exports = function(sequelize, DataTypes) {
       allowNull: false,
       comment: 'The user who created and owns this task'
     },
+    description: {
+      type: DataTypes.STRING,
+      allowNull: true,
+      comment: 'Some descriptions'
+    },
   }, {
     classMethods: {
       associate: function (models) {
diff --git a/server/modules/tasks/server/routes/tasks.server.routes.js b/server/modules/tasks/server/routes/tasks.server.routes.js
index b430d852b..e5b6214ea 100644
--- a/server/modules/tasks/server/routes/tasks.server.routes.js
+++ b/server/modules/tasks/server/routes/tasks.server.routes.js
@@ -12,6 +12,6 @@ module.exports = function (app) {
   // CRUD actions
   app.route('/api/tasks').post(tasks.validateSessionUser, tasks.addTask);
   app.route('/api/tasks').put(tasks.validateSessionUser, tasks.updateTask);
-  app.route('/api/tasks').delete(tasks.validateSessionUser, tasks.deleteTask);
+  app.route('/api/tasks/:id').delete(tasks.validateSessionUser, tasks.deleteTask);
 
 };

From 221813d19e4c84c020c0e0b99c8339b290925727 Mon Sep 17 00:00:00 2001
From: Foad Ardalan <foad.ardalan@outlook.fr>
Date: Fri, 23 Mar 2018 15:29:03 +0100
Subject: [PATCH 2/2] console.log

---
 .../modules/tasks/server/controllers/tasks.server.controller.js  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/modules/tasks/server/controllers/tasks.server.controller.js b/server/modules/tasks/server/controllers/tasks.server.controller.js
index 0765a0fac..8031771cc 100644
--- a/server/modules/tasks/server/controllers/tasks.server.controller.js
+++ b/server/modules/tasks/server/controllers/tasks.server.controller.js
@@ -43,7 +43,6 @@ exports.addTask = function (req, res) {
 };
 
 exports.updateTask = function (req, res) {
-  console.log('req.body', req.body);
   orm.Task.update(
     { description: req.body.description, title: req.body.title },
     { where: { id: req.body.id }