X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8ee1351049ef1bb4d7b50d071b2a96154266d1d..39c3fa427ea273e9011c380f9d2f2a9759cddb24:/lib/consistency_validations.rb?ds=sidebyside diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb index 4f3881542..0d17d2830 100644 --- a/lib/consistency_validations.rb +++ b/lib/consistency_validations.rb @@ -1,29 +1,31 @@ module ConsistencyValidations # Generic checks that are run for the updates and deletes of - # node, ways and relations. This code is here to avoid duplication, + # node, ways and relations. This code is here to avoid duplication, # and allow the extention of the checks without having to modify the - # code in 6 places for all the updates and deletes. Some of these tests are - # needed for creates, but are currently not run :-( + # code in 6 places for all the updates and deletes. Some of these tests are + # needed for creates, but are currently not run :-( # This will throw an exception if there is an inconsistency def check_consistency(old, new, user) - if new.version != old.version + if new.id != old.id || new.id.nil? || old.id.nil? + raise OSM::APIPreconditionFailedError.new("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.new elsif new.changeset.user_id != user.id raise OSM::APIUserChangesetMismatchError.new - elsif not new.changeset.is_open? + elsif !new.changeset.is_open? raise OSM::APIChangesetAlreadyClosedError.new(new.changeset) end end - + # This is similar to above, just some validations don't apply def check_create_consistency(new, user) if new.changeset.nil? raise OSM::APIChangesetMissingError.new elsif new.changeset.user_id != user.id raise OSM::APIUserChangesetMismatchError.new - elsif not new.changeset.is_open? + elsif !new.changeset.is_open? raise OSM::APIChangesetAlreadyClosedError.new(new.changeset) end end @@ -36,9 +38,9 @@ module ConsistencyValidations # may alter it. if changeset.nil? raise OSM::APIChangesetMissingError.new - elsif user.id != changeset.user_id + elsif user.id != changeset.user_id raise OSM::APIUserChangesetMismatchError.new - elsif not changeset.is_open? + elsif !changeset.is_open? raise OSM::APIChangesetAlreadyClosedError.new(changeset) end end