좋아요 개수 및 좋아요 누른 유무 close #267

Jihyun247 · Jihyun247 · commit fa6b4c1100f5 · 2021-08-07T17:50:44.000+09:00
diff --git a/controller/explorationController.js b/controller/explorationController.js
@@ -2,7 +2,7 @@ const util = require('../modules/util');
 const code = require('../modules/statusCode');
 const message = require('../modules/responseMessage');
 
-const { Answer, User, Comment, Question, Scrap, Category } = require('../models');
+const { Answer, User, Comment, Question, Scrap, Category, Like } = require('../models');
 const { homeService, userService } = require('../service');
 const explorationService = require('../service/explorationService');
 const answerService = require('../service/answerService');
@@ -223,7 +223,51 @@ module.exports = {
         }
     },
 
-    // 스크랩 하기 & 스크랩 취소하기
+    // 다른 글 둘러보기 (흥미최신 sorting 쿼리 없는 조건 [NEW]) - 좋아요 기능 추가
+    getExpAnswersWithoutLen: async (req, res) => {
+        try {
+            let { page, category } = req.query;
+            const user_nickname = req.decoded.id;
+ 
+            // page 오류 처리
+            if (page == 0) {
+                return res.status(code.BAD_REQUEST).send(util.fail(code.BAD_REQUEST, message.NO_INVALID_PAGE))
+            }
+            if (!page) {
+                return res.status(code.BAD_REQUEST).send(util.fail(code.BAD_REQUEST, message.OUT_OF_VALUE));
+            }
+
+            // 카테고리
+            const category_attr = {};
+            if ( category ) {
+                if(category > 0 && category < 7) {
+                    category_attr[Op.eq]= category;
+                } else {
+                    return res.status(code.BAD_REQUEST).send(util.fail(code.BAD_REQUEST, message.INVALID_CATEGORY_ID));
+                }
+                
+            } else {
+                category_attr[Op.not]= null;
+            }
+
+            // 데베에서 가져오기
+            let answers = await explorationService.sortNewAnswersWithPagination(user_nickname, category_attr, page)
+            if (answers == message.NO_RESULT) {
+                res.status(code.OK).send(util.success(code.OK, message.NO_RESULT));
+            }
+
+            // 답변 포맷팅
+            answers = await explorationService.getFormattedAnswers(answers, user_nickname);
+
+            return res.status(code.OK).send(util.success(code.OK, message.GET_EXPLORATION_RESULT_SUCCESS, {user_nickname, answers}))
+
+        } catch (err) {
+            console.error(err);
+            return res.status(code.INTERNAL_SERVER_ERROR).send(util.fail(code.INTERNAL_SERVER_ERROR, message.INTERNAL_SERVER_ERROR));
+        }
+    },
+
+    // 스크랩 하기 & 스크랩 취소하기 -> 스크랩 했는지 안했는지 유무 안알려주고 생성 삭제만
     doOrCancelScrap: async (req, res) => {
         const answer_id = req.params.answerId;
         const user_id = req.decoded.id;
diff --git a/models/index.js b/models/index.js
@@ -17,6 +17,7 @@ db.Answer = require('./answer')(sequelize, Sequelize);
 db.Category = require('./category')(sequelize, Sequelize);
 db.Question = require('./question')(sequelize, Sequelize);
 db.Scrap = require('./scrap')(sequelize, Sequelize);
+db.Like = require('./like')(sequelize, Sequelize);
 db.Comment = require('./comment')(sequelize, Sequelize);
 db.Block = require('./block')(sequelize, Sequelize);
 db.Follow = require('./follow')(sequelize, Sequelize);
@@ -48,6 +49,9 @@ db.Comment.belongsTo(db.Comment, { as : 'Parent', foreignKey : 'parent_id'});
 db.User.belongsToMany(db.Answer, { through: 'Scrap', as: 'Scrapped', foreignKey: 'user_id' });
 db.Answer.belongsToMany(db.User, { through: 'Scrap', as: 'Scrapper', foreignKey: 'answer_id'});
 
+/* User : Answer => like */
+db.User.belongsToMany(db.Answer, { through: 'Like', as: 'Liked', foreignKey: 'user_id' });
+db.Answer.belongsToMany(db.User, { through: 'Like', as: 'Liker', foreignKey: 'answer_id'});
 
 /* User : User => block */
 db.User.belongsToMany(db.User, { through: 'Block', as: 'Blocked', foreignKey : 'blocked_id'});
@@ -61,9 +65,6 @@ db.User.belongsToMany(db.User, { through: 'Follow', as: 'Follower', foreignKey :
 db.User.belongsToMany(db.User, { through: 'RecentSearch', as: 'Searched', foreignKey: 'searched_id'});
 db.User.belongsToMany(db.User, { through: 'RecentSearch', as: 'Searcher', foreignKey : 'user_id' });
 
-/* User : Certification => like */
-db.User.belongsToMany(db.Answer, { through: 'Like', as: 'Liked', foreignKey: 'user_id' });
-db.Answer.belongsToMany(db.User, { through: 'Like', as: 'Liker', foreignKey: 'answer_id'});
 
 db.User.hasMany(db.AnswerSearch, {foreignKey: 'user_id'});
 db.AnswerSearch.belongsTo(db.User, {foreignKey: 'user_id'});
diff --git a/models/like.js b/models/like.js
@@ -1,5 +1,4 @@
-const Answer = require('./answer')
-const User = require('./user')
+const { User, Answer } = require('./index');
 
 module.exports = (sequelize, DataTypes) => {
     return sequelize.define('Like', {
diff --git a/service/answerService.js b/service/answerService.js
@@ -43,6 +43,28 @@ const getFormattedAnswerwithPK= async (answer_id, user_id) => {
         } else {
             answer.is_scrapped = true;
         }
+        // 내가 좋아요한 질문인지 확인하기
+        const isLiked = await Like.findOne({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(! isLiked) {
+            answer.is_liked = false;
+        } else {
+            answer.is_liked = true;
+        }
+        // 좋아요 개수
+        const likeCount = await Like.count({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(likeCount == 0) {
+            answer.like_count = likeCount;
+        }
 
         // 내가 답변한 질문인지 확인하기
         const isAnswered = await Answer.findAll({
@@ -156,6 +178,28 @@ const getFormattedAnswerbyPkwithoutComment= async (answer_id, user_id) => {
         } else {
             answer.is_scrapped = true;
         }
+        // 내가 좋아요한 질문인지 확인하기
+        const isLiked = await Like.findOne({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(! isLiked) {
+            answer.is_liked = false;
+        } else {
+            answer.is_liked = true;
+        }
+        // 좋아요 개수
+        const likeCount = await Like.count({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(likeCount == 0) {
+            answer.like_count = likeCount;
+        }
 
 
         // 내가 답변한 질문인지 확인하기
diff --git a/service/explorationService.js b/service/explorationService.js
@@ -1,4 +1,4 @@
-const { Answer, Question, Comment, Category, User, Scrap, Follow }  = require('../models/');
+const { Answer, Question, Comment, Category, User, Scrap, Follow, Like}  = require('../models/');
 const models = require('../models/index');
 const message = require('../modules/responseMessage');
 const { sequelize } = require('../models/index');
@@ -53,6 +53,28 @@ const getFormattedAnswer = async (answer_id, user_id) => {
         } else {
             answer.is_scrapped = true;
         }
+        // 내가 좋아요한 질문인지 확인하기
+        const isLiked = await Like.findOne({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(! isLiked) {
+            answer.is_liked = false;
+        } else {
+            answer.is_liked = true;
+        }
+        // 좋아요 개수
+        const likeCount = await Like.count({
+            where : {
+                user_id,
+                answer_id,
+            }
+        });
+        if(likeCount == 0) {
+            answer.like_count = likeCount;
+        }
 
 
         // 내가 답변한 질문인지 확인하기
