mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 22:01:14 +08:00
FIX: We don't create a Post object if the queued post gets rejected. We need to count review items directly. (#9856)
This commit is contained in:
@ -1115,10 +1115,9 @@ class User < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def number_of_rejected_posts
|
def number_of_rejected_posts
|
||||||
Post.with_deleted
|
ReviewableQueuedPost
|
||||||
.where(user_id: self.id)
|
.where(status: Reviewable.statuses[:rejected])
|
||||||
.joins('INNER JOIN reviewables r ON posts.id = r.target_id')
|
.where(created_by_id: self.id)
|
||||||
.where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
|
|
||||||
.count
|
.count
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1578,20 +1578,15 @@ describe User do
|
|||||||
|
|
||||||
describe '#number_of_rejected_posts' do
|
describe '#number_of_rejected_posts' do
|
||||||
it 'counts rejected posts' do
|
it 'counts rejected posts' do
|
||||||
post = Fabricate(:post, user: user)
|
Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
|
||||||
|
|
||||||
Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
|
|
||||||
|
|
||||||
expect(user.number_of_rejected_posts).to eq(1)
|
expect(user.number_of_rejected_posts).to eq(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'ignore non-rejected posts' do
|
it 'ignore non-rejected posts' do
|
||||||
post = Fabricate(:post, user: user)
|
Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
|
||||||
|
|
||||||
Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
|
|
||||||
|
|
||||||
expect(user.number_of_rejected_posts).to eq(0)
|
expect(user.number_of_rejected_posts).to eq(0)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user