X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..0888f43d7b5a5e23874ff1a291049b90481d1273:/app/models/old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 8e0727743..3470561ce 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,3 +1,25 @@
+# == Schema Information
+#
+# Table name: relations
+#
+#  relation_id  :integer          default(0), not null, primary key
+#  changeset_id :integer          not null
+#  timestamp    :datetime         not null
+#  version      :integer          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 < ActiveRecord::Base
   include ConsistencyValidations
   include ObjectMetadata
@@ -13,10 +35,12 @@ class OldRelation < ActiveRecord::Base
   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]
+  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
+  validates :changeset, :presence => true, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]
 
   def self.from_relation(relation)
     old_relation = OldRelation.new
@@ -73,16 +97,16 @@ class OldRelation < ActiveRecord::Base
   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new 'relation'
-    el['id'] = relation_id.to_s
+    el = XML::Node.new "relation"
+    el["id"] = relation_id.to_s
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
     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
+      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
 
@@ -91,11 +115,6 @@ class OldRelation < ActiveRecord::Base
     el
   end
 
-  # Temporary method to match interface to nodes
-  def tags_as_hash
-    tags
-  end
-
   # Temporary method to match interface to relations
   def relation_members
     old_members