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

Declare api relation relations as nested resources

Browse source
This commit is contained in:
Anton Khorev 2025-02-02 14:27:20 +03:00
parent 2a38dca0b7
commit f696b5439e
10 changed files with 108 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

69
test/controllers/api/relations/relations_controller_test.rb Normal file
View file

@ -0,0 +1,69 @@
require "test_helper"
module Api
module Relations
class RelationsControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/api/0.6/relation/1/relations", :method => :get },
{ :controller => "api/relations/relations", :action => "index", :relation_id => "1" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/relations.json", :method => :get },
{ :controller => "api/relations/relations", :action => "index", :relation_id => "1", :format => "json" }
)
end
def test_index
relation = create(:relation)
# should include relations with that relation as a member
relation_with_relation = create(:relation_member, :member => relation).relation
# should ignore any relation without that relation as a member
_relation_without_relation = create(:relation_member).relation
# should ignore relations with the relation involved indirectly, via a relation
second_relation = create(:relation_member, :member => relation).relation
_super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => relation, :relation => relation_with_relation)
# should not include deleted relations
deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => relation, :relation => deleted_relation)
get api_relation_relations_path(relation)
assert_response :success
# count one osm element
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
# we should have only the expected number of relations
expected_relations = [relation_with_relation, second_relation]
assert_select "osm>relation", expected_relations.size
# and each of them should contain the element we originally searched for
expected_relations.each do |containing_relation|
# The relation should appear once, but the element could appear multiple times
assert_select "osm>relation[id='#{containing_relation.id}']", 1
assert_select "osm>relation[id='#{containing_relation.id}']>member[type='relation'][ref='#{relation.id}']"
end
end
def test_index_json
relation = create(:relation)
containing_relation = create(:relation_member, :member => relation).relation
get api_relation_relations_path(relation, :format => "json")
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["elements"].count
js_relations = js["elements"].filter { |e| e["type"] == "relation" }
assert_equal 1, js_relations.count
assert_equal containing_relation.id, js_relations[0]["id"]
end
end
end
end

28
test/controllers/api/relations_controller_test.rb
View file

@ -42,15 +42,6 @@ module Api
{ :controller => "api/relations", :action => "destroy", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/relations", :method => :get },
{ :controller => "api/relations", :action => "relations_for_relation", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/relations.json", :method => :get },
{ :controller => "api/relations", :action => "relations_for_relation", :id => "1", :format => "json" }
)
assert_recognizes(
{ :controller => "api/relations", :action => "create" },
{ :path => "/api/0.6/relation/create", :method => :put }
@ -212,25 +203,6 @@ module Api
assert_equal node.id, js_nodes[0]["id"]
end
def test_relations_for_relation
relation = create(:relation)
# should include relations with that relation as a member
relation_with_relation = create(:relation_member, :member => relation).relation
# should ignore any relation without that relation as a member
_relation_without_relation = create(:relation_member).relation
# should ignore relations with the relation involved indirectly, via a relation
second_relation = create(:relation_member, :member => relation).relation
_super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => relation, :relation => relation_with_relation)
# should not include deleted relations
deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => relation, :relation => deleted_relation)
check_relations_for_element(relation_relations_path(relation), "relation",
relation.id,
[relation_with_relation, second_relation])
end
# -------------------------------------
# Test simple relation creation.
# -------------------------------------