Fix the data config, so that the development database is not the same as the test...

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index eb3b06a130bc1a22c0f27170aabb0d2dc21c6c0b..658cf06f379e72d63e98045131884047ddc0fe1e 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -3,7 +3,7 @@ class Relation < ActiveRecord::Base
   
   set_table_name 'current_relations'
 
-  belongs_to :user
+  belongs_to :changeset
 
   has_many :old_relations, :foreign_key => 'id', :order => 'version'
 
@@ -35,13 +35,14 @@ class Relation < ActiveRecord::Base
     end
 
     relation.version = pt['version']
+    relation.changeset_id = pt['changeset']
 
     if create
       relation.timestamp = Time.now
       relation.visible = true
     else
       if pt['timestamp']
-       relation.timestamp = Time.parse(pt['timestamp'])
+        relation.timestamp = Time.parse(pt['timestamp'])
       end
     end
 
@@ -68,18 +69,19 @@ class Relation < ActiveRecord::Base
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
 
     user_display_name_cache = {} if user_display_name_cache.nil?
     
-    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
+    if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
       # use the cache if available
     elsif self.user.data_public?
-      user_display_name_cache[self.user_id] = self.user.display_name
+      user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
     else
-      user_display_name_cache[self.user_id] = nil
+      user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
+    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
 
     self.relation_members.each do |member|
       p=0
@@ -112,6 +114,36 @@ class Relation < ActiveRecord::Base
     return el1
   end 
 
+  def self.find_for_nodes(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'node' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+
+  def self.find_for_ways(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'way' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+
+  def self.find_for_relations(ids, options = {})
+    if ids.empty?
+      return []
+    else
+      self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'relation' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+        return self.find(:all, options)
+      end
+    end
+  end
+
   # FIXME is this really needed?
   def members
     unless @members
@@ -188,13 +220,14 @@ class Relation < ActiveRecord::Base
   def delete_with_history(user)
     if self.visible
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", self.id ])
-       raise OSM::APIPreconditionFailedError.new
+        raise OSM::APIPreconditionFailedError.new
       else
-       self.user_id = user.id
-       self.tags = []
-       self.members = []
-       self.visible = false
-       save_with_history!
+        #self.user_id = user.id
+        # FIXME we need to deal with changeset here, which is probably already dealt with
+        self.tags = []
+        self.members = []
+        self.visible = false
+        save_with_history!
       end
     else
       raise OSM::APIAlreadyDeletedError.new
@@ -206,8 +239,14 @@ class Relation < ActiveRecord::Base
       raise OSM::APIPreconditionFailedError.new
     elsif new_relation.version != version
       raise OSM::APIVersionMismatchError.new(new_relation.version, version)
+    elsif new_relation.changeset.user_id != user.id
+      raise OSM::APIUserChangesetMismatchError.new
+    elsif not new_relation.changeset.open?
+      raise OSM::APIChangesetAlreadyClosedError.new
     else
-      self.user_id = user.id
+      # FIXME need to deal with changeset etc
+      #self.user_id = user.id
+      self.changeset = new_relation.changeset
       self.tags = new_relation.tags
       self.members = new_relation.members
       self.visible = true