From 16d5606d1a7b609d112d6c17997acbd2bcd91e17 Mon Sep 17 00:00:00 2001
From: Metecode <ee09mete@gmail.com>
Date: Fri, 10 Sep 2021 12:32:07 +0300
Subject: [PATCH 1/4] contentReview service hazir

---
 src/routes/contentReviews/index.js | 195 +++++++----------------------
 src/services/review.js             | 103 +++++++++++++++
 2 files changed, 151 insertions(+), 147 deletions(-)
 create mode 100644 src/services/review.js

diff --git a/src/routes/contentReviews/index.js b/src/routes/contentReviews/index.js
index c4d422d..c77b391 100644
--- a/src/routes/contentReviews/index.js
+++ b/src/routes/contentReviews/index.js
@@ -1,5 +1,7 @@
+import HTTPError from '../../exceptions/HTTPError';
 import Joi from '../../joi';
 import models from '../../models';
+import ReviewService from '../../services/review';
 
 const createContentReviewsSchema = {
   body: Joi.object({
@@ -25,7 +27,7 @@ const updateContentReviewsSchema = {
   }),
 };
 
-const create = async (req, res) => {
+const create = async (req, res, next) => {
   const { error } = createContentReviewsSchema.body.validate(req.body);
   if (error) {
     return res.status(400).send({
@@ -35,65 +37,28 @@ const create = async (req, res) => {
   const {
     content_id, text, score, is_spoiler,
   } = req.body;
-  const contentReview = await models.content_reviews.create({
-    user_id: req.user.id,
-    content_id,
-    text,
-    score,
-    is_spoiler,
-  });
-  const count = await models.content_reviews.count(
-    {
-      where: {
-        content_id,
-      },
-    },
-  );
+  try {
+    const contentReview = await ReviewService.createReview({ content_id, text, score, is_spoiler }, req.user.id)
 
-  const content = await models.contents.findOne({
-    where: {
-      id: content_id,
-    },
-  });
-  content.rate = (Number(content.rate) + ((Number(score * 2) - (Number(content.rate))) / count));
-  await content.save();
-  res.send({
-    contentReview,
-  });
+    res.send({
+      contentReview,
+    });
+  } catch (err) {
+    next(err);
+  }
 };
 
-const detail = async (req, res) => {
+const detail = async (req, res, next) => {
   const { id } = req.params;
   try {
-    const contentReview = await models.content_reviews.findOne({
-      where: {
-        id,
-      },
-    });
-
-    if (!contentReview) {
-      return res.send({
-        errors: [
-          {
-            message: 'Review not found or you don\'t have a permission!',
-          },
-        ],
-      });
-    }
-
+    const contentReview = await ReviewService.getReview(id);
     return res.send(contentReview);
   } catch (err) {
-    return res.status(500).send({
-      errors: [
-        {
-          message: err.message,
-        },
-      ],
-    });
+    next(err);
   }
 };
 
-const update = async (req, res) => {
+const update = async (req, res, next) => {
   const { error } = updateContentReviewsSchema.body.validate(req.body);
   if (error) {
     return res.status(400).send({
@@ -102,120 +67,62 @@ const update = async (req, res) => {
   }
   const { id } = req.params;
   try {
-    const contentReview = await models.content_reviews.findOne({
+    const contentReview = await ReviewService.getReview(id);
+
+    const { text, is_spoiler, score } = req.body;
+    models.content_reviews.update({ text, is_spoiler, score }, {
       where: {
-        id,
-      },
-      include: {
-        model: models.users,
-        as: 'user',
-        where: {
-          id: req.user.id,
-        },
+        id: contentReview.id,
       },
     });
-    if (contentReview) {
-      const { text, is_spoiler, score } = req.body;
-      models.content_reviews.update({ text, is_spoiler, score }, {
-        where: {
-          id: contentReview.id,
-        },
-      });
-      res.send({
-        message: 'Content review was updated succesfully',
-      });
-    } else {
-      res.status(403).send({
-        errors: [
-          {
-            message: 'Review not found or you don\'t have a permission!',
-          },
-        ],
-      });
-    }
-  } catch (err) {
-    res.status(500).send({
-      errors: [
-        {
-          message: err.message,
-        },
-      ],
+    return res.send({
+      message: 'Content review was updated succesfully',
     });
+  } catch (err) {
+    next(err);
   }
 };
 
-const deleteById = async (req, res) => {
+const deleteById = async (req, res, next) => {
   const { id } = req.params;
   const user_id = req.user.id;
-  const contentReview = await models.content_reviews.findOne({
-    where: {
-      id,
-    },
-  });
-  if (contentReview) {
-    if (user_id === contentReview.user_id) {
-      models.content_reviews.destroy({
-        where: {
-          id,
-        },
-      });
-      res.send({
-        message: 'Data set was delected successfully!',
-      });
+  try {
+    const contentReview = await ReviewService.getReview(id);
+    if (user_id !== contentReview.user_id) {
+      throw new HTTPError('you don\'t have permission ', 404);
     }
-  } else {
-    res.status(401).send({
-      errors: [
-        {
-          message: 'Review not found or you don\'t have a permission!',
-        },
-      ],
+    await ReviewService.deleteReview(id);
+    return res.send({
+      message: 'Data set was delected successfully!',
     });
+  } catch (err) {
+    next(err);
   }
 };
 
-const getMyReviews = async (req, res) => {
-  const reviews = await models.content_reviews.findAll({
-    where: {
-      user_id: req.user.id,
-    },
-    include: {
-      model: models.contents,
-      as: 'contents',
-      include: {
-        model: models.images,
-        as: 'image',
-      },
-    },
-  });
-  return res.send(200, {
-    reviews,
-  });
+const getMyReviews = async (req, res, next) => {
+  try {
+    const reviews = await ReviewService.getUserReviews(req.user.id);
+    res.send(200, {
+      reviews,
+    })
+  } catch (err) {
+    next(err);
+  }
 };
 
-const userReviews = async (req, res) => {
+const userReviews = async (req, res, next) => {
   const { userId } = req.params;
   const { limit } = req.query;
   try {
-    const reviews = await models.content_reviews.findAll({
-      where: {
-        user_id: userId,
-      },
-      limit,
-    });
+    const reviews = await ReviewService.getUserReviews(userId);
     return res.send({ reviews, count: reviews.length });
   } catch (err) {
-    return res.status(500).send({
-      errors: [
-        {
-          message: err.message,
-        },
-      ],
-    });
+    next(err);
   }
 };
 
-const contentReviews = async (req, res) => {
+const contentReviews = async (req, res, next) => {
   const { contentId } = req.params;
   const { limit } = req.query;
   try {
@@ -227,13 +134,7 @@ const contentReviews = async (req, res) => {
     });
     return res.send({ reviews, count: reviews.length });
   } catch (err) {
-    return res.status(500).send({
-      errors: [
-        {
-          message: err.message,
-        },
-      ],
-    });
+    next(err);
   }
 };
 
diff --git a/src/services/review.js b/src/services/review.js
new file mode 100644
index 0000000..02d1e5a
--- /dev/null
+++ b/src/services/review.js
@@ -0,0 +1,103 @@
+import HTTPError from '../exceptions/HTTPError';
+import models from '../models';
+
+
+const getReview = async (id) => {
+  const contentReview = await models.content_reviews.findOne({
+    where: {
+      id,
+    },
+    include: [{
+      model: models.users,
+      as: 'user',
+    }, {
+      model: models.contents,
+      as: 'contents',
+      include: {
+        model: models.images,
+        as: 'image',
+      },
+    }],
+  });
+  if (!contentReview) {
+    throw new HTTPError('Review not found or you don\'t have a permission!', 404);
+  }
+  return contentReview;
+};
+
+const getUserReviews = async (user_id) => {
+  const reviews = await models.content_reviews.findAll({
+    where: {
+      user_id,
+    },
+    include: [{
+      model: models.users,
+      as: 'user',
+    }, {
+      model: models.contents,
+      as: 'contents',
+      include: {
+        model: models.images,
+        as: 'image',
+      },
+    }],
+  });
+  return reviews;
+};
+
+const createReview = async ({ content_id, text, score, is_spoiler }, user_id) => {
+  const contentReview = await models.content_reviews.create({
+    user_id,
+    content_id,
+    text,
+    score,
+    is_spoiler,
+  });
+  const count = await models.content_reviews.count(
+    {
+      where: {
+        content_id,
+      },
+    },
+  );
+
+  const content = await models.contents.findOne({
+    where: {
+      id: content_id,
+    },
+  });
+  content.rate = (Number(content.rate) + ((Number(score * 2) - (Number(content.rate))) / count));
+  await content.save();
+  return contentReview;
+};
+
+const updateReview = async ({ text, is_spoiler, score }, id) => {
+  const review = await models.content_reviews.update({ text, is_spoiler, score }, {
+    where: {
+      id,
+    },
+  });
+  return contentReview;
+};
+
+const deleteReview = async (id) => {
+  const isDelete = await models.content_reviews.destroy({
+    where: {
+      id,
+    },
+  });
+  if (!isDelete) {
+    throw new HTTPError('review not found', 404);
+  }
+  return isDelete;
+};
+
+
+const ReviewService = {
+  createReview,
+  getReview,
+  getUserReviews,
+  updateReview,
+  deleteReview,
+};
+export default ReviewService;

From e61c815de6c80f013639fdc97bf497acc30b98a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mete=20U=C3=A7ar?=
 <71905780+Metecode@users.noreply.github.com>
Date: Fri, 10 Sep 2021 22:38:56 +0300
Subject: [PATCH 2/4] Update review.js

---
 src/services/review.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/services/review.js b/src/services/review.js
index 02d1e5a..c925902 100644
--- a/src/services/review.js
+++ b/src/services/review.js
@@ -1,7 +1,6 @@
 import HTTPError from '../exceptions/HTTPError';
 import models from '../models';
 
-
 const getReview = async (id) => {
   const contentReview = await models.content_reviews.findOne({
     where: {
@@ -92,7 +91,6 @@ const deleteReview = async (id) => {
   return isDelete;
 };
 
-
 const ReviewService = {
   createReview,
   getReview,

From cdd5f5926209d332578190f31be5041cac05d699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mete=20U=C3=A7ar?=
 <71905780+Metecode@users.noreply.github.com>
Date: Fri, 10 Sep 2021 22:45:56 +0300
Subject: [PATCH 3/4] Update review.js

---
 src/services/review.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/review.js b/src/services/review.js
index c925902..3560186 100644
--- a/src/services/review.js
+++ b/src/services/review.js
@@ -70,7 +70,7 @@ const createReview = async ({ content_id, text, score, is_spoiler }, user_id) =>
   return contentReview;
 };
 
-const updateReview = async ({ text, is_spoiler, score }, id) => {
+await ReviewService.updateReview ({ text, is_spoiler, score }, id) => {
   const review = await models.content_reviews.update({ text, is_spoiler, score }, {
     where: {
       id,

From 8a5f9655d387135c746db3fe835d769c62e9d220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mete=20U=C3=A7ar?=
 <71905780+Metecode@users.noreply.github.com>
Date: Sat, 11 Sep 2021 14:28:03 +0300
Subject: [PATCH 4/4] Update index.js

---
 src/routes/contentReviews/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/contentReviews/index.js b/src/routes/contentReviews/index.js
index c77b391..e06eb72 100644
--- a/src/routes/contentReviews/index.js
+++ b/src/routes/contentReviews/index.js
@@ -70,7 +70,7 @@ const update = async (req, res, next) => {
     const contentReview = await ReviewService.getReview(id);
 
     const { text, is_spoiler, score } = req.body;
-    models.content_reviews.update({ text, is_spoiler, score }, {
+    await ReviewService.updateReview({ text, is_spoiler, score }, {
       where: {
         id: contentReview.id,
       },