comment endpoints fixed

Author: Chmod351

server/Controllers/commentController.js

@@ -1,23 +1,36 @@
+import Comment from '../Models/commentModel.js';
 import commentService from '../Service/commentService.js';
 // function to check ownership
-import Comment from '../Models/commentModel.js';
 import isResourceOwner from '../helpers/isOwner.js';
 
 const commentController = {
   createComment,
-  deleteComment,
   getAllComment,
+  deleteComment,
 };
 
 function createComment(req, res, next) {
   commentService
-    .createComment(req.user.id, req.params.id, req.body)
+    .createComment(
+      req.user.id,
+      req.params.id,
+      req.body.description,
+      req.body.calification,
+    )
     .then((comment) => res.json(comment))
     .catch((error) => next(error));
 }
 
+function getAllComment(req, res, next) {
+  commentService
+    .getAllComment(req.query.page, req.query.size, req.params.id)
+    .then((product) => res.json(product))
+    .catch((error) => next(error));
+}
+
 function deleteComment(req, res, next) {
-  const isOwner = isResourceOwner(Comment, req.params.commentId, req.user.id);
+  console.log(req.params.id);
+  const isOwner = isResourceOwner(Comment, req.params.id, req.user.id);
   if (isOwner) {
     commentService
       .deleteComment(req.params.id)
@@ -28,10 +41,4 @@ function deleteComment(req, res, next) {
   }
 }
 
-function getAllComment(req, res, next) {
-  commentService
-    .getAllComment(req.query.page, req.query.size)
-    .then((product) => res.json(product))
-    .catch((error) => next(error));
-}
 export default commentController;

server/Models/commentModel.js

@@ -7,11 +7,6 @@ const CommentSchema = new mongoose.Schema(
       ref: 'User',
       required: true,
     },
-    productId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Product',
-      required: true,
-    },
     calification: {
       type: Number,
       default: 5,

server/Models/productModel.js

@@ -17,6 +17,11 @@ const ProductSchema = new mongoose.Schema(
       maxLength: 400,
       required: true,
     },
+    commentId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Comment',
+      required: true,
+    },
     size: {
       type: Array,
       required: true,

server/Routes/commentsRoutes.js

@@ -5,12 +5,14 @@ import authMiddleware from '../helpers/jwt.js';
 const router = express.Router();
 
 router.post(
-  '/comments/create',
+'/comments/create/:productId',
   authMiddleware,
   cleanBody,
   commentController.createComment,
 );
-router.delete('/comments/delete', authMiddleware, commentController.deleteComment);
-router.get('/comments/getAll', authMiddleware, commentController.getAllComment);
+router.get('/comments/getAll/:productId', authMiddleware, commentController.getAllComment);
+
+router.delete('/comments/delete/:id', authMiddleware, commentController.deleteComment);
+
 
 export default router;

server/Service/commentService.js

@@ -1,3 +1,4 @@
+import { NotFoundError } from '../helpers/errorHandler.js';
 import Comment from '../Models/commentModel.js';
 
 const commentService = {
@@ -6,6 +7,29 @@ const commentService = {
   createComment,
 };
 
+// get comment by id
+async function getCommentById(id) {
+  const comment = await Comment.findById(id);
+  if (comment) {
+    return comment;
+  } else {
+    return new NotFoundError(`Comment Not Found`);
+  }
+}
+
+// create comment
+async function createComment(userId, calification, description) {
+  const newComment = new Comment({
+    userId,
+    calification,
+    description,
+  });
+  const res = await newComment.save();
+
+  return res;
+}
+
+// get products comment paginated
 async function getAllComment(page, size) {
   //pagination for comments instead get all comments
   const pageNumber = parseInt(page) || 1;
@@ -14,14 +38,11 @@ async function getAllComment(page, size) {
   return await Comment.find().skip(skipCount).limit(pageSize);
 }
 
+// delete comment by id
 async function deleteComment(commentId) {
-  return await Comment.findByIdAndDelete(commentId);
-}
-
-async function createComment(userId, body) {
-  const newComment = new Comment({ ...body, userId });
-
-  return await newComment.save();
+  await getCommentById(commentId);
+  const res = await Comment.findByIdAndDelete(commentId);
+  return res;
 }
 
 export default commentService;

server/Service/shopingCartService.js

@@ -9,6 +9,7 @@ const cartService = {
   getAll,
 };
 
+// get cart by id 
 async function findCartById(id) {
   const cart = await ShoppingCart.findById(id);
   if (cart) {
@@ -18,11 +19,13 @@ async function findCartById(id) {
   }
 }
 
+// create cart 
 async function createCart(products, userId) {
   const newCart = new ShoppingCart({ products, userId });
   return await newCart.save();
 }
 
+// get all carts paginated
 async function getAll(page, size) {
   // Pagination for products
   const actualPage = parseInt(page) || 1;
@@ -41,11 +44,13 @@ async function getAll(page, size) {
   return { carts, totalPages };
 }
 
+// get user carts by user id 
 async function getUserCart(userId) {
   await userService.getUser(userId);
   return await ShoppingCart.findOne({ userId });
 }
 
+// edit user cart by id
 async function editCart(body, cartId) {
   await findCartById(cartId);
   return await ShoppingCart.findByIdAndUpdate(
@@ -57,6 +62,7 @@ async function editCart(body, cartId) {
   );
 }
 
+//delete user cart by cart id
 async function deleteCart(cartId) {
   await findCartById(cartId);
   return await ShoppingCart.findByIdAndDelete(cartId);