cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add order parameter to changeset query api entry point

Browse source
This commit is contained in:
Anton Khorev 2023-08-12 03:57:48 +03:00
parent abdce62a03
commit 0abab48f5d
2 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/api/changesets_controller.rb
View file

@ -170,8 +170,15 @@ module Api
changesets = conditions_closed(changesets, params["closed"]) changesets = conditions_closed(changesets, params["closed"])
changesets = conditions_ids(changesets, params["changesets"]) changesets = conditions_ids(changesets, params["changesets"])
# sort and limit the changesets # sort the changesets
changesets = changesets.order("created_at DESC").limit(result_limit) changesets = if params[:order] == "oldest"
changesets.order("created_at ASC")
else
changesets.order("created_at DESC")
end
# limit the result
changesets = changesets.limit(result_limit)
# preload users, tags and comments, and render result # preload users, tags and comments, and render result
@changesets = changesets.preload(:user, :changeset_tags, :comments) @changesets = changesets.preload(:user, :changeset_tags, :comments)

35
test/controllers/api/changesets_controller_test.rb
View file

@ -1967,6 +1967,41 @@ module Api
assert_response :bad_request assert_response :bad_request
end end
##
# test the query functionality of changesets with the order parameter
def test_query_order
user = create(:user)
changeset1 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 1, 1, 0, 0, 0), :closed_at => Time.utc(2008, 1, 2, 0, 0, 0))
changeset2 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 2, 1, 0, 0, 0), :closed_at => Time.utc(2008, 2, 2, 0, 0, 0))
changeset3 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 3, 1, 0, 0, 0), :closed_at => Time.utc(2008, 3, 2, 0, 0, 0))
changeset4 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 4, 1, 0, 0, 0), :closed_at => Time.utc(2008, 4, 2, 0, 0, 0))
changeset5 = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 5, 1, 0, 0, 0), :closed_at => Time.utc(2008, 5, 2, 0, 0, 0))
get changesets_path(:order => "oldest")
assert_response :success
assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4, changeset5]
get changesets_path(:order => "oldest", :time => "2008-01-01T00:00Z,2018-01-01T00:00Z")
assert_response :success
assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4, changeset5]
get changesets_path(:order => "oldest", :time => "2008-01-02T00:00Z,2018-01-01T00:00Z")
assert_response :success
assert_changesets_in_order [changeset1, changeset2, changeset3, changeset4, changeset5]
get changesets_path(:order => "oldest", :time => "2008-01-02T00:01Z,2018-01-01T00:00Z")
assert_response :success
assert_changesets_in_order [changeset2, changeset3, changeset4, changeset5]
get changesets_path(:order => "oldest", :time => "2008-04-01T00:00Z,2018-01-01T00:00Z")
assert_response :success
assert_changesets_in_order [changeset4, changeset5]
get changesets_path(:order => "oldest", :time => "2008-06-01T00:00Z,2018-01-01T00:00Z")
assert_response :success
assert_changesets_in_order []
end
## ##
# check that errors are returned if garbage is inserted # check that errors are returned if garbage is inserted
# into query strings # into query strings