Refactor update element consistency check

[rails.git] / app / models / concerns / consistency_validations.rb

diff --git a/app/models/concerns/consistency_validations.rb b/app/models/concerns/consistency_validations.rb
index 8c89f61de9dfad633a31e65fa8356ad963d75817..8b97e2b70592f4c42f1e67fb14379679bf28ad5f 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -12,24 +12,14 @@ 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)
       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.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, new.changeset

     end
     end

+
+    check_changeset_consistency(new.changeset, user)

   end
 
   # This is similar to above, just some validations don't apply
   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
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError
-    elsif !new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, new.changeset
-    end
+  def check_create_element_consistency(new, user)
+    check_changeset_consistency(new.changeset, user)

   end
 
   ##
   end
 
   ##


@@ -42,7 +32,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError

-    elsif !changeset.is_open?
+    elsif !changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end