Merge branch 'pull/3472'

diff --combined .rubocop_todo.yml
index 779b3a8fa29a8c52332618b9a8b9be81d27aee08,2527192f9bcf970f4a6bd5c83d82ee9700dd0075..b8e782553aebb0159ceb2ef3a06abe29e57b3c77
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -1,6 -1,6 +1,6 @@@
  # This configuration was generated by
  # `rubocop --auto-gen-config`
- # on 2021-12-28 19:44:27 UTC using RuboCop version 1.24.0.
+ # on 2022-02-23 19:11:04 UTC using RuboCop version 1.25.1.
  # The point is for the user to remove these configuration records
  # one by one as the offenses are removed from the code base.
  # Note that changes in the inspected code, or installation of new
@@@ -14,7 -14,7 +14,7 @@@ require
    - rubocop-rails
    - rubocop-rake
  
- # Offense count: 544
+ # Offense count: 550
  # Cop supports --auto-correct.
  # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
  # URISchemes: http, https
@@@ -63,12 -63,12 +63,12 @@@ Lint/DuplicateBranch
      - 'app/controllers/geocoder_controller.rb'
      - 'app/helpers/browse_tags_helper.rb'
  
- # Offense count: 663
+ # Offense count: 665
  # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
  Metrics/AbcSize:
    Max: 189
  
- # Offense count: 72
+ # Offense count: 73
  # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
  # IgnoredMethods: refine
  Metrics/BlockLength:
@@@ -84,12 -84,12 +84,12 @@@ Metrics/BlockNesting
  Metrics/ClassLength:
    Max: 313
  
- # Offense count: 57
+ # Offense count: 58
  # Configuration parameters: IgnoredMethods.
  Metrics/CyclomaticComplexity:
    Max: 25
  
- # Offense count: 739
+ # Offense count: 742
  # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
  Metrics/MethodLength:
    Max: 179
@@@ -104,7 -104,7 +104,7 @@@ Metrics/ParameterLists
  Metrics/PerceivedComplexity:
    Max: 26
  
- # Offense count: 549
+ # Offense count: 550
  Minitest/MultipleAssertions:
    Max: 52
  
@@@ -155,7 -155,20 +155,20 @@@ Rails/HelperInstanceVariable
    Exclude:
      - 'app/helpers/title_helper.rb'
  
- # Offense count: 1
+ # Offense count: 16
+ # Configuration parameters: IgnoreScopes, Include.
+ # Include: app/models/**/*.rb
+ Rails/InverseOf:
+   Exclude:
+     - 'app/models/changeset.rb'
+     - 'app/models/diary_entry.rb'
+     - 'app/models/friendship.rb'
+     - 'app/models/issue.rb'
+     - 'app/models/message.rb'
+     - 'app/models/note.rb'
+     - 'app/models/user.rb'
+ 
+ # Offense count: 2
  # Configuration parameters: Include.
  # Include: app/controllers/**/*.rb
  Rails/LexicallyScopedActionFilter:
@@@ -183,6 -196,18 +196,6 @@@ Rails/OutputSafety
      - 'lib/rich_text.rb'
      - 'test/helpers/application_helper_test.rb'
  
 -# Offense count: 26
 -# Cop supports --auto-correct.
 -Rails/RedundantPresenceValidationOnBelongsTo:
 -  Enabled: false
 -
 -# Offense count: 90
 -# Cop supports --auto-correct.
 -# Configuration parameters: EnforcedStyle.
 -# SupportedStyles: strict, flexible
 -Rails/TimeZone:
 -  Enabled: false
 -
  # Offense count: 6
  # Cop supports --auto-correct.
  Rake/Desc:
@@@ -192,7 -217,7 +205,7 @@@
      - 'lib/tasks/subscribe_diary_authors.rake'
      - 'lib/tasks/subscribe_old_changesets.rake'
  
- # Offense count: 609
+ # Offense count: 617
  # Cop supports --auto-correct.
  # Configuration parameters: EnforcedStyle.
  # SupportedStyles: always, always_true, never

diff --combined app/models/node.rb
index c2443974d822474f84917330a508a82d94fa1ba9,f6f0f258e4d3e9ef7eb10324cdd72858b7e3c4cd..ad4318487b722839771e0a94b9cfc62561a966bd
--- 1/app/models/node.rb
--- 2/app/models/node.rb
+++ b/app/models/node.rb
@@@ -32,7 -32,7 +32,7 @@@ class Node < ApplicationRecor
  
    belongs_to :changeset
  
