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

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index 46fb3c06e2ad771a9fd00db2ab618d4e0c453b80..7e9b335861e6f913e5aff61da9147168f6c3ccd9 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -1,30 +1,47 @@
 module ConsistencyValidations
   # Generic checks that are run for the updates and deletes of
 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
   # 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)
   # 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 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::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     elsif new.changeset.nil?

-      raise OSM::APIChangesetMissingError.new
+      raise OSM::APIChangesetMissingError

     elsif new.changeset.user_id != user.id
     elsif new.changeset.user_id != user.id

-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      raise OSM::APIUserChangesetMismatchError
+    elsif !new.changeset.is_open?
+      raise OSM::APIChangesetAlreadyClosedError, new.changeset

     end
   end
     end
   end

-  
+

   # This is similar to above, just some validations don't apply
   def check_create_consistency(new, user)
     if new.changeset.nil?
   # 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
+      raise OSM::APIChangesetMissingError

     elsif new.changeset.user_id != user.id
     elsif new.changeset.user_id != user.id

-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      raise OSM::APIUserChangesetMismatchError
+    elsif !new.changeset.is_open?
+      raise OSM::APIChangesetAlreadyClosedError, new.changeset
+    end
+  end
+
+  ##
+  # subset of consistency checks which should be applied to almost
+  # all the changeset controller's writable methods.
+  def check_changeset_consistency(changeset, user)
+    # check user credentials - only the user who opened a changeset
+    # may alter it.
+    if changeset.nil?
+      raise OSM::APIChangesetMissingError
+    elsif user.id != changeset.user_id
+      raise OSM::APIUserChangesetMismatchError
+    elsif !changeset.is_open?
+      raise OSM::APIChangesetAlreadyClosedError, changeset

     end
   end
 end
     end
   end
 end