Merge pull request #49 from a0uda/UserFeature

Removal of posts_ids and comments_ids from user
a0uda · Apr 9, 2024 · baeac82 · baeac82
2 parents 087896b + 55d0c68
commit baeac82
Show file tree

Hide file tree

Showing 10 changed files with 404 additions and 89 deletions.
diff --git a/seeds/UserSeed.js b/seeds/UserSeed.js
@@ -123,8 +123,7 @@ async function generateRandomUsers() {
         chat_request_email: true,
         unsubscribe_from_all_emails: false,
       },
-      posts_ids: [],
-      comments_ids: [],
+
       followed_posts_ids: [],
       saved_posts_ids: [],
       hidden_and_reported_posts_ids: [],
@@ -150,13 +149,6 @@ async function generateRandomUsers() {
     const salt = await bcrypt.genSalt(10);
     fakeUser.password = await bcrypt.hash(fakeUser.password, salt);
 
-    fakeUser.token = jwt.sign({ _id: i + 1 }, JWT_SECRET, {
-      expiresIn: "1d",
-    });
-    fakeUser.refreshToken = jwt.sign({ _id: i + 1 }, JWT_SECRET, {
-      expiresIn: "8d",
-    });
-
     users.push(fakeUser);
   }
 

diff --git a/src/controller/postListing.js b/src/controller/postListing.js
@@ -0,0 +1,52 @@
+import { Post } from "../db/models/Post.js";
+import { verifyAuthToken } from "./userAuth.js";
+import { User } from "../db/models/User.js";
+import { getSortCriteria } from "../utils/lisitng.js";
+import { getPostsHelper } from "../services/lisitngs.js";
+
+export async function getPostsPaginated(
+  request,
+  pageNumber = 1,
+  pageSize = 10,
+  sortBy
+) {
+  try {
+    let user = null;
+
+    // Check if request has Authorization header
+    if (request.headers.authorization) {
+      const {
+        success,
+        err,
+        status,
+        user: authenticatedUser,
+        msg,
+      } = await verifyAuthToken(request);
+      if (!authenticatedUser) {
+        return { success, err, status, user: authenticatedUser, msg };
+      }
+      user = authenticatedUser;
+    }
+
+    // Calculate the offset based on pageNumber and pageSize
+    const offset = (pageNumber - 1) * pageSize;
+
+    // Fetch posts with pagination and sorting
+    const { posts } = await getPostsHelper(user, offset, pageSize, sortBy);
+
+    return {
+      success: true,
+      status: 200,
+      posts,
+      msg: "Posts retrieved successfully.",
+    };
+  } catch (error) {
+    console.error("Error:", error);
+    return {
+      success: false,
+      status: 500,
+      err: "Internal Server Error",
+      msg: "An error occurred while retrieving posts.",
+    };
+  }
+}
diff --git a/src/controller/userInfo.js b/src/controller/userInfo.js
@@ -6,6 +6,8 @@ import {
   getPostsHelper,
   getCommunitiesHelper,
   getModeratedCommunitiesHelper,
+  getUserPostsHelper,
+  getUserCommentsHelper,
 } from "../services/users.js";
 
 export async function getFollowers(request) {
@@ -79,34 +81,19 @@ export async function getFollowingCount(request) {
   };
 }
 
