refactor(api): Improve resource handling in addIsBookmarkedField

AltCamp · Aug 1, 2023 · 7d3b5c0 · 7d3b5c0
1 parent a60338c
commit 7d3b5c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 35 deletions.
diff --git a/src/answers/answersService.js b/src/answers/answersService.js
@@ -1,5 +1,5 @@
 const { Answer, Question } = require('../../model');
-const { addIsBookmarkedField2 } = require('../bookmarks/bookmarksService');
+const { addIsBookmarkedField } = require('../bookmarks/bookmarksService');
 
 const getAnswer = async (id) => {
   const answers = await Answer.find({ id });
@@ -19,10 +19,9 @@ const getAnswers = async (questionId, userId) => {
     return answers;
   }
 
-  const answersWithBookmarks = await addIsBookmarkedField2(answers, userId);
-  return answersWithBookmarks;
+  answers = await addIsBookmarkedField(answers, userId);
+  return answers;
 };
-
 const createAnswer = async (answer) => {
   const newAnswer = await Answer.create(answer);
   newAnswer.question = answer.question;

diff --git a/src/bookmarks/bookmarksService.js b/src/bookmarks/bookmarksService.js
@@ -133,29 +133,6 @@ const isBookmarkOwner = async ({ userId, bookmarkId }) => {
 };
 
 const addIsBookmarkedField = async (resources, userId) => {
-  const _resources = { ...resources };
-  try {
-    const resourceIds = _resources.data.map((resource) => resource.id);
-    let bookmarks = await Bookmark.find({
-      id: { $in: [resourceIds] },
-      owner: userId,
-    });
-    bookmarks = bookmarks.map((each) => each.post.toString());
-
-    _resources.data = _resources.data.map((resource) => {
-      if (bookmarks.includes(resource.id)) {
-        return { ...resource.toJSON(), isBookmarked: true };
-      } else {
-        return { ...resource.toJSON(), isBookmarked: false };
-      }
-    });
-    return _resources;
-  } catch (error) {
-    return resources;
-  }
-};
-
-const addIsBookmarkedField2 = async (resources, userId) => {
   let _resources = [...resources];
   try {
     const resourceIds = _resources.map((resource) => resource._id.toString());
@@ -187,5 +164,4 @@ module.exports = {
   deleteBookmark,
   isBookmarkOwner,
   addIsBookmarkedField,
-  addIsBookmarkedField2,
 };
diff --git a/src/comments/commentsService.js b/src/comments/commentsService.js
@@ -1,5 +1,5 @@
 const { Comment, Post } = require('../../model/');
-const { addIsBookmarkedField2 } = require('../bookmarks/bookmarksService');
+const { addIsBookmarkedField } = require('../bookmarks/bookmarksService');
 
 const getComment = async (id) => {
   const comment = await Comment.findById(id);
@@ -19,8 +19,8 @@ const getComments = async (postId, userId) => {
     return comments;
   }
 
-  const commentsWithBookmarks = await addIsBookmarkedField2(comments, userId);
-  return commentsWithBookmarks;
+  comments = await addIsBookmarkedField(comments, userId);
+  return comments;
 };
 
 const createComment = async (comment) => {

diff --git a/src/posts/postsService.js b/src/posts/postsService.js
@@ -15,8 +15,8 @@ const getPosts = async ({ query } = {}, { userId }) => {
     });
     return posts;
   }
-  const postsWithBookmarks = await addIsBookmarkedField(posts, userId);
-  return postsWithBookmarks;
+  posts.data = await addIsBookmarkedField(posts.data, userId);
+  return posts;
 };
 
 const getPost = async (postId) => {

diff --git a/src/questions/questionsService.js b/src/questions/questionsService.js
@@ -15,8 +15,8 @@ const getQuestions = async ({ query } = {}, { userId }) => {
     });
     return questions;
   }
-  const questionsWithBookmarks = await addIsBookmarkedField(questions, userId);
-  return questionsWithBookmarks;
+  questions.data = await addIsBookmarkedField(questions.data, userId);
+  return questions;
 };
 
 const getQuestion = async (questionId) => {