-   has_many :old_nodes, -> { order(:version) }
+   has_many :old_nodes, -> { order(:version) }, :inverse_of => :current_node
  
    has_many :way_nodes
    has_many :ways, :through => :way_nodes
@@@ -49,6 -49,8 +49,6 @@@
                   :numericality => { :on => :update, :only_integer => true }
    validates :version, :presence => true,
                        :numericality => { :only_integer => true }
 -  validates :changeset_id, :presence => true,
 -                           :numericality => { :only_integer => true }
    validates :latitude, :presence => true,
                         :numericality => { :only_integer => true }
    validates :longitude, :presence => true,
@@@ -236,7 -238,7 +236,7 @@@
    private
  
    def save_with_history!
 -    t = Time.now.getutc
 +    t = Time.now.utc
  
      self.version += 1
      self.timestamp = t

diff --combined app/models/note.rb
index aeea0de0d8103224c64be540ef3ef6e1eb91415d,24ba6854dea3ec7efb646fca01b267dc4d33b14e..8c61374790af4cf2b65c8099d544753136e9b995
--- 1/app/models/note.rb
--- 2/app/models/note.rb
+++ b/app/models/note.rb
@@@ -22,7 -22,7 +22,7 @@@ class Note < ApplicationRecor
    include GeoRecord
  
    has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
-   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
+   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note
  
    validates :id, :uniqueness => true, :presence => { :on => :update },
                   :numericality => { :on => :update, :only_integer => true }
@@@ -45,7 -45,7 +45,7 @@@
    # Close a note
    def close
      self.status = "closed"
 -    self.closed_at = Time.now.getutc
 +    self.closed_at = Time.now.utc
      save
    end
  

diff --combined app/models/old_node.rb
index 979f7cb6b25edcbd8fcf6174071b639c2f9f5980,1324c8139bc933bd05589fadc91ba883c8a3270a..4f5f074abf4b65600db82cc9de719bf736f30494
--- 1/app/models/old_node.rb
--- 2/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@@ -35,7 -35,7 +35,7 @@@ class OldNode < ApplicationRecor
    # the queries generated by Redactable will use the wrong table name.
    include Redactable
  
 -  validates :changeset, :presence => true, :associated => true
 +  validates :changeset, :associated => true
    validates :latitude, :presence => true,
                         :numericality => { :only_integer => true }
    validates :longitude, :presence => true,
@@@ -46,10 -46,10 +46,10 @@@
    validate :validate_position
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
+   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
  
-   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version]
+   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node
  
    def validate_position
      errors.add(:base, "Node is not in the world") unless in_world?

diff --combined app/models/old_node_tag.rb
index ec48c1c0483d51c251bc9d937b68c8a483eeda28,11a2efd5a4b0749c42cea1f6bc67110eee92f0a2..c710e48f133db67436fbe0b86ff9f94ce4c2a9ea
--- 1/app/models/old_node_tag.rb
--- 2/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldNodeTag < ApplicationRecor
    self.table_name = "node_tags"
    self.primary_keys = "node_id", "version", "k"
  
-   belongs_to :old_node, :foreign_key => [:node_id, :version]
+   belongs_to :old_node, :foreign_key => [:node_id, :version], :inverse_of => :old_tags
  
 -  validates :old_node, :presence => true, :associated => true
 +  validates :old_node, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:node_id, :version] }
  end

diff --combined app/models/old_relation.rb
index 39d53518d1273ae5ed1a2732cc2940fab41ea4e9,71bd4b73dad7594acf0c6e8fac5f4b77259c7109..7f9a747e64c84ef99aee35d4f7117056a4ca7ce6
--- 1/app/models/old_relation.rb
--- 2/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@@ -31,13 -31,13 +31,13 @@@ class OldRelation < ApplicationRecor
    include Redactable
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
+   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 :changeset, :presence => true, :associated => true
 +  validates :changeset, :associated => true
    validates :timestamp, :presence => true
    validates :visible, :inclusion => [true, false]
  

diff --combined app/models/old_relation_tag.rb
index 124c89ad51d2a8f941d51e1297cb3b88611ce158,1fccdf7a841a52b559df91e4886b91438b4e4732..c3a1838912cbfb65ccd57492e4c60bfb05214c78
--- 1/app/models/old_relation_tag.rb
--- 2/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldRelationTag < ApplicationRecor
    self.table_name = "relation_tags"
    self.primary_keys = "relation_id", "version", "k"
  