-export async function getPosts(request, postType) {
+export async function getUserPosts(request, postType) {
   try {
-    let user = null;
-    if (postType !== "posts_ids") {
-      const {
-        success,
-        err,
-        status,
-        user: authenticatedUser,
-        msg,
-      } = await verifyAuthToken(request);
-      if (!authenticatedUser) {
-        return { success, err, status, user: authenticatedUser, msg };
-      }
-      user = authenticatedUser;
-    } else {
-      const { username } = request.params;
-      user = await User.findOne({ username });
-      if (!user) {
-        return {
-          success: false,
-          err: "No user found with username",
-          status: 404,
-          msg: "User not found",
-        };
-      }
+    const { username } = request.params;
+    const user = await User.findOne({ username });
+    if (!user) {
+      return {
+        success: false,
+        err: "No user found with username",
+        status: 404,
+        msg: "User not found",
+      };
     }
-    const posts = await getPostsHelper(user, postType);
+    const posts = await getUserPostsHelper(user, postType);
     return {
       success: true,
       status: 200,
@@ -124,34 +111,52 @@ export async function getPosts(request, postType) {
   }
 }
 
-export async function getComments(request, commentType) {
+export async function getPosts(request) {
+  let user = null;
   try {
-    let user = null;
-    if (commentType !== "comments_ids") {
-      const {
-        success,
-        err,
-        status,
-        user: authenticatedUser,
-        msg,
-      } = await verifyAuthToken(request);
-      if (!authenticatedUser) {
-        return { success, err, status, user: authenticatedUser, msg };
-      }
-      user = authenticatedUser;
-    } else {
-      const { username } = request.params;
-      user = await User.findOne({ username });
-      if (!user) {
-        return {
-          success: false,
-          err: "No user found with username",
-          status: 404,
-          msg: "User not found",
-        };
-      }
+    const {
+      success,
+      err,
+      status,
+      user: authenticatedUser,
+      msg,
+    } = await verifyAuthToken(request);
+    if (!authenticatedUser) {
+      return { success, err, status, user: authenticatedUser, msg };
+    }
+    user = authenticatedUser;
+    const posts = await getPostsHelper(user);
+    return {
+      success: true,
+      status: 200,
+      posts,
+      msg: "Posts retrieved successfully.",
+    };
+  } catch (error) {
+    console.error("Error:", error);
+    return {
+      success: false,
+      status: 500,
+      err: "Internal Server Error",
+      msg: "An error occurred while retrieving posts.",
+    };
+  }
+}
+
+export async function getUserComments(request) {
+  try {
+    const { username } = request.params;
+    const user = await User.findOne({ username });
+    if (!user) {
+      return {
+        success: false,
+        err: "No user found with username",
+        status: 404,
+        msg: "User not found",
+      };
     }
-    const comments = await getCommentsHelper(user, commentType);
+
+    const comments = await getUserCommentsHelper(user);
     return {
       success: true,
       status: 200,
@@ -169,6 +174,38 @@ export async function getComments(request, commentType) {
   }
 }
 
+export async function getComments(request) {
+  let user = null;
+  try {
+    const {
+      success,
+      err,
+      status,
+      user: authenticatedUser,
+      msg,
+    } = await verifyAuthToken(request);
+    if (!authenticatedUser) {
+      return { success, err, status, user: authenticatedUser, msg };
+    }
+    user = authenticatedUser;
+    const comments = await getCommentsHelper(user);
+    return {
+      success: true,
+      status: 200,
+      comments,
+      msg: "Comments retrieved successfully.",
+    };
+  } catch (error) {
+    console.error("Error:", error);
+    return {
+      success: false,
+      status: 500,
+      err: "Internal Server Error",
+      msg: "An error occurred while retrieving posts.",
+    };
+  }
+}
+
 export async function getOverview(request) {
   try {
     const { username } = request.params;
@@ -181,8 +218,8 @@ export async function getOverview(request) {
         msg: "User not found",
       };
     }
-    const posts = await getPostsHelper(user, "posts_ids");
-    const comments = await getCommentsHelper(user, "comments_ids");
+    const posts = await getUserPostsHelper(user);
+    const comments = await getUserCommentsHelper(user);
 
     return {
       success: true,

diff --git a/src/db/models/User.js b/src/db/models/User.js
@@ -282,20 +282,7 @@ const userSchema = new mongoose.Schema({
       default: false,
     },
   },
-  posts_ids: {
-    type: Array,
-    items: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Post",
-    },
-  },
-  comments_ids: {
-    type: Array,
-    items: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Comment",
-    },
-  },
+
   followed_posts_ids: {
     type: Array,
     items: {

diff --git a/src/index.js b/src/index.js
@@ -2,6 +2,7 @@ import express from "express";
 import dotenv from "dotenv";
 import { usersRouter } from "./routers/users.js";
 import { communityRouter } from "./routers/communities.js";
+import { listingPostsRouter } from "./routers/lisitng.js";
 dotenv.config();
 import { connect_to_db } from "./db/mongoose.js";
 
@@ -27,7 +28,7 @@ app.listen(port, () => {
   console.log("Server is Up");
 });
 
-app.use([usersRouter, communityRouter]);
+app.use([usersRouter, communityRouter, listingPostsRouter]);
 
 // Error handling middleware
 app.use((err, req, res, next) => {