Syihab Muchsin

server/controllers/task-controller.js

@@ -1,15 +1,15 @@
-const { Task } = require('../models')
+const { Task, User, Department } = require('../models')
 
 
 class TaskController{
   static async getAll(req,res){
     try{
       let tasks = await Task.findAll({
-        where: {
-          UserId: req.loggedIn.id
+        include: { 
+          model:User,
+          include: Department
         },
-        // include: ,
-        order: [['due', 'ASC']]
+        order: [['createdAt', 'DESC']]
       });
       console.log(tasks)
       res.status(200).json(tasks)

server/middlewares/authorization.js

@@ -1,16 +1,16 @@
 //Authorization
-const { Todo } = require('../models')
+const { Task } = require('../models')
 const Authorization = async (req, res, next) => {
   try {
-    const todo = await Todo.findOne({
+    const task = await Task.findOne({
       where: { id: +req.params.id }
     })
-    if(!todo){
+    if( task){
       throw {
         status: 404,
         message: 'Item not found'
       }
-    }else if (todo.UserId != req.loggedIn.id) {
+    }else if  (task.UserId != req.loggedIn.id) {
       throw {
         status: 401,
         message: 'You are not allowed to do this action'

server/routes/index.js

@@ -1,19 +1,24 @@
 
 const router = require('express').Router()
 const { UserController, TaskController } = require('../controllers')
-const {Authentication, Authorization} = require('../middlewares')
+const { Authentication, Authorization } = require('../middlewares')
 
 
 router.post('/register', UserController.register)
 router.post('/login', UserController.login)
 // router.post('/google-login', UserController.googleLogin)
 // router.post('/', UserController.githubLogin)
 
+//Authentication Required
 router.use(Authentication)
-router.get('/', TaskController.getAll)
+router.get('/tasks', TaskController.getAll)
 router.post('/add', TaskController.create)
 
+//Authorization Required
 router.use('/:id',Authorization)
+// router.pacth('/:id', TaskController.update)
+// router.put('/:id', TaskController.edit)
+// router.delete('/:id', TaskController.delete)
 
 
 module.exports = router