Avoid using or comparing explicit model ids

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 890ba1eed61779325664b1dd65745b83d1f84665..0e85122a48b67bba0954e047a95065f7fdb7dceb 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,6 +1,7 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations

-  
+  include ObjectMetadata
+

   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
 
   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
 


@@ -12,10 +13,12 @@ class OldRelation < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_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
+  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 :changeset, :presence => true, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]

 
   def self.from_relation(relation)
     old_relation = OldRelation.new
 
   def self.from_relation(relation)
     old_relation = OldRelation.new


@@ -26,31 +29,24 @@ class OldRelation < ActiveRecord::Base
     old_relation.version = relation.version
     old_relation.members = relation.members
     old_relation.tags = relation.tags
     old_relation.version = relation.version
     old_relation.members = relation.members
     old_relation.tags = relation.tags

-    return old_relation
+    old_relation

   end
 
   def save_with_dependencies!
   end
 
   def save_with_dependencies!

-
-    # see comment in old_way.rb ;-)

     save!
     save!

-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldRelation.where(:relation_id => self.relation_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on

 
 

-    self.tags.each do |k,v|
+    tags.each do |k, v|

       tag = OldRelationTag.new
       tag.k = k
       tag.v = v
       tag = OldRelationTag.new
       tag.k = k
       tag.v = v

-      tag.relation_id = self.relation_id
-      tag.version = self.version
+      tag.relation_id = relation_id
+      tag.version = version

       tag.save!
     end
 
       tag.save!
     end
 

-    self.members.each_with_index do |m,i|
+    members.each_with_index do |m, i|

       member = OldRelationMember.new
       member = OldRelationMember.new

-      member.id = [self.relation_id, self.version, i]
+      member.id = [relation_id, version, i]

       member.member_type = m[0].classify
       member.member_id = m[1]
       member.member_role = m[2]
       member.member_type = m[0].classify
       member.member_id = m[1]
       member.member_role = m[2]


@@ -59,107 +55,57 @@ class OldRelation < ActiveRecord::Base
   end
 
   def members
   end
 
   def members

-    unless @members
-      @members = Array.new
-      OldRelationMember.where(:relation_id => self.relation_id, :version => self.version).order(:sequence_id).each do |m|
-        @members += [[m.type,m.id,m.role]]
-      end
+    @members ||= old_members.collect do |member|
+      [member.member_type, member.member_id, member.member_role]

     end
     end

-    @members

   end
 
   def tags
   end
 
   def tags

-    unless @tags
-      @tags = Hash.new
-      OldRelationTag.where(:relation_id => self.relation_id, :version => self.version).each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]

   end
 
   end
 

-  def members=(s)
-    @members = s
-  end
+  attr_writer :members

 
 

-  def tags=(t)
-    @tags = t
-  end
+  attr_writer :tags

 
   def to_xml
     doc = OSM::API.new.get_xml_doc
 
   def to_xml
     doc = OSM::API.new.get_xml_doc

-    doc.root << to_xml_node()
-    return doc
+    doc.root << to_xml_node
+    doc

   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
   end
 
   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
-    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]
+    el = XML::Node.new "relation"
+    el["id"] = relation_id.to_s

 
 

-    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
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)

 
 

-    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'
-      e['type'] = member.member_type.to_s.downcase
-      e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
-      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
+    old_members.each do |member|
+      member_el = XML::Node.new "member"
+      member_el["type"] = member.member_type.to_s.downcase
+      member_el["ref"] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
+      member_el["role"] = member.member_role.to_s
+      el << member_el

     end
 
     end
 

-    return el1
-  end
+    add_tags_to_xml_node(el, old_tags)

 
 

-  # Temporary method to match interface to nodes
-  def tags_as_hash
-    return self.tags
+    el

   end
 
   # Temporary method to match interface to relations
   def relation_members
   end
 
   # Temporary method to match interface to relations
   def relation_members

-    return self.old_members
+    old_members

   end
 
   # Pretend we're not in any relations
   def containing_relation_members
   end
 
   # Pretend we're not in any relations
   def containing_relation_members

-    return []
+    []

   end
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
   def is_latest_version?
   end
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
   def is_latest_version?

-    current_relation.version == self.version
+    current_relation.version == version

   end
 end
   end
 end