github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 22:35:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up valid order names

Browse Source 
Add a sortable mappings list to match other endpoints and so that you
don't have to use database column names.

Example: 'created' => 'created_at'

Also cleaned up some of the logic since a lot of it got moved into the
SORTABLE_MAPPING hash.
This commit is contained in:
Blake Erickson
2017-02-25 11:51:40 -07:00
parent e9d5c3265c
commit 0e6cb752da
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/components/admin_user_index_query_spec.rb
View File

@ -33,12 +33,12 @@ describe AdminUserIndexQuery do
end
it "allows custom ordering for stats wtih default direction" do
query = ::AdminUserIndexQuery.new({ order: "topics_entered" })
query = ::AdminUserIndexQuery.new({ order: "topics_viewed" })
expect(query.find_users_query.to_sql).to match("topics_entered DESC")
end
it "allows custom ordering and direction for stats" do
query = ::AdminUserIndexQuery.new({ order: "topics_entered", ascending: true })
query = ::AdminUserIndexQuery.new({ order: "topics_viewed", ascending: true })
expect(query.find_users_query.to_sql).to match("topics_entered ASC")
end
end
@ -91,7 +91,7 @@ describe AdminUserIndexQuery do
end
it "shows nil values first with asc" do
users = ::AdminUserIndexQuery.new({ order: "last_emailed_at", ascending: true }).find_users
users = ::AdminUserIndexQuery.new({ order: "last_emailed", ascending: true }).find_users
expect(users.count).to eq(2)
expect(users.first.username).to eq("system")
@ -99,7 +99,7 @@ describe AdminUserIndexQuery do
end
it "shows nil values last with desc" do
users = ::AdminUserIndexQuery.new({ order: "last_emailed_at"}).find_users
users = ::AdminUserIndexQuery.new({ order: "last_emailed"}).find_users
expect(users.count).to eq(2)
expect(users.first.last_emailed_at).to_not eq(nil)