From: Anton Khorev Date: Sat, 30 Mar 2024 07:38:57 +0000 (+0300) Subject: Refactor update element consistency check X-Git-Tag: live~699^2~2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/09f6b8348607e709729d9e3c8d2678a668ab50bb Refactor update element consistency check --- diff --git a/app/models/concerns/consistency_validations.rb b/app/models/concerns/consistency_validations.rb index a99896b3c..8b97e2b70 100644 --- a/app/models/concerns/consistency_validations.rb +++ b/app/models/concerns/consistency_validations.rb @@ -12,13 +12,9 @@ module ConsistencyValidations raise OSM::APIPreconditionFailedError, "New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}." elsif new.version != old.version raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version) - elsif new.changeset.nil? - raise OSM::APIChangesetMissingError - elsif new.changeset.user_id != user.id - raise OSM::APIUserChangesetMismatchError - elsif !new.changeset.open? - raise OSM::APIChangesetAlreadyClosedError, new.changeset end + + check_changeset_consistency(new.changeset, user) end # This is similar to above, just some validations don't apply diff --git a/test/models/node_test.rb b/test/models/node_test.rb index dd2411554..664bfb260 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -388,4 +388,51 @@ class NodeTest < ActiveSupport::TestCase node.create_with_history(user) end end + + test "raises id precondition exception when updating" do + user = create(:user) + node = Node.new(:id => 23) + new_node = Node.new(:id => 42) + assert_raises OSM::APIPreconditionFailedError do + node.update_from(new_node, user) + end + end + + test "raises version mismatch exception when updating" do + user = create(:user) + node = Node.new(:id => 42, :version => 7) + new_node = Node.new(:id => 42, :version => 12) + assert_raises OSM::APIVersionMismatchError do + node.update_from(new_node, user) + end + end + + test "raises missing changeset exception when updating" do + user = create(:user) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12) + assert_raises OSM::APIChangesetMissingError do + node.update_from(new_node, user) + end + end + + test "raises user-changeset mismatch exception when updating" do + user = create(:user) + changeset = create(:changeset) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + node.update_from(new_node, user) + end + end + + test "raises already closed changeset exception when updating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + node.update_from(new_node, user) + end + end end diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb index b11bfa904..5d7d0d467 100644 --- a/test/models/relation_test.rb +++ b/test/models/relation_test.rb @@ -276,4 +276,51 @@ class RelationTest < ActiveSupport::TestCase relation.create_with_history(user) end end + + test "raises id precondition exception when updating" do + user = create(:user) + relation = Relation.new(:id => 23) + new_relation = Relation.new(:id => 42) + assert_raises OSM::APIPreconditionFailedError do + relation.update_from(new_relation, user) + end + end + + test "raises version mismatch exception when updating" do + user = create(:user) + relation = Relation.new(:id => 42, :version => 7) + new_relation = Relation.new(:id => 42, :version => 12) + assert_raises OSM::APIVersionMismatchError do + relation.update_from(new_relation, user) + end + end + + test "raises missing changeset exception when updating" do + user = create(:user) + relation = Relation.new(:id => 42, :version => 12) + new_relation = Relation.new(:id => 42, :version => 12) + assert_raises OSM::APIChangesetMissingError do + relation.update_from(new_relation, user) + end + end + + test "raises user-changeset mismatch exception when updating" do + user = create(:user) + changeset = create(:changeset) + relation = Relation.new(:id => 42, :version => 12) + new_relation = Relation.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + relation.update_from(new_relation, user) + end + end + + test "raises already closed changeset exception when updating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + relation = Relation.new(:id => 42, :version => 12) + new_relation = Relation.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + relation.update_from(new_relation, user) + end + end end diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 558984e35..8d662b657 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -243,4 +243,51 @@ class WayTest < ActiveSupport::TestCase way.create_with_history(user) end end + + test "raises id precondition exception when updating" do + user = create(:user) + way = Way.new(:id => 23) + new_way = Way.new(:id => 42) + assert_raises OSM::APIPreconditionFailedError do + way.update_from(new_way, user) + end + end + + test "raises version mismatch exception when updating" do + user = create(:user) + way = Way.new(:id => 42, :version => 7) + new_way = Way.new(:id => 42, :version => 12) + assert_raises OSM::APIVersionMismatchError do + way.update_from(new_way, user) + end + end + + test "raises missing changeset exception when updating" do + user = create(:user) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12) + assert_raises OSM::APIChangesetMissingError do + way.update_from(new_way, user) + end + end + + test "raises user-changeset mismatch exception when updating" do + user = create(:user) + changeset = create(:changeset) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + way.update_from(new_way, user) + end + end + + test "raises already closed changeset exception when updating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + way.update_from(new_way, user) + end + end end