Potlatch for API 0.6 now saving ways happily with node versioning... I think

[rails.git] / app / models / changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index a65e3aebcfa4635dca8f257dc7d3f67c6596a0cc..0b214fe720a65ad42677285defbd021b51658a39 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -12,8 +12,15 @@ class Changeset < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
   
-  validates_presence_of :user_id, :created_at, :closed_at
-  
+  validates_presence_of :id, :on => :update
+  validates_presence_of :user_id, :created_at, :closed_at, :num_changes
+  validates_uniqueness_of :id
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
+  validates_numericality_of :user_id,  :integer_only => true
+  validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+  validates_associated :user
+
   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
 
@@ -22,10 +29,13 @@ class Changeset < ActiveRecord::Base
 
   # maximum time a changeset is allowed to be open for (note that this
   # is in days - so one hour is Rational(1,24)).
-  MAX_TIME_OPEN = 1
+  MAX_TIME_OPEN = 1.day
 
   # idle timeout increment, one hour as a rational number of days.
-  IDLE_TIMEOUT = 1.hour #Rational(1,24)
+  # NOTE: DO NOT CHANGE THIS TO 1.hour! when this was done the idle
+  # timeout changed to 1 second, which meant all changesets closed 
+  # almost immediately.
+  IDLE_TIMEOUT = 1.hour # Rational(1,24)
 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 
@@ -40,7 +50,9 @@ class Changeset < ActiveRecord::Base
   end
 
   def set_closed_time_now
-    closed_at = DateTime.now
+    unless is_open?
+      self.closed_at = DateTime.now
+    end
   end
   
   def self.from_xml(xml, create=false)
@@ -219,7 +231,7 @@ class Changeset < ActiveRecord::Base
     
     # can't change a closed changeset
     unless is_open?
-      raise OSM::APIChangesetAlreadyClosedError
+      raise OSM::APIChangesetAlreadyClosedError.new(self)
     end
 
     # copy the other's tags