Refactor generation of object metadata in API calls

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 390c142dbc1b940773b8185b8e352f94f6b2dfe0..25f44d8325ce36eaf1b6cdf5e708fea45ee97483 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,5 +1,6 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
+  include ObjectMetadata
   
   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
@@ -12,7 +13,7 @@ class OldRelation < ActiveRecord::Base
   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
@@ -93,20 +94,11 @@ 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
-    
-    el1['redacted'] = self.redaction.id.to_s if self.redacted?
-    
+    add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
+
     self.old_members.each do |member|
       e = XML::Node.new 'member'
       e['type'] = member.member_type.to_s.downcase