Merge branch 'pull/4985'

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 1aac4ebff8e7736117aa0b8d5e9c0911a1a5b13d..0c53f90bdbe2f84f1fc885499fe05cb27bbf4311 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,65 +1,100 @@
-class OldWay < ActiveRecord::Base
-  set_table_name 'ways'
+# == Schema Information
+#
+# Table name: ways
+#
+#  way_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
+#
+#  ways_changeset_id_idx  (changeset_id)
+#  ways_timestamp_idx     (timestamp)
+#
+# Foreign Keys
+#
+#  ways_changeset_id_fkey  (changeset_id => changesets.id)
+#  ways_redaction_id_fkey  (redaction_id => redactions.id)
+#

 
 

-  belongs_to :user
+class OldWay < ApplicationRecord
+  self.table_name = "ways"
+
+  # 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
+  belongs_to :redaction, :optional => true
+  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
+
+  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+
+  validates :changeset, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]

 
   def self.from_way(way)
     old_way = OldWay.new
 
   def self.from_way(way)
     old_way = OldWay.new

-    old_way.user_id = way.user_id
+    old_way.visible = way.visible
+    old_way.changeset_id = way.changeset_id

     old_way.timestamp = way.timestamp
     old_way.timestamp = way.timestamp

-    old_way.id = way.id
-    old_way.segs = way.segs
+    old_way.way_id = way.id
+    old_way.version = way.version
+    old_way.nds = way.nds

     old_way.tags = way.tags
     old_way.tags = way.tags

-    return old_way
+    old_way

   end
 
   end
 

-  def save
-    t = Time.now
-    self.timestamp = t
-    self.save
-    
-    WayTag.delete_all(['id = ?', self.id])
+  def save_with_dependencies!
+    save!

 
 

-    self.tags.each do |k,v|
-      tag = WayTag.new
+    tags.each do |k, v|
+      tag = OldWayTag.new

       tag.k = k
       tag.v = v
       tag.k = k
       tag.v = v

-      tag.id = self.id
-      tag.save
+      tag.way_id = way_id
+      tag.version = version
+      tag.save!

     end
 
     end
 

-    WaySegment.delete_all(['id = ?', self.id])
-    
-    i = 0
-    self.segs.each do |n|
-      seg = WaySegment.new
-      seg.id = self.id
-      seg.segment_id = n
-      seg.sequence_id = i
-      seg.save
-      i += 1
+    sequence = 1
+    nds.each do |n|
+      nd = OldWayNode.new
+      nd.id = [way_id, version, sequence]
+      nd.node_id = n
+      nd.save!
+      sequence += 1

     end
     end

-
-    old_way = OldWay.from_way(self)
-    old_way.save

   end
 
   end
 

-  def segs
-    @segs = Array.new unless @segs
-    @segs
+  def nds
+    @nds ||= old_nodes.order(:sequence_id).collect(&:node_id)

   end
 
   def tags
   end
 
   def tags

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

   end
 
   end
 

-  def segs=(s)
-    @segs = s
+  attr_writer :nds, :tags
+
+  # Temporary method to match interface to ways
+  def way_nodes
+    old_nodes

   end
 
   end
 

-  def tags=(t)
-    @tags = t
+  # Pretend we're not in any relations
+  def containing_relation_members
+    []

   end
 
   end
 

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

 end
 end