Add files via upload

Author: rahul-dev7

controllers/todoControllers.js

@@ -12,7 +12,6 @@ exports.createTodo = async (req, res,next) => {
 
 exports.getTodos = async(req, res,next) => {
     try {
-        console.log(req.headers, 'header');
         let todos = await todoService.getTodos();
         return Common.sendSuccessResponse(res, 200, "Success", todos);
     }
@@ -26,7 +25,7 @@ exports.getUpdate = async(req, res,next) => {
 
     try {
         let updateDataObj = {};
-        let fieldArray = ['title', 'description'];
+        let fieldArray = ['title', 'description', 'user'];
         let id = Number(req.params.id);
         let data = req.body;
 

controllers/userControllers.js

@@ -56,8 +56,7 @@ exports.refreshToken = async(req, res, next) => {
     }
     catch(error) {
         return Common.sendErrorResponse(res, 500, "Internal Server Error", error);
-    }
-    
+    }  
 }
 
 exports.logout = async(req, res, next) => {

model/todo.js

@@ -14,7 +14,12 @@ const todoSchema = mongoose.Schema({
     description: {
         type: String,
         required: true
-    }  
+    },
+    user: {
+        type: mongoose.SchemaTypes.ObjectId,
+        required: true,
+        ref: 'User'
+    }
 });
 
 module.exports = mongoose.model('Todo', todoSchema);

routes/authRoutes.js

@@ -1,11 +1,26 @@
 const express = require('express');
 const router = express.Router();
-
+const validate = require('../validation/Inputvalidator')
+const validatorSchema = require('../validation/validatorSchema');
 
 const userControllers = require('../controllers/userControllers');
 
-router.post('/register', userControllers.register);
-router.post('/login', userControllers.login);
-router.post('/refreshToken', userControllers.refreshToken);
-router.delete('/logout', userControllers.logout);
+router.post(
+    '/register', 
+    [validate.validate(validatorSchema.registerValidation)], 
+    userControllers.register
+);
+router.post(
+    '/login', 
+    [validate.validate(validatorSchema.loginValidation)],
+    userControllers.login
+);
+router.post(
+    '/refreshToken', 
+    userControllers.refreshToken
+);
+router.delete(
+    '/logout', 
+    userControllers.logout
+);
 module.exports = router;

routes/todoRoutes.js

@@ -1,12 +1,33 @@
 const express = require('express');
 const router = express.Router();
-const checkToken = require('../validation/validateToken') 
-
+const checkToken = require('../validation/validateToken');
+const validate = require('../validation/Inputvalidator')
+const validatorSchema = require('../validation/validatorSchema');
 const todoController = require('../controllers/todoControllers.js');
 
-router.get('/', checkToken.validateToken, todoController.getTodos );
-router.post('/create-todo',  checkToken.validateToken, todoController.createTodo);
-router.put('/:id',  checkToken.validateToken, todoController.getUpdate);
-router.delete('/:id/delete',  checkToken.validateToken,  todoController.getDelete);
+router.get(
+    '/', 
+    checkToken.validateToken, 
+    todoController.getTodos 
+);
+router.post(
+    '/create-todo', 
+    [ 
+      checkToken.validateToken, 
+      validate.validate(validatorSchema.todoValidation)
+    ], 
+    todoController.createTodo
+);
+
+router.put(
+    '/:id',  
+    checkToken.validateToken, 
+    todoController.getUpdate
+);
+router.delete(
+    '/:id/delete',  
+    checkToken.validateToken, 
+    todoController.getDelete
+);
 
 module.exports = router;

services/todoService.js

@@ -2,7 +2,7 @@ const { compareSync } = require('bcrypt');
 const Todo = require('../model/todo');
 
 getTodos = () => {
-    return  Todo.find({}).exec();
+    return  Todo.find({}).populate('user').exec();
 }
 
 saveTodo = (data) => {
@@ -25,7 +25,7 @@ updateTodo = (data, id) => {
 
     return Todo.findByIdAndUpdate(id.toString(),
         { $set: data },
-        { upsert: true }); 
+        {new:true}); 
 }
 
 

validation/Inputvalidator.js

@@ -0,0 +1,15 @@
+const Common = require('../helpers/common');
+
+exports.validate = (Schema) => {
+    return (req, res, next) => { 
+        
+        const { error } = Schema.validate(req.body);
+        if(error) {
+          return Common.sendErrorResponse(res, 406, 'Invalid Input', error);  
+        }
+        next();    
+    }
+}
+
+
+

validation/validatorSchema.js

@@ -0,0 +1,21 @@
+const joi = require("joi");
+
+exports.todoValidation = joi.object({
+    id: joi.number().integer().min(1).max(9999).required(),
+    title: joi.string().alphanum().min(3).max(25).trim(true).required(),
+    description: joi.string().alphanum().min(3).max(100).trim(true).required(),
+    user: joi.string().alphanum().min(3).max(100).trim(true).required(),
+})
+
+
+exports.registerValidation = joi.object({
+    firstname: joi.string().alphanum().min(3).max(32).trim(true).required(),
+    lastname: joi.string().alphanum().min(3).max(32).trim(true).required(),
+    email: joi.string().email().trim(true).required(),
+    password: joi.string().min(8).trim(true).required(),
+})
+
+exports.loginValidation = joi.object({
+    email: joi.string().email().trim(true).required(),
+    password: joi.string().min(8).trim(true).required(),
+})