diff --git a/src/middlewares/news/addNews.ts b/src/middlewares/news/addNews.ts index 7e802e74e5593ac993f7f8f5b58660df9e1e2647..43c6437fa20c7d7808dd93b7415c8fb969f616db 100644 --- a/src/middlewares/news/addNews.ts +++ b/src/middlewares/news/addNews.ts @@ -1,23 +1,22 @@ -import { Request, Response, NextFunction } from 'express'; -import News from '../../models/NewsSchema'; - +import { Request, Response, NextFunction } from "express"; +import News from "../../models/NewsSchema"; const addNews = () => { - return (req: Request, res: Response, next: NextFunction) => { - const news = new News(); - news.title = req.body.title; - news.text = req.body.text; - news.publishedAt = new Date().toDateString() + return (req: Request, res: Response, next: NextFunction) => { + const news = new News(); + news.title = req.body.title; + news.text = req.body.text; + news.publishedAt = new Date().toDateString(); - news.save((err) => { - if(err){ - - } else { - res.status(201) - res.json(news) - }; - }); - }; + news.save(err => { + if (err) { + } else { + res.status(201); + res.data.newsObject = news; + } + next(); + }); + }; }; -export default addNews; \ No newline at end of file +export default addNews; diff --git a/src/middlewares/news/deleteNews.ts b/src/middlewares/news/deleteNews.ts index affd9ba7549ef1dd03b66cfd8ab8582bce0d185a..7f6330375840761cfd595786688d62310018fc38 100644 --- a/src/middlewares/news/deleteNews.ts +++ b/src/middlewares/news/deleteNews.ts @@ -1,18 +1,17 @@ -import { Request, Response, NextFunction } from 'express'; -import News from '../../models/NewsSchema'; - +import { Request, Response, NextFunction } from "express"; +import News from "../../models/NewsSchema"; const deleteNews = () => { - return (req: Request, res: Response, next: NextFunction) => { - News.findByIdAndDelete(req.params.id, (error, result) => { - if(!error){ - res.status(204); - res.json({}); - } else { - console.warn(error); - } - }) - } -} + return (req: Request, res: Response, next: NextFunction) => { + News.findByIdAndDelete(req.params.id, (error, result) => { + if (!error) { + res.status(204); + res.json({}); + } else { + console.warn(error); + } + }); + }; +}; -export default deleteNews; \ No newline at end of file +export default deleteNews; diff --git a/src/middlewares/news/getNews.ts b/src/middlewares/news/getNews.ts index b0bebcb2ce2c1edfbf6bd2e270ab3c06c820be81..e48a3d6cf7a8d2cbb4bd54b035369a1785a63ef6 100644 --- a/src/middlewares/news/getNews.ts +++ b/src/middlewares/news/getNews.ts @@ -1,20 +1,18 @@ -import { Request, Response, NextFunction } from 'express'; -import News from '../../models/NewsSchema'; - +import { Request, Response, NextFunction } from "express"; +import News from "../../models/NewsSchema"; const getNews = () => { - return (req: Request, res: Response, next: NextFunction) => { - - News.findById(req.params.id, (error, result) => { - if(!error){ - res.status(200); - res.json(result); - } else { - console.warn(error); - } - }) - - }; + return (req: Request, res: Response, next: NextFunction) => { + News.findById(req.params.id, (error, result) => { + if (!error) { + res.status(200); + res.data.newsObject = result; + } else { + console.warn(error); + } + next(); + }); + }; }; -export default getNews; \ No newline at end of file +export default getNews; diff --git a/src/middlewares/news/getNewsList.ts b/src/middlewares/news/getNewsList.ts index 4c58564b16bee48f3e8fec98321c34c6d96d3117..c55aa8a23b87205f6940ffb38a2de4f947944c15 100644 --- a/src/middlewares/news/getNewsList.ts +++ b/src/middlewares/news/getNewsList.ts @@ -1,16 +1,15 @@ -import { Request, Response, NextFunction } from 'express'; -import News from '../../models/NewsSchema'; - +import { Request, Response, NextFunction } from "express"; +import News from "../../models/NewsSchema"; const getNewsList = () => { - return (req: Request, res: Response, next: NextFunction) => { - News.find({}, (err, news) => { - if(!err){ - res.json({ news: news}); - } - }); - } - -} - -export default getNewsList; \ No newline at end of file + return (req: Request, res: Response, next: NextFunction) => { + News.find({}, (err, news) => { + if (!err) { + res.data.news = news; + } + next(); + }); + }; +}; + +export default getNewsList;