@feardread/fear 2.0.4 → 2.0.5

package/controllers/review.js

@@ -2,45 +2,32 @@ const { tryCatch } = require("../libs/handler/error");
 const methods = require("./crud");
 const Review = require("../models/review");
 const Product = require("../models/product");
+
 /**
  * Add or update a product review
  * @param {Object} req - Express request object
  * @param {Object} res - Express response object
  */
-exports.review = tryCatch(async (req, res) => {
+exports.add = async (req, res) => {
   const { username, email, rating, comment } = req.body;
-  const productId = req.params.productId || req.body.productId;
-  //const userId = req.user._id;
-
+  const productId = req.params.id || req.body.productId;
+  
   // Validate required fields
   if (!rating || rating < 1 || rating > 5) {
-    return res.status(400).json({
-      success: false,
-      message: "Rating must be between 1 and 5"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        success: false, 
+        message: "Rating must be between 1 and 5" 
+    }));
   }
-
   if (!comment || comment.trim().length === 0) {
-    return res.status(400).json({
-      success: false,
-      message: "Comment is required"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        success: false, 
+        message: "Comment is required"
+    }));
   }
-
-  // Find product and check if it exists
-  const product = await Product.findById(productId);
-  if (!product) {
-    return res.status(404).json({
-      success: false,
-      message: "Product not found"
-    });
-  }
-
-  // Check if user already reviewed this product
-  const existingReviewIndex = product.reviews.findIndex(
-    (review) => review.user.toString() === userId.toString()
-  );
-
+  
   const reviewData = {
     productId: productId,
     username,
@@ -50,57 +37,50 @@ exports.review = tryCatch(async (req, res) => {
     createdAt: new Date()
   };
 
-  if (existingReviewIndex !== -1) {
-    // Update existing review
-    product.reviews[existingReviewIndex] = {
-      ...product.reviews[existingReviewIndex],
-      ...reviewData,
-      updatedAt: new Date()
-    };
-  } else {
-    // Add new review
-    product.reviews.push(reviewData);
-  }
-
-  // Recalculate average rating
-  const totalRating = product.reviews.reduce((sum, review) => sum + review.rating, 0);
-  product.rating = Number((totalRating / product.reviews.length).toFixed(1));
-  product.totalReviews = product.reviews.length;
-
-  // Save product
-  const updatedProduct = await product.save();
-
-  // Also save to Review collection if it exists
-  try {
-    if (existingReviewIndex !== -1) {
-      // Update existing review in Review collection
-      await Review.findOneAndUpdate(
-        { username, productId },
-        reviewData,
-        { upsert: true, new: true }
-      );
-    } else {
-      // Create new review in Review collection
-      await Review.create(reviewData);
-    }
-  } catch (reviewError) {
-    console.warn('Failed to sync review to Review collection:', reviewError.message);
-  }
-
-  return res.status(200).json({
-    success: true,
-    message: existingReviewIndex !== -1 ? "Review updated successfully" : "Review added successfully",
-    result: updatedProduct,
-    review: reviewData
-  });
-});
+  // Find product and check if it exists
+  return Product.findById(productId)
+    .then(product => {
+      if (!product) {
+        res.status(400).json({ 
+          success: false, 
+          message: "Product not found" 
+        });
+        return Promise.reject(new Error("Product not found"));
+      }
+
+      product.reviews.push(reviewData);
+
+      // Recalculate average rating
+      const totalRating = product.reviews.reduce((sum, review) => sum + review.rating, 0);
+      product.rating = Number((totalRating / product.reviews.length).toFixed(1));
+      product.totalReviews = product.reviews.length;
+
+      return product.save();
+    })
+    .then(() => {
+
+      return Review.create(reviewData);
+    })
+    .then(review => {
+        return res.status(200).json({ 
+          success: true, 
+          message: "Review added successfully", 
+          result: review,
+      });
+      //return Promise.resolve(review);
+    })
+    .catch(error => {
+      console.error('Error in review process:', error);
+      return Promise.reject(error);
+    });
+};
 
 /**
  * Add or update product rating (alternative rating system)
  * @param {Object} req - Express request object
  * @param {Object} res - Express response object
  */
