Updated JSON response format per feedback

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index deba6ecb6014a250d456a2e8645fc216de3053f5..51aeb9c4c533f296eaa5a1eaa7a113cca93b46e9 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,11 +1,33 @@
-class OldRelation < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: relations
+#
+#  relation_id  :bigint(8)        default(0), 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

   include ConsistencyValidations
   include ObjectMetadata
 
   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
 
   include ConsistencyValidations
   include ObjectMetadata
 
   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
 
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 


@@ -16,7 +38,9 @@ class OldRelation < ActiveRecord::Base
   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
 
   def self.from_relation(relation)
     old_relation = OldRelation.new


@@ -59,12 +83,10 @@ class OldRelation < ActiveRecord::Base
   end
 
   def tags
   end
 
   def tags

-    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h

   end
 
   end
 

-  attr_writer :members
-
-  attr_writer :tags
+  attr_writer :members, :tags

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


@@ -91,11 +113,6 @@ class OldRelation < ActiveRecord::Base
     el
   end
 
     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
   # Temporary method to match interface to relations
   def relation_members
     old_members