Skip to content

add await in like page #52

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.

Sign up for GitHub

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

Open
pupss91090 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add await in like page #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions controllers/user-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ const userController = {
{ model: User, as: 'Followings' }
]
})
const isFollowed = helpers.getUser(req) && helpers.getUser(req).Followings.some(f => f.id === Number(userId))
const isFollowed = await helpers.getUser(req) && helpers.getUser(req).Followings.some(f => f.id === Number(userId))

// likedtweet area
const likes = await Like.findAll({
Expand All @@ -239,7 +239,7 @@ const userController = {
raw: true,
nest: true //
})
const likedTweetsId = likes.map(like => like.tweetId)
const likedTweetsId = await likes.map(like => like.tweetId)

const tweets = await Tweet.findAll({
order: [['id', 'DESC']],
Expand All @@ -250,9 +250,9 @@ const userController = {
const myLikedTweets = await Like.findAll({
where: { userId: reqUser.id }
})
const myLikedTweetsId = myLikedTweets.map(l => l.tweetId)
const myLikedTweetsId = await myLikedTweets.map(l => l.tweetId)

const tweetsResult = tweets
const tweetsResult = await tweets
.map(t => ({
...t.toJSON(),
isLiked: myLikedTweetsId && myLikedTweetsId.some(l => l === t.id)
Expand All @@ -261,7 +261,7 @@ const userController = {
for (let i = 0; i < likes.length; i++) {
tweetsResult[i].likedCreatedAt = likes[i].createdAt
}
tweetsResult.sort((a, b) => b.likedCreatedAt - a.likedCreatedAt)
await tweetsResult.sort((a, b) => b.likedCreatedAt - a.likedCreatedAt)

// top10users area
const users = await User.findAll({ include: [{ model: User, as: 'Followers' }], where: { role: 'user' } })
Expand Down