Merge remote-tracking branch 'upstream/pull/5410'

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 86c4784c4b9c144a094b12f521b43c9ff1baf4d7..9f551d839fc2c57be000f37f67ccd952ec9a313c 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,22 +1,42 @@
-class OldRelation < ActiveRecord::Base
-  include ConsistencyValidations
-  include ObjectMetadata
-
+# == Schema Information
+#
+# Table name: relations
+#
+#  relation_id  :bigint(8)        not null, primary key
+#  changeset_id :bigint(8)        not null
+#  timestamp    :datetime         not null
+#  version      :bigint(8)        not null, primary key
+#  visible      :boolean          default(TRUE), not null
+#  redaction_id :integer
+#
+# Indexes
+#
+#  relations_changeset_id_idx  (changeset_id)
+#  relations_timestamp_idx     (timestamp)
+#
+# Foreign Keys
+#
+#  relations_changeset_id_fkey  (changeset_id => changesets.id)
+#  relations_redaction_id_fkey  (redaction_id => redactions.id)
+#
+
+class OldRelation < ApplicationRecord

   self.table_name = "relations"
   self.table_name = "relations"

-  self.primary_keys = "relation_id", "version"

 
 

-  # note this needs to be included after the table name changes, or
+  # 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
   # 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"
+  belongs_to :redaction, :optional => true
+  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations

 
 

-  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]
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
+  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation

 
 

-  validates_associated :changeset
+  validates :changeset, :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


@@ -27,24 +47,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!
     save!
 
   end
 
   def save_with_dependencies!
     save!
 

-    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]


@@ -53,66 +73,30 @@ class OldRelation < ActiveRecord::Base
   end
 
   def members
   end
 
   def members

-    @members ||= self.old_members.collect do |member|
+    @members ||= old_members.collect do |member|

       [member.member_type, member.member_id, member.member_role]
     end
   end
 
   def tags
       [member.member_type, member.member_id, member.member_role]
     end
   end
 
   def tags

-    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
-  end
-
-  def members=(s)
-    @members = s
-  end
-
-  def tags=(t)
-    @tags = t
-  end
-
-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node()
-    return doc
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }

   end
 
   end
 

-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new 'relation'
-    el['id'] = self.relation_id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    self.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
-
-    add_tags_to_xml_node(el, self.old_tags)
-
-    return el
-  end
-
-  # Temporary method to match interface to nodes
-  def tags_as_hash
-    return self.tags
-  end
+  attr_writer :members, :tags

 
   # Temporary method to match interface to relations
   def relation_members
 
   # 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.
   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
+  def latest_version?
+    current_relation.version == version

   end
 end
   end
 end