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

Merge remote-tracking branch 'upstream/pull/4158'

Browse source
This commit is contained in:
Tom Hughes 2023-08-13 10:00:29 +01:00
commit 6d74aa2873
2 changed files with 57 additions and 7 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_ids(changesets, params["changesets"])
# sort and limit the changesets
changesets = changesets.order("created_at DESC").limit(result_limit)
# sort the changesets
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
@changesets = changesets.preload(:user, :changeset_tags, :comments)

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

@ -1950,23 +1950,58 @@ module Api
get changesets_path
assert_response :success
assert_changesets [changeset5, changeset4, changeset3, changeset2, changeset1]
assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1]
get changesets_path(:limit => "3")
assert_response :success
assert_changesets [changeset5, changeset4, changeset3]
assert_changesets_in_order [changeset5, changeset4, changeset3]
get changesets_path(:limit => "0")
assert_response :bad_request
get changesets_path(:limit => Settings.max_changeset_query_limit)
assert_response :success
assert_changesets [changeset5, changeset4, changeset3, changeset2, changeset1]
assert_changesets_in_order [changeset5, changeset4, changeset3, changeset2, changeset1]
get changesets_path(:limit => Settings.max_changeset_query_limit + 1)
assert_response :bad_request
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
# into query strings
@ -2247,8 +2282,7 @@ module Api
private
##
# boilerplate for checking that certain changesets exist in the
# output.
# check that certain changesets exist in the output
def assert_changesets(changesets)
assert_select "osm>changeset", changesets.size
changesets.each do |changeset|
@ -2256,6 +2290,15 @@ module Api
end
end
##
# check that certain changesets exist in the output in the specified order
def assert_changesets_in_order(changesets)
assert_select "osm>changeset", changesets.size
changesets.each_with_index do |changeset, index|
assert_select "osm>changeset:nth-child(#{index + 1})[id='#{changeset.id}']", 1
end
end
##
# update the changeset_id of a way element
def update_changeset(xml, changeset_id)