From 07e45a0b98ef58769980646e5f929297254127a6 Mon Sep 17 00:00:00 2001 From: Jun4928 Date: Thu, 31 Dec 2020 11:51:20 +0900 Subject: [PATCH] Modify: remove next functions in controllers --- controllers/ArticleController.js | 12 ++++++------ controllers/CommentController.js | 8 ++++---- controllers/UserController.js | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/controllers/ArticleController.js b/controllers/ArticleController.js index a4289e5..7ac3601 100644 --- a/controllers/ArticleController.js +++ b/controllers/ArticleController.js @@ -2,12 +2,12 @@ const { ArticleService } = require('../services') const { errorWrapper, errorGenerator } = require('../errors') const { validateFields } = require('../utils') -const getArticles = errorWrapper(async (req, res, next) => { +const getArticles = errorWrapper(async (req, res) => { const articles = await ArticleService.findArticles(req.query) res.status(200).json({ articles }) }) -const getOneArticle = errorWrapper(async (req, res, next) => { +const getOneArticle = errorWrapper(async (req, res) => { const { articleId } = req.params const article = await ArticleService.findArticle({ id: articleId }) @@ -16,7 +16,7 @@ const getOneArticle = errorWrapper(async (req, res, next) => { res.status(200).json({ article }) }) -const postOneArticle = errorWrapper(async (req, res, next) => { +const postOneArticle = errorWrapper(async (req, res) => { const { id: userId } = req.foundUser const { title, body } = req.body @@ -31,7 +31,7 @@ const postOneArticle = errorWrapper(async (req, res, next) => { res.status(201).json({ createdArticle }) }) -const updateOneArticle = errorWrapper(async (req, res, next) => { +const updateOneArticle = errorWrapper(async (req, res) => { const { id: userIdFromToken } = req.foundUser const { articleId } = req.params const requestedFields = req.body @@ -55,7 +55,7 @@ const updateOneArticle = errorWrapper(async (req, res, next) => { res.status(201).json({ updatedArticle }) }) -const publishOneArticle = errorWrapper(async (req, res, next) => { +const publishOneArticle = errorWrapper(async (req, res) => { const { id: userIdFromToken } = req.foundUser const { articleId } = req.params @@ -71,7 +71,7 @@ const publishOneArticle = errorWrapper(async (req, res, next) => { res.status(201).json({ publishedArticle }) }) -const deleteOneArticle = errorWrapper(async (req, res, next) => { +const deleteOneArticle = errorWrapper(async (req, res) => { const { id: userIdFromToken } = req.foundUser const { articleId } = req.params diff --git a/controllers/CommentController.js b/controllers/CommentController.js index 9f662b9..3867778 100644 --- a/controllers/CommentController.js +++ b/controllers/CommentController.js @@ -1,14 +1,14 @@ const { CommentService } = require('../services') const { errorWrapper, errorGenerator } = require('../errors') -const getComments = errorWrapper(async (req, res, next) => { +const getComments = errorWrapper(async (req, res) => { const { articleId } = req.params const comments = await CommentService.fetchComments({ article_id: Number(articleId) }) res.status(200).json({ comments }) }) -const postComment = errorWrapper(async (req, res, next) => { +const postComment = errorWrapper(async (req, res) => { const { articleId } = req.params const { id: userIdFromToken } = req.foundUser const { body } = req.body @@ -22,7 +22,7 @@ const postComment = errorWrapper(async (req, res, next) => { res.status(201).json({ createdComment }) }) -const updateComment = errorWrapper(async (req, res, next) => { +const updateComment = errorWrapper(async (req, res) => { const { articleId, commentId } = req.params const { body } = req.body const { id: userIdFromToken } = req.foundUser @@ -43,7 +43,7 @@ const updateComment = errorWrapper(async (req, res, next) => { res.status(200).json({ updatedComment }) }) -const deleteComment = errorWrapper(async (req, res, next) => { +const deleteComment = errorWrapper(async (req, res) => { const { articleId, commentId } = req.params const { id: userIdFromToken } = req.foundUser diff --git a/controllers/UserController.js b/controllers/UserController.js index 029032e..0644fbe 100644 --- a/controllers/UserController.js +++ b/controllers/UserController.js @@ -4,7 +4,7 @@ const jwt = require('jsonwebtoken') const { UserService } = require('../services') const { errorWrapper, errorGenerator } = require('../errors') -const signUp = errorWrapper(async (req, res, next) => { +const signUp = errorWrapper(async (req, res) => { const { email, password } = req.body if (!email || !password) errorGenerator({ statusCode: 400, message: 'invalid input' }) @@ -25,7 +25,7 @@ const signUp = errorWrapper(async (req, res, next) => { }) }) -const logIn = errorWrapper(async (req, res, next) => { +const logIn = errorWrapper(async (req, res) => { const { email, password: inputPassword } = req.body const foundUser = await UserService.findUser({ email })