push

chryzcode · Jul 19, 2024 · b18072c · b18072c
1 parent 5a45799
commit b18072c
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 70 deletions.
diff --git a/app.js b/app.js
@@ -46,7 +46,7 @@ app.use(express.urlencoded({ extended: true }));
 app.use(
   rateLimit({
     windowMs: 15 * 60 * 1000, // 15 mins
-    max: 1000, // Adjust the limit if needed
+    max: 2000, // Adjust the limit if needed
   })
 );
 

diff --git a/controllers/post.js b/controllers/post.js
@@ -1,57 +1,75 @@
 import { StatusCodes } from "http-status-codes";
 import { BadRequestError, NotFoundError } from "../errors/index.js";
 import { Post, postLikes } from "../models/post.js";
-import cloudinary from "cloudinary";
 import Notification from "../models/notification.js";
 import User from "../models/user.js";
 import Follower from "../models/follower.js";
 import { Comment } from "../models/comment.js";
-import path from "path";
 import "dotenv/config.js";
+import { uploadToCloudinary } from "../utils/cloudinaryConfig.js";
 
 const DOMAIN = process.env.DOMAIN;
 
-const options = {
-  use_filename: true,
-  unique_filename: false,
-  overwrite: true,
-};
+
 
 export const createPost = async (req, res) => {
   req.body.author = req.user.userId;
-  const imagePath = req.body.image;
+
   try {
-    const result = await cloudinary.v2.uploader.upload(imagePath, {
-      folder: "PenPages/Post/Image/",
-      use_filename: true,
+    if (req.file) {
+      const result = await uploadToCloudinary(req.file);
+      req.body.image = result.secure_url; // Set Cloudinary URL to the image field
+    }
+    const post = await Post.create(req.body);
+
+    // Notify followers
+    const author = await User.findOne({ _id: post.author });
+    if (!author) {
+      throw new NotFoundError(`User/ Author with id ${post.author} does not exist`);
+    }
+    const followers = await Follower.find({ user: post.author });
+    followers.forEach(async aFollower => {
+      await Notification.create({
+        fromUser: post.author,
+        toUser: aFollower.follower,
+        info: `${author.username} just published a post ${post.title}`,
+        url: `${DOMAIN}/post/${post.id}`,
+        type: "post",
+        info_id: post.id,
+      });
     });
-    req.body.imageCloudinaryUrl = result.url;
-    const imageName = path.basename(req.body.image);
-    req.body.image = imageName;
+
+    res.status(StatusCodes.CREATED).json({ post });
   } catch (error) {
-    console.log(error);
-    throw new BadRequestError("error uploading image on cloudinary");
-  }
-  if (!req.body.imageCloudinaryUrl) {
-    throw new BadRequestError("error uploading image on cloudinary");
+    console.error(error);
+    res.status(400).json({ error: error.message });
   }
-  const post = await Post.create({ ...req.body });
-  const author = await User.findOne({ _id: post.author });
-  if (!author) {
-    throw new NotFoundError(`User/ Author with id ${post.author} does not exist`);
-  }
-  const followers = await Follower.find({ user: post.author });
-  followers.forEach(aFollower => {
-    Notification.create({
-      fromUser: post.author,
-      toUser: aFollower.follower,
-      info: `${author.username} just published a post ${post.title}`,
-      url: `${DOMAIN}/post/${post.id}`,
-      type: "post",
-      info_id: post.id,
+};
+
+export const updatePost = async (req, res) => {
+  const { postId } = req.params;
+  const userId = req.user.userId;
+
+  try {
+    if (req.file) {
+      const result = await uploadToCloudinary(req.file);
+      req.body.image = result.secure_url; // Set Cloudinary URL to the image field
+    }
+
+    const post = await Post.findOneAndUpdate({ _id: postId, author: userId }, req.body, {
+      new: true,
+      runValidators: true,
     });
-  });
-  res.status(StatusCodes.CREATED).json({ post });
+
+    if (!post) {
+      throw new NotFoundError(`Post with id ${postId} does not exist`);
+    }
+
+    res.status(StatusCodes.OK).json({ post });
+  } catch (error) {
+    console.error(error);
+    res.status(400).json({ error: error.message });
+  }
 };
 
 export const getAllPosts = async (req, res) => {
@@ -163,36 +181,7 @@ export const getUserPosts = async (req, res) => {
   res.status(StatusCodes.OK).json({ userPosts });
 };
 
-export const updatePost = async (req, res) => {
-  const { postId } = req.params;
-  const userId = req.user.userId;
-  const imagePath = req.files.fileToUpload.path;
 
-  if (imagePath) {
-    try {
-      const result = await cloudinary.v2.uploader.upload(imagePath, {
-        folder: "PenPages/Post/Image",
-        use_filename: true,
-      });
-
-      req.body.imageCloudinaryUrl = result.url;
-      const imageName = path.basename(req.files.fileToUpload.path);
-      req.body.image = imageName;
-    } catch (error) {
-      console.error(error);
-      throw new BadRequestError("error uploading image on cloudinary");
-    }
-  }
-
-  const post = await Post.findOneAndUpdate({ _id: postId, author: userId }, req.body, {
-    new: true,
-    runValidators: true,
-  });
-  if (!post) {
-    throw new NotFoundError(`Post with id ${postId} does not exist`);
-  }
-  res.status(StatusCodes.OK).json({ post });
-};
 
 export const deletePost = async (req, res) => {
   const { postId } = req.params;

diff --git a/models/post.js b/models/post.js
@@ -12,9 +12,6 @@ const postSchema = new mongoose.Schema(
       type: String,
       required: [true, "Image field is required"],
     },
-    imageCloudinaryUrl: {
-      type: String,
-    },
     body: {
       type: String,
       required: [true, "Body field is compulsory"],