FIX: Broken `?status=(listed|unlisted)` query param support (#20834)

In 66c5054, the support for filtering a
topics list based on the visible attribute of a topic via the status query param
was accidentally removed.
This commit is contained in:
Alan Guo Xiang Tan 2023-03-27 07:30:19 +08:00 committed by GitHub
parent c66323f964
commit 56fbdde0e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions

View File

@ -22,6 +22,10 @@ class TopicsFilter
@scope = @scope.where("topics.closed")
when "archived"
@scope = @scope.where("topics.archived")
when "listed"
@scope = @scope.where("topics.visible")
when "unlisted"
@scope = @scope.where("NOT topics.visible")
when "deleted"
if @guardian.can_see_deleted_topics?(@category)
@scope = @scope.unscope(where: :deleted_at).where("topics.deleted_at IS NOT NULL")

View File

@ -17,29 +17,47 @@ RSpec.describe TopicsFilter do
end
context "when filtering by topic's status" do
it "should only return topics that have not been closed or archived when input is `status:open`" do
it "should only return topics that have not been closed or archived when status is `open`" do
expect(
TopicsFilter.new(guardian: Guardian.new).filter(status: "open").pluck(:id),
).to contain_exactly(topic.id)
end
it "should only return topics that have been deleted when input is `status:deleted` and user can see deleted topics" do
it "should only return topics that have been deleted when status is `deleted` and user can see deleted topics" do
expect(
TopicsFilter.new(guardian: Guardian.new(admin)).filter(status: "deleted").pluck(:id),
).to contain_exactly(deleted_topic_id)
end
it "should status filter when input is `status:deleted` and user cannot see deleted topics" do
it "should status filter when status is `deleted` and user cannot see deleted topics" do
expect(
TopicsFilter.new(guardian: Guardian.new).filter(status: "deleted").pluck(:id),
).to contain_exactly(topic.id, closed_topic.id, archived_topic.id)
end
it "should only return topics that have been archived when input is `status:archived`" do
it "should only return topics that have been archived when status is `archived`" do
expect(
TopicsFilter.new(guardian: Guardian.new).filter(status: "archived").pluck(:id),
).to contain_exactly(archived_topic.id)
end
it "should only return topics that are visible when status is `listed`" do
Topic.update_all(visible: false)
topic.update!(visible: true)
expect(
TopicsFilter.new(guardian: Guardian.new).filter(status: "listed").pluck(:id),
).to contain_exactly(topic.id)
end
it "should only return topics that are not visible when status is `unlisted`" do
Topic.update_all(visible: true)
topic.update!(visible: false)
expect(
TopicsFilter.new(guardian: Guardian.new).filter(status: "unlisted").pluck(:id),
).to contain_exactly(topic.id)
end
end
end
end