Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REFACTOR] refactor user mypage review #409

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 31 additions & 37 deletions functions/api/routes/user/userReviewListGET.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const _ = require("lodash");
const util = require("../../../lib/util");
const statusCode = require("../../../constants/statusCode");
const responseMessage = require("../../../constants/responseMessage");
Expand All @@ -18,49 +19,42 @@ module.exports = async (req, res) => {

try {
client = await db.connect(req);
let reviewList = await reviewDB.getReviewListByUserId(client, userId);
const [writer, relationReviewTagList] = await Promise.all([
userDB.getUserByUserId(client, userId),
relationReviewTagDB.getRelationReviewTagList(client),
]);

let writer = await userDB.getUserByUserId(client, userId);

writer = {
writerId: writer.id,
nickname: writer.nickname,
};

reviewList = await Promise.all(
reviewList.map(async (review) => {
const tagNameList = await relationReviewTagDB.getTagNameListByReviewId(client, review.id);

// 좋아요 정보
const likeData = await likeDB.getLikeByTarget(
client,
review.id,
likeType.REVIEW,
req.user.id,
);

const isLiked = likeData ? likeData.isLiked : false;
let reviewList = await reviewDB.getReviewListByUserId(
client,
userId,
likeType.REVIEW,
req.user.id,
);

const likeCount = await likeDB.getLikeCountByTarget(client, review.id, likeType.REVIEW);
const like = {
isLiked: isLiked,
likeCount: likeCount.likeCount,
};
reviewList = reviewList.map((review) => {
review.tagList = _.filter(relationReviewTagList, (r) => r.reviewId === review.id).map((r) => {
return { tagName: r.tagName };
});

return {
id: review.id,
majorName: review.majorName,
oneLineReview: review.oneLineReview,
createdAt: review.createdAt,
tagList: tagNameList,
like: like,
};
}),
);
return {
id: review.id,
majorName: review.majorName,
oneLineReview: review.oneLineReview,
createdAt: review.createdAt,
tagList: review.tagList,
like: {
isLiked: review.isLiked,
likeCount: review.likeCount,
},
};
});

res.status(statusCode.OK).send(
util.success(statusCode.OK, responseMessage.READ_ALL_POSTS_SUCCESS, {
writer,
writer: {
writerId: writer.id,
nickname: writer.nickname,
},
reviewList,
}),
);
Expand Down
28 changes: 23 additions & 5 deletions functions/db/review.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,37 @@ const deleteReview = async (client, id) => {
return convertSnakeToCamel.keysToCamel(rows[0]);
};

const getReviewListByUserId = async (client, userId) => {
const getReviewListByUserId = async (client, writerId, likeTypeId, userId) => {
const { rows } = await client.query(
`
SELECT r.*, m.major_name
SELECT r.*, m.major_name,
(
SELECT cast(count(l.*) as integer) AS like_count FROM "like" l
WHERE l.target_id = r.id
AND l.target_type_id = $2
AND l.is_liked = true
AND r.is_deleted = false
),
(
coalesce(
(
SELECT l.is_liked FROM "like" l
WHERE l.target_id = r.id
AND l.target_type_id = $2
AND l.user_id = $3
AND r.is_deleted = false
), false
)
) as is_liked
FROM review r
INNER JOIN major m
ON r.major_id = m.id
AND m.is_deleted = false
ON r.major_id = m.id
AND m.is_deleted = false
AND r.writer_id = $1
AND r.is_deleted = false
ORDER BY created_at desc
`,
[userId],
[writerId, likeTypeId, userId],
);
return convertSnakeToCamel.keysToCamel(rows);
};
Expand Down