X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5652e9f6b95c1e44db597c0136a985aef5e28ad5..377391e8bb4294a539d5363a20af51243877243c:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 9acf8665d..0c53f90bd 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -2,7 +2,7 @@
 #
 # Table name: ways
 #
-#  way_id       :bigint(8)        default(0), not null, primary key
+#  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
@@ -21,23 +21,20 @@
 #
 
 class OldWay < ApplicationRecord
-  include ConsistencyValidations
-
   self.table_name = "ways"
-  self.primary_keys = "way_id", "version"
 
   # 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
-  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+  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]
-  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
+  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, :presence => true, :associated => true
+  validates :changeset, :associated => true
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
@@ -80,7 +77,7 @@ class OldWay < ApplicationRecord
   end
 
   def tags
-    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :nds, :tags
@@ -97,7 +94,7 @@ class OldWay < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
-  def is_latest_version?
+  def latest_version?
     current_way.version == version
   end
 end