-   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+   belongs_to :old_relation, :foreign_key => [:relation_id, :version], :inverse_of => :old_tags
  
 -  validates :old_relation, :presence => true, :associated => true
 +  validates :old_relation, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:relation_id, :version] }
  end

diff --combined app/models/old_way.rb
index 8052899bf24588fab25a034128c0f510f0b5e035,1f00c46ba6a3fbf8cd279235e873fa5ded52177e..acf88ddcf61bc61fab89f925a40be62f7c48509f
--- 1/app/models/old_way.rb
--- 2/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@@ -31,13 -31,13 +31,13 @@@ class OldWay < ApplicationRecor
    include Redactable
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+   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]
  

diff --combined app/models/old_way_tag.rb
index bbfffc2cbbe03ffc008b8e416bec8ab4fc1310ee,e684199bf4f49873c0960629064b7f1390cd6f47..0342cf34485c165d2f2ec8ecfd9466f855c7a257
--- 1/app/models/old_way_tag.rb
--- 2/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldWayTag < ApplicationRecor
    self.table_name = "way_tags"
    self.primary_keys = "way_id", "version", "k"
  
-   belongs_to :old_way, :foreign_key => [:way_id, :version]
+   belongs_to :old_way, :foreign_key => [:way_id, :version], :inverse_of => :old_tags
  
 -  validates :old_way, :presence => true, :associated => true
 +  validates :old_way, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:way_id, :version] }
  end

diff --combined app/models/relation.rb
index 021082eda01243b73f93320e5e0624876c7b73ae,61ae45c99d24b65512ce480c55b70ad7dc9a81da..0a4a660a6fa536c52a025a4b337c521e85ab59be
--- 1/app/models/relation.rb
--- 2/app/models/relation.rb
+++ b/app/models/relation.rb
@@@ -27,9 -27,9 +27,9 @@@ class Relation < ApplicationRecor
  
    belongs_to :changeset
  
-   has_many :old_relations, -> { order(:version) }
+   has_many :old_relations, -> { order(:version) }, :inverse_of => :current_relation
  
-   has_many :relation_members, -> { order(:sequence_id) }
+   has_many :relation_members, -> { order(:sequence_id) }, :inverse_of => :relation
    has_many :relation_tags
  
    has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
@@@ -39,6 -39,8 +39,6 @@@
                   :numericality => { :on => :update, :only_integer => true }
    validates :version, :presence => true,
                        :numericality => { :only_integer => true }
 -  validates :changeset_id, :presence => true,
 -                           :numericality => { :only_integer => true }
    validates :timestamp, :presence => true
    validates :changeset, :associated => true
    validates :visible, :inclusion => [true, false]
@@@ -263,7 -265,7 +263,7 @@@
    private
  
    def save_with_history!
 -    t = Time.now.getutc
 +    t = Time.now.utc
  
      self.version += 1
      self.timestamp = t

diff --combined app/models/way.rb
index 08dc5ed305142ab5a45b4625839ab7ebbbf7ef24,0c6e645b7e2ce40f89bf81ca2002a5c056550cf2..b11c225ddb1cfd0a6fb604174d4e39354eab0276
--- 1/app/models/way.rb
--- 2/app/models/way.rb
+++ b/app/models/way.rb
@@@ -27,9 -27,9 +27,9 @@@ class Way < ApplicationRecor
  
    belongs_to :changeset
  
-   has_many :old_ways, -> { order(:version) }
+   has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way
  
-   has_many :way_nodes, -> { order(:sequence_id) }
+   has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way
    has_many :nodes, :through => :way_nodes
  
    has_many :way_tags
@@@ -41,6 -41,8 +41,6 @@@
                   :numericality => { :on => :update, :only_integer => true }
    validates :version, :presence => true,
                        :numericality => { :only_integer => true }
 -  validates :changeset_id, :presence => true,
 -                           :numericality => { :only_integer => true }
    validates :timestamp, :presence => true
    validates :changeset, :associated => true
    validates :visible, :inclusion => [true, false]
@@@ -227,7 -229,7 +227,7 @@@
    private
  
    def save_with_history!
 -    t = Time.now.getutc
 +    t = Time.now.utc
  
      self.version += 1
      self.timestamp = t