-exports.rating = tryCatch(async (req, res) => {
+exports.rating = tryCatch((req, res) => {
   const { _id: userId } = req.user;
   const { star, prodId, comment = "" } = req.body;
 
@@ -120,64 +100,79 @@ exports.rating = tryCatch(async (req, res) => {
   }
 
   // Find product
-  const product = await Product.findById(prodId);
-  if (!product) {
-    return res.status(404).json({
-      success: false,
-      message: "Product not found"
-    });
-  }
-
-  // Initialize ratings array if it doesn't exist
-  if (!product.ratings) {
-    product.ratings = [];
-  }
-
-  // Check if user already rated this product
-  const existingRatingIndex = product.ratings.findIndex(
-    (rating) => rating.postedby.toString() === userId.toString()
-  );
-
-  const ratingData = {
-    star: Number(star),
-    comment: comment.trim(),
-    postedby: userId,
-    createdAt: new Date()
-  };
-
-  if (existingRatingIndex !== -1) {
-    // Update existing rating
-    product.ratings[existingRatingIndex] = {
-      ...product.ratings[existingRatingIndex],
-      ...ratingData,
-      updatedAt: new Date()
-    };
-  } else {
-    // Add new rating
-    product.ratings.push(ratingData);
-  }
+  Product.findById(prodId)
+    .then(product => {
+      if (!product) {
+        return res.status(404).json({
+          success: false,
+          message: "Product not found"
+        });
+      }
+
+      // Initialize ratings array if it doesn't exist
+      if (!product.ratings) {
+        product.ratings = [];
+      }
+
+      // Check if user already rated this product
+      const existingRatingIndex = product.ratings.findIndex(
+        (rating) => rating.postedby.toString() === userId.toString()
+      );
 
-  // Calculate average rating
-  const totalRatingSum = product.ratings.reduce((sum, rating) => sum + rating.star, 0);
-  const averageRating = totalRatingSum / product.ratings.length;
-
-  // Update product with new rating
-  product.totalrating = Number(averageRating.toFixed(1));
-  product.totalRatings = product.ratings.length;
-
-  // Save updated product
-  const updatedProduct = await product.save();
-
-  return res.status(200).json({
-    success: true,
-    message: existingRatingIndex !== -1 ? "Rating updated successfully" : "Rating added successfully",
-    result: updatedProduct,
-    rating: {
-      averageRating: product.totalrating,
-      totalRatings: product.totalRatings,
-      userRating: ratingData
-    }
-  });
+      const ratingData = {
+        star: Number(star),
+        comment: comment.trim(),
+        postedby: userId,
+        createdAt: new Date()
+      };
+
+      if (existingRatingIndex !== -1) {
+        // Update existing rating
+        product.ratings[existingRatingIndex] = {
+          ...product.ratings[existingRatingIndex],
+          ...ratingData,
+          updatedAt: new Date()
+        };
+      } else {
+        // Add new rating
+        product.ratings.push(ratingData);
+      }
+
+      // Calculate average rating
+      const totalRatingSum = product.ratings.reduce((sum, rating) => sum + rating.star, 0);
+      const averageRating = totalRatingSum / product.ratings.length;
+
+      // Update product with new rating
+      product.totalrating = Number(averageRating.toFixed(1));
+      product.totalRatings = product.ratings.length;
+
+      // Save updated product and return the promise
+      return product.save().then(updatedProduct => ({
+        updatedProduct,
+        existingRatingIndex,
+        ratingData
+      }));
+    })
+    .then(({ updatedProduct, existingRatingIndex, ratingData }) => {
+      return res.status(200).json({
+        success: true,
+        message: existingRatingIndex !== -1 ? "Rating updated successfully" : "Rating added successfully",
+        result: updatedProduct,
+        rating: {
+          averageRating: updatedProduct.totalrating,
+          totalRatings: updatedProduct.totalRatings,
+          userRating: ratingData
+        }
+      });
+    })
+    .catch(error => {
+      console.error('Error in rating process:', error);
+      return res.status(500).json({
+        success: false,
+        message: "Failed to process rating",
+        error: error.message
+      });
+    });
 });
 
 /**
@@ -185,19 +180,10 @@ exports.rating = tryCatch(async (req, res) => {
  * @param {Object} req - Express request object
  * @param {Object} res - Express response object
  */
-exports.getProductReviews = tryCatch(async (req, res) => {
-  const productId = req.params.id;
+exports.getProductReviews = tryCatch((req, res) => {
+  const productId = req.params.id || req.body.productId;
   const { page = 1, limit = 10, sortBy = 'newest' } = req.query;
 
-  // Validate product exists
-  const product = await Product.findById(productId);
-  if (!product) {
-    return res.status(404).json({
-      success: false,
-      message: "Product not found"
-    });
-  }
-
   let sortCriteria;
   switch (sortBy) {
     case 'oldest':
@@ -215,28 +201,39 @@ exports.getProductReviews = tryCatch(async (req, res) => {
       break;
   }
 
-  const reviews = await Review.find({ product: productId })
-    .populate('user', 'name email avatar')
-    .sort(sortCriteria)
-    .limit(Number(limit))
-    .skip((Number(page) - 1) * Number(limit));
-
-  const totalReviews = await Review.countDocuments({ product: productId });
-  const totalPages = Math.ceil(totalReviews / Number(limit));
-
-  return res.status(200).json({
-    success: true,
-    message: "Product reviews retrieved successfully",
-    result: reviews,
-    pagination: {
-      currentPage: Number(page),
-      totalPages,
-      totalReviews,
-      reviewsPerPage: Number(limit),
-      hasNextPage: Number(page) < totalPages,
-      hasPrevPage: Number(page) > 1
-    }
-  });
+  // Validate product exists
+  return Product.findById(productId)
+    .then(product => {
+      if (!product) {
+        return res.status(404).json({
+          success: false,
+          message: "Product not found"
+        });
+      }
+      
+      const totalReviews = product.reviews.length;
+      const totalPages = Math.ceil(totalReviews / Number(limit));
+
+      return res.status(200).json({
+        success: true,
+        message: "Product reviews retrieved successfully",
+        result: product.reviews,
+        pagination: {
+          currentPage: Number(page),
+          totalPages,
+          totalReviews,
+          limit: Number(limit)
+        }
+      });
+    })
+    .catch(error => {
+      console.error('Error fetching reviews:', error);
+      return res.status(500).json({
+        success: false,
+        message: "Failed to fetch reviews",
+        error: error.message
+      });
+    });
 });
 
 // Extend with CRUD methods
@@ -245,4 +242,4 @@ for (const prop in crud) {
   if (crud.hasOwnProperty(prop)) {
     module.exports[prop] = crud[prop];
   }
-}
+}

package/libs/emailer/smtp.js

@@ -21,7 +21,8 @@ module.exports = function (fear) {
             const { apiKey, domain, region } = _this.mailConfig.mailgun;
 
             if (!apiKey || !domain) {
-                throw new Error('Mailgun requires apiKey and domain in configuration.');
+                logger.error('Mailgun requires apiKey and domain in configuration.')
+                return;
             }
 
             const mailgun = new Mailgun(_this.mailConfig.mailgun);

package/models/review.js

@@ -3,12 +3,13 @@ const mongoose = require("mongoose");
 const reviewSchema = new mongoose.Schema({
     productId: { type: mongoose.Schema.Types.ObjectId, ref:"Product", required:true },  
     username: { type: String, required: true },
-    email: { type: String, required: false, unique: true, lowercase: true, trim: true,
+    email: { type: String, required: false, lowercase: true, trim: true,
       match: [/^\S+@\S+\.\S+$/, 'Please enter a valid email']
     },
-    rating: { type:Number, required:true, min:1, max:5 },
-    comment: { type:String, required:true },
-    createdAt: { type:Date, default:Date.now }
+    rating: { type: Number, required:true, min:1, max:5 },
+    comment: { type: String, required:true },
+    createdAt: { type: Date, default:Date.now },
+    verified: { type: Boolean, default: false, index: true }
   },
   { timestamps: true, versionKey:false}
 ); 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feardread/fear",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package/routes/review.js

@@ -2,10 +2,14 @@ const Review = require("../controllers/review");
 
 module.exports = (fear) => {
       const router = fear.createRouter();
-
-      router.post("/new", Review.review)
-            .get("/rating", Review.rating)
-            .get("/by-product/:productId", Review.getProductReviews);
-      router.get("/by-product", Review.getProductReviews);
+      const handler = fear.getHandler();
+      
+      router.get("/all", handler.async(Review.all));
+      router.post("/new", handler.async(Review.add));
+      router.route("/:id")
+            .put(Review.update)
+            .delete(Review.delete)
+            .get(Review.getProductReviews);
+      
       return router;
 };