Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Updated db query

Browse source 
ref PLG-220
This commit is contained in:
Ronald Langeveld 2024-10-31 13:30:43 +09:00
parent b834272ff1
commit 15089df503
2 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
ghost/core/core/server/services/comments/CommentsService.js
View file

@ -176,53 +176,68 @@ class CommentsService {
async getBestComments(options) {
this.checkEnabled();
const postId = options.post_id;
let limit = options.limit || 20;
const allOrderedComments = await this.models.Comment.query()
const totalComments = await this.models.Comment.query()
.where('comments.post_id', postId) // Filter by postId
.count('comments.id as count__comments')
.first();
const commentsWithLikes = await this.models.Comment.query()
.where('comments.post_id', postId) // Filter by postId
.select('comments.id')
.count('comment_likes.id as count__likes')
.leftJoin('comment_likes', 'comments.id', 'comment_likes.comment_id')
.groupBy('comments.id')
.having('count__likes', '>', 0) // Only return comments with likes
.orderByRaw(`
count__likes DESC,
comments.created_at DESC
`);
const totalComments = allOrderedComments.length;
// get all id's of commentswithlikes
const commentsWithLikesIds = commentsWithLikes.map(comment => comment.id);
const totalCommentsWithLikes = commentsWithLikesIds.length;
if (totalComments === 0) {
const page = await this.models.Comment.findPage({...options, parentId: null});
return page;
if (totalCommentsWithLikes === 0) {
return await this.models.Comment.findPage({...options, parentId: null});
}
const limit = Number(options.limit) || 15;
const currentPage = Number(options.page) || 1;
const orderedIds = allOrderedComments
.slice((options.page - 1) * limit, currentPage * limit)
.map(comment => comment.id);
const findPageOptions = {
...options,
filter: `id:[${orderedIds.join(',')}]`,
withRelated: options.withRelated
filter: `id:-[${commentsWithLikesIds.join(',')}]`,
withRelated: options.withRelated,
parentId: null
};
const page = await this.models.Comment.findPage(findPageOptions);
page.data = orderedIds
.map(id => page.data.find(comment => comment && comment.id === id))
.filter(comment => comment !== undefined);
// add comments with likes to the beginning of the page
if (options.page === '1') {
const commentsWithLikesModels = await this.models.Comment.findPage({
filter: `id:[${commentsWithLikesIds.join(',')}]`,
withRelated: options.withRelated
});
page.meta.pagination = {
page: currentPage,
limit: limit,
pages: Math.ceil(totalComments / limit),
total: totalComments,
next: currentPage < Math.ceil(totalComments / limit) ? currentPage + 1 : null,
prev: currentPage > 1 ? currentPage - 1 : null
};
// sort commentsWithLikesModels by most likes
commentsWithLikesModels.data.sort((a, b) => {
const aLikes = commentsWithLikes.find(comment => comment.id === a.id).count__likes;
const bLikes = commentsWithLikes.find(comment => comment.id === b.id).count__likes;
if (aLikes > bLikes) {
return -1;
} else if (aLikes < bLikes) {
return 1;
} else {
return 0;
}
});
page.data = commentsWithLikesModels.data.concat(page.data);
}
// override total with totalComments
page.meta.pagination.total = totalComments?.count__comments || 0;
return page;
}

28
ghost/core/test/e2e-api/members-comments/comments.test.js
View file

@ -581,15 +581,13 @@ describe('Comments API', function () {
forEach(new Array(12).fill(0), async (item, index) => {
await dbFns.addComment({
member_id: fixtureManager.get('members', 1).id,
html: `This is comment ${index}`,
created_at: new Date(`2021-01-${index + 1}`)
html: `This is comment ${index}`
});
});
const comment = await dbFns.addComment({
member_id: fixtureManager.get('members', 0).id,
html: 'This is the best comment',
created_at: new Date('2021-01-10')
html: 'This is the best comment'
});
await dbFns.addLike({
@ -606,7 +604,9 @@ describe('Comments API', function () {
.get(`/api/comments/post/${postId}/?limit=5&page=1&order=best`)
.expectStatus(200);
should(data.body.comments.length).eql(5);
// TODO for the first page only we don't fully respect the limit, since we need to get the best comments first
// We need to find a better way to handle this
should(data.body.comments.length).eql(6);
should(data.body.meta.pagination.total).eql(13);
should(data.body.meta.pagination.pages).eql(3);
should(data.body.meta.pagination.next).eql(2);
@ -618,6 +618,7 @@ describe('Comments API', function () {
.get(`/api/comments/post/${postId}/?limit=5&page=2&order=best`)
.expectStatus(200);
should(data2.body.comments.length).eql(5);
should(data2.body.meta.pagination.next).eql(3);
should(data2.body.meta.pagination.prev).eql(1);
@ -634,23 +635,6 @@ describe('Comments API', function () {
should(data3.body.comments.length).eql(0);
});
it('does not most liked comment first when order param and keeps normal order', async function () {
await setupBrowseCommentsData();
const data = await membersAgent
.get(`/api/comments/post/${postId}`);
await dbFns.addLike({
comment_id: data.body.comments[1].id,
member_id: loggedInMember.id
});
const data2 = await membersAgent
.get(`/api/comments/post/${postId}/`)
.expectStatus(200);
should(data2.body.comments[0].id).not.eql(data.body.comments[1].id);
});
it('Can reply to your own comment', async function () {
// Should not update last_seen_at or last_commented_at when both are already set to a value on the same day
const timezone = settingsCache.get('timezone');