Merge pull request #5 from techla/21-tasks-add-edit

adapting to front
weareopensource · Mar 23, 2018 · 5753bc1 · 5753bc1
2 parents 8207831 + 221813d
commit 5753bc1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git 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,27 +43,28 @@ 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);
+  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);
   });
 
 };
 
 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
@@ -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
@@ -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);
 
 };