@feardread/fear 2.0.1 → 2.0.4

package/controllers/crud/crud.js

@@ -12,6 +12,41 @@ const isValidObjectId = (id) => {
   return mongoose.Types.ObjectId.isValid(id) && /^[0-9a-fA-F]{24}$/.test(id);
 };
 
+/**
+ * Sanitizes update data by removing undefined values
+ * @param {Object} data - Data object to sanitize
+ * @returns {Object} Sanitized data object
+ */
+const sanitizeUpdateData = (data) => {
+  const sanitized = { ...data };
+  Object.keys(sanitized).forEach(key => {
+    if (sanitized[key] === undefined) {
+      delete sanitized[key];
+    }
+  });
+  return sanitized;
+};
+
+/**
+ * Processes image data for upload
+ * @param {string|Array} images - Images to process
+ * @returns {Promise<Array>} Promise resolving to uploaded image URLs
+ */
+const processImages = (images) => {
+  if (!images) return Promise.resolve(null);
+  
+  const imageArray = Array.isArray(images) 
+    ? images 
+    : images.split(',').map(item => item.trim());
+  
+  return cloud.uploadImages(imageArray)
+    .then(imageLinks => imageLinks || null)
+    .catch(error => {
+      console.error('Error uploading images:', error);
+      return null;
+    });
+};
+
 /**
  * Get all documents for requested Model
  * @param {mongoose.Model} Model - Mongoose model
@@ -19,34 +54,27 @@ const isValidObjectId = (id) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.all = tryCatch(async (Model, req, res) => {
+exports.all = tryCatch((Model, req, res) => {
   const { sort = 'category', order = 'asc', populate = 'true' } = req.query;
-  
   const sortOrder = order === 'desc' ? -1 : 1;
+  
   let query = Model.find().sort({ [sort]: sortOrder });
 
-  // Apply population if requested
-  if (populate !== 'false') {
-    query = query.populate();
-  }
+  if (populate !== 'false') query = query.populate();
 
-  const result = await query.exec();
+  return query
+    .exec()
+    .then(result => {
+      if (!result || result.length === 0) {
+        return res.status(200).json({result: [],success: true,message: "No documents found",count: 0});
+      }
 
-  if (!result || result.length === 0) {
-    return res.status(200).json({
-      result: [],
-      success: true,
-      message: "No documents found",
-      count: 0
+      return res.status(200).json({result,success: true,message: `Found ${result.length} documents`,count: result.length});
+    })
+    .catch(error => {
+      console.error('Error fetching documents:', error);
+      return res.status(500).json({result: null,success: false});
     });
-  }
-
-  return res.status(200).json({
-    result,
-    success: true,
-    message: `Found ${result.length} documents`,
-    count: result.length
-  });
 });
 
 /**
@@ -56,31 +84,43 @@ exports.all = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.read = tryCatch(async (Model, req, res) => {
+exports.read = tryCatch((Model, req, res) => {
   const { id } = req.params;
 
   if (!id || !isValidObjectId(id)) {
-    return res.status(400).json({
-      result: null,
-      success: false,
-      message: "Invalid or Missing Document ID"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        result: null,
+        success: false,
+        message: "Invalid or missing document ID"
+      })
+    );
   }
-  const result = await Model.findById(id).exec();
 
-  if (!result) {
-    return res.status(404).json({
-      result: null,
-      success: false,
-      message: `Document with ID ${id} not found`
+  return Model.findById(id).exec()
+    .then(result => {
+      if (!result) {
+        return res.status(404).json({
+          result: null,
+          success: false,
+          message: `Document with ID ${id} not found`
+        });
+      }
+
+      return res.status(200).json({
+        result,
+        success: true,
+        message: "Document found successfully"
+      });
+    })
+    .catch(error => {
+      console.error('Error reading document:', error);
+      return res.status(500).json({
+        result: null,
+        success: false,
+        message: "Error reading document"
+      });
     });
-  }
-
-  return res.status(200).json({
-    result,
-    success: true,
-    message: "Document found successfully"
-  });
 });
 
 /**
@@ -90,27 +130,36 @@ exports.read = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.create = tryCatch(async (Model, req, res) => {
+exports.create = tryCatch((Model, req, res) => {
   const documentData = { ...req.body };
-  // Handle image uploads if present
-  if (documentData.images) {
-
-      documentData.images.split(',').map(item => item.trim());
-    
-      const imageLinks = await cloud.uploadImages(documentData.images);
-    
-      if ( imageLinks ) documentData.images = imageLinks;
-  }
-
-  console.log('Creating document:', documentData);
 
-  const document = new Model(documentData);
-  await document.save()
-      .then((result) => {
-        return res.status(201).json({ result, success: true,
-          message: `Document created successfully in ${Model.modelName} collection`});
-      })
-      .catch((error) => {console.log('Error Saving document :: ', error);});
+  return processImages(documentData.images)
+    .then(imageLinks => {
+      if (imageLinks) {
+        documentData.images = imageLinks;
+      }
+      
+      console.log('Creating document:', documentData);
+      const document = new Model(documentData);
+      
+      return document.save();
+    })
+    .then(result => {
+      return res.status(201).json({
+        result,
+        success: true,
+        message: `Document created successfully in ${Model.modelName} collection`
+      });
+    })
+    .catch(error => {
+      console.error('Error creating document:', error);
+      return res.status(500).json({
+        result: null,
+        success: false,
+        message: "Error creating document",
+        error: error.message
+      });
+    });
 });
 
 /**
@@ -120,60 +169,71 @@ exports.create = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.update = tryCatch(async (Model, req, res) => {
+exports.update = tryCatch((Model, req, res) => {
   const { id } = req.params;
 
   if (!id) {
-    return res.status(400).json({
-      result: null,
-      success: false,
-      message: "Document ID is required"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        result: null,
+        success: false,
+        message: "Document ID is required"
+      })
+    );
   }
 
   if (!isValidObjectId(id)) {
-    return res.status(400).json({
-      result: null,
-      success: false,
-      message: "Invalid document ID format"
-    });
-  }
-
-  const updateData = { ...req.body };
-
-  // Remove undefined values
-  Object.keys(updateData).forEach(key => {
-    if (updateData[key] === undefined) {
-      delete updateData[key];
-    }
-  });
-
-  // Handle image uploads if present
-  if (updateData.images && Array.isArray(updateData.images) && updateData.images.length > 0) {
-    const uploadedImages = await cloud.uploadImages(updateData.images);
-    updateData.images = uploadedImages;
+    return Promise.resolve(
+      res.status(400).json({
+        result: null,
+        success: false,
+        message: "Invalid document ID format"
+      })
+    );
   }
 
-  // Update document
-  const result = await Model.findByIdAndUpdate(
-    id,
-    updateData,
-    { new: true, runValidators: true }
-  ).exec();
-
-  if (!result) {
-    return res.status(404).json({
-      result: null,
-      success: false,
-      message: `Document with ID ${id} not found`
+  const updateData = sanitizeUpdateData(req.body);
+
+  const imagePromise = (updateData.images && Array.isArray(updateData.images) && updateData.images.length > 0)
+    ? processImages(updateData.images)
+    : Promise.resolve(null);
+
+  return imagePromise
+    .then(uploadedImages => {
+      if (uploadedImages) {
+        updateData.images = uploadedImages;
+      }
+
+      return Model.findByIdAndUpdate(
+        id,
+        updateData,
+        { new: true, runValidators: true }
+      ).exec();
+    })
+    .then(result => {
+      if (!result) {
+        return res.status(404).json({
+          result: null,
+          success: false,
+          message: `Document with ID ${id} not found`
+        });
+      }
+
+      return res.status(200).json({
+        result,
+        success: true,
+        message: `Document updated successfully with ID: ${id}`
+      });
+    })
+    .catch(error => {
+      console.error('Error updating document:', error);
+      return res.status(500).json({
+        result: null,
+        success: false,
+        message: "Error updating document",
+        error: error.message
+      });
     });
-  }
-
-  return res.status(200).json({
-    result,
-    success: true,
-    message: `Document updated successfully with ID: ${id}`
-  });
 });
 
 /**
@@ -183,47 +243,60 @@ exports.update = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.delete = tryCatch(async (Model, req, res) => {
+exports.delete = tryCatch((Model, req, res) => {
   const { id } = req.params;
 
   if (!id) {
-    return res.status(400).json({
-      result: null,
-      success: false,
-      message: "Document ID is required"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        result: null,
+        success: false,
+        message: "Document ID is required"
+      })
+    );
   }
 
   if (!isValidObjectId(id)) {
-    return res.status(400).json({
-      result: null,
-      success: false,
-      message: "Invalid document ID format"
-    });
+    return Promise.resolve(
+      res.status(400).json({
+        result: null,
+        success: false,
+        message: "Invalid document ID format"
+      })
+    );
   }
 
-  const result = await Model.findByIdAndDelete(id).exec();
-
-  if (!result) {
-    return res.status(404).json({
-      result: null,
-      success: false,
-      message: `Document with ID ${id} not found`
+  return Model.findByIdAndDelete(id)
+    .exec()
+    .then(result => {
+      if (!result) {
+        return res.status(404).json({ result: null, success: false });
+      }
+
+      // Clean up associated images if they exist
+      if (result.images && Array.isArray(result.images) && result.images.length > 0) {
+        console.log('Document had images that should be cleaned up:', result.images);
+        // Uncomment when cloud.deleteImages is available:
+        // return cloud.deleteImages(result.images)
+        //   .then(() => result)
+        //   .catch(err => {
+        //     console.error('Error deleting images:', err);
+        //     return result;
+        //   });
+      }
+
+      return result;
+    })
+    .then(result => {
+      return res.status(200)
+        .json({ result, success: true,
+          message: `Document deleted successfully with ID: ${id}`
+        });
+    })
+    .catch(error => {
+      console.error('Error deleting document:', error);
+      return res.status(500).json({ result: error, success: false });
     });
-  }
-
-  // TODO: Clean up associated images if they exist
-  if (result.images && Array.isArray(result.images) && result.images.length > 0) {
-    console.log('Document had images that should be cleaned up:', result.images);
-    // Uncomment when cloud.deleteImages is available:
-    // await cloud.deleteImages(result.images);
-  }
-
-  return res.status(200).json({
-    result,
-    success: true,
-    message: `Document deleted successfully with ID: ${id}`
-  });
 });
 
 /**
@@ -233,7 +306,7 @@ exports.delete = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.list = tryCatch(async (Model, req, res) => {
+exports.list = tryCatch((Model, req, res) => {
   const page = Math.max(1, parseInt(req.query.page) || 1);
   const limit = Math.min(100, Math.max(1, parseInt(req.query.items) || 10));
   const skip = (page - 1) * limit;
@@ -241,35 +314,44 @@ exports.list = tryCatch(async (Model, req, res) => {
 
   const sortOrder = order === 'asc' ? 1 : -1;
 
-  // Execute count and find queries in parallel
-  const [result, count] = await Promise.all([
-    Model.find()
-      .skip(skip)
-      .limit(limit)
-      .sort({ [sort]: sortOrder })
-      .populate(populate !== 'false' ? undefined : null)
-      .exec(),
-    Model.countDocuments().exec()
-  ]);
-
-  const totalPages = Math.ceil(count / limit);
-  const pagination = {
-    currentPage: page,
-    totalPages,
-    totalItems: count,
-    itemsPerPage: limit,
-    hasNextPage: page < totalPages,
-    hasPrevPage: page > 1
-  };
-
-  return res.status(200).json({
-    result,
-    success: true,
-    pagination,
-    message: count > 0 
-      ? `Found ${result.length} of ${count} documents` 
-      : "Collection is empty"
-  });
+  const findQuery = Model.find()
+    .skip(skip)
+    .limit(limit)
+    .sort({ [sort]: sortOrder })
+    .populate(populate !== 'false' ? undefined : null)
+    .exec();
+
+  const countQuery = Model.countDocuments().exec();
+
+  return Promise.all([findQuery, countQuery])
+    .then(([result, count]) => {
+      const totalPages = Math.ceil(count / limit);
+      const pagination = {
+        currentPage: page,
+        totalPages,
+        totalItems: count,
+        itemsPerPage: limit,
+        hasNextPage: page < totalPages,
+        hasPrevPage: page > 1
+      };
+
+      return res.status(200).json({
+        result,
+        success: true,
+        pagination,
+        message: count > 0 
+          ? `Found ${result.length} of ${count} documents` 
+          : "Collection is empty"
+      });
+    })
+    .catch(error => {
+      console.error('Error listing documents:', error);
+      return res.status(500).json({
+        result: null,
+        success: false,
+        message: "Error listing documents"
+      });
+    });
 });
 
 /**
@@ -279,7 +361,7 @@ exports.list = tryCatch(async (Model, req, res) => {
  * @param {Object} res - Express response object
  * @returns {Promise<void>}
  */
