X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67dd9e4c9d487bdb5f38a09dc0c99def4989326e..559a822f59f54f74e9117882e9576ed4ad2c973f:/app/models/old_relation.rb?ds=sidebyside

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e4be8fc7f..890ba1eed 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,15 +1,18 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
-  include Redactable
   
   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
 
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
   belongs_to :changeset
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 
-  has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version]
   has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
   
   validates_associated :changeset
@@ -90,17 +93,36 @@ class OldRelation < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
@@ -109,13 +131,14 @@ class OldRelation < ActiveRecord::Base
       e['role'] = member.member_role.to_s
       el1 << e
     end
- 
+    
     self.old_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
       e['v'] = tag.v
       el1 << e
     end
+
     return el1
   end