-exports.search = tryCatch(async (Model, req, res) => {
+exports.search = tryCatch((Model, req, res) => {
   console.log('CRUD search query:', req.query);
 
   const {
@@ -294,7 +376,6 @@ exports.search = tryCatch(async (Model, req, res) => {
     limit = 24
   } = req.query;
 
-  // Build query object
   const queryObj = { 
     page: parseInt(page), 
     limit: parseInt(limit) 
@@ -325,19 +406,28 @@ exports.search = tryCatch(async (Model, req, res) => {
     defaultSort: sortOptions[sortBy] || sortOptions.popularity
   });
 
-  const result = await searchApi
+  return searchApi
     .search(['_id', 'id', 'price', 'name', 'description', 'brand', 'tags'])
     .filter()
     .sort()
     .selectFields('-__v,-updatedAt')
     .populate('reviews')
     .paginate(parseInt(limit), 50)
-    .execute();
-
-  return res.status(200).json({
-    success: true,
-    ...result
-  });
+    .execute()
+    .then(result => {
+      return res.status(200).json({
+        success: true,
+        ...result
+      });
+    })
+    .catch(error => {
+      console.error('Error searching documents:', error);
+      return res.status(500).json({
+        success: false,
+        message: "Error searching documents",
+        error: error.message
+      });
+    });
 });
 
 /**

package/controllers/review.js

@@ -8,9 +8,9 @@ const Product = require("../models/product");
  * @param {Object} res - Express response object
  */
 exports.review = tryCatch(async (req, res) => {
-  const { rating, comment } = req.body;
-  const productId = req.params.id;
-  const userId = req.user._id;
+  const { username, email, rating, comment } = req.body;
+  const productId = req.params.productId || req.body.productId;
+  //const userId = req.user._id;
 
   // Validate required fields
   if (!rating || rating < 1 || rating > 5) {
@@ -42,8 +42,9 @@ exports.review = tryCatch(async (req, res) => {
   );
 
   const reviewData = {
-    user: userId,
-    product: productId,
+    productId: productId,
+    username,
+    email,
     rating: Number(rating),
     comment: comment.trim(),
     createdAt: new Date()
@@ -74,7 +75,7 @@ exports.review = tryCatch(async (req, res) => {
     if (existingReviewIndex !== -1) {
       // Update existing review in Review collection
       await Review.findOneAndUpdate(
-        { user: userId, product: productId },
+        { username, productId },
         reviewData,
         { upsert: true, new: true }
       );

package/models/review.js

@@ -1,8 +1,11 @@
 const mongoose = require("mongoose");
 
 const reviewSchema = new mongoose.Schema({
-    user: { type: mongoose.Schema.Types.ObjectId, ref:"User", required:true },
-    product: { type: mongoose.Schema.Types.ObjectId, ref:"Product", required:true },
+    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,
+      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 }

package/package.json

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

package/routes/review.js

@@ -5,7 +5,7 @@ module.exports = (fear) => {
 
       router.post("/new", Review.review)
             .get("/rating", Review.rating)
-            .get("/product/:id", Review.getProductReviews);
-            
+            .get("/by-product/:productId", Review.getProductReviews);
+      router.get("/by-product", Review.getProductReviews);
       return router;
 };