Remove redundant presence validation on belongs_to

There's no need for us to have it when rails does this for us.

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8c0827ab7d357f1bc2548d8200f27b2cc47a741a..0cdd004a0834e24d826760f31acbd68dd2c959e0 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -183,11 +183,6 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 23
-# Cop supports --auto-correct.
-Rails/RedundantPresenceValidationOnBelongsTo:
-  Enabled: false
-

 # Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index aa674ea7fc5391ec781119e20f07d5bcef478332..9ed22ee947c5cea350855a83c9280131614ebcf0 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -44,8 +44,6 @@ class Changeset < ApplicationRecord
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :user_id, :presence => true,
-                      :numericality => { :only_integer => true }

   validates :num_changes, :presence => true,
                           :numericality => { :only_integer => true,
                                              :greater_than_or_equal_to => 0 }
   validates :num_changes, :presence => true,
                           :numericality => { :only_integer => true,
                                              :greater_than_or_equal_to => 0 }

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index ceb7d35597f75e816811214fbfa252eddd7470d0..1b78f98e8d2da289ddefa3c25262ffc70e790af3 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -25,8 +25,8 @@ class ChangesetComment < ApplicationRecord
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :changeset, :presence => true, :associated => true
-  validates :author, :presence => true, :associated => true
+  validates :changeset, :associated => true
+  validates :author, :associated => true

   validates :visible, :inclusion => [true, false]
   validates :body, :characters => true
 
   validates :visible, :inclusion => [true, false]
   validates :body, :characters => true
 

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 600ace4a6e498affc37cce96160289753fbd880e..672e6f76ca90c1e6cbdeebeb51d57174e68be239 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -20,7 +20,7 @@ class ChangesetTag < ApplicationRecord
 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :changeset_id }
 end
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :changeset_id }
 end

diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb
index 69aa8bde931b398ff18e134412ba3886a259849f..07647d67946f221564dc7667065ee8f737c99aa0 100644 (file)
--- a/app/models/issue_comment.rb
+++ b/app/models/issue_comment.rb
@@ -25,6 +25,4 @@ class IssueComment < ApplicationRecord
   belongs_to :user
 
   validates :body, :presence => true, :characters => true
   belongs_to :user
 
   validates :body, :presence => true, :characters => true

-  validates :user, :presence => true
-  validates :issue, :presence => true

 end
 end

diff --git a/app/models/message.rb b/app/models/message.rb
index 44b1d8745e6fdf8600b6ff307c789599f08c7262..49c11e900898923beb558d78d8d2b6e35845a158 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -29,7 +29,7 @@ class Message < ApplicationRecord
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255

-  validates :body, :sent_on, :sender, :recipient, :presence => true
+  validates :body, :sent_on, :presence => true

   validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)
   validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)

diff --git a/app/models/node.rb b/app/models/node.rb
index 3214564c8e4fbf7c1eb15e75f953e9f187869c41..2ae62d68482701ea48b933fa05fa837ab1d125db 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -49,8 +49,6 @@ class Node < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :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,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index fa21b1ff6fdd60b2c813e7bd7979ee6b5a140837..d76a1a0ae865a7e8e86cd3f8c93e3c87c75a1928 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -17,7 +17,7 @@ class NodeTag < ApplicationRecord
 
   belongs_to :node
 
 
   belongs_to :node
 

-  validates :node, :presence => true, :associated => true
+  validates :node, :associated => true

   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :node_id }
 end
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :node_id }
 end

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 999d045075f2f033bfc2a4e0ab9e8d83b296000a..635a5b0def53444f6b5ead14c4d11685a4af6d63 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -29,7 +29,7 @@ class NoteComment < ApplicationRecord
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

-  validates :note, :presence => true, :associated => true
+  validates :note, :associated => true

   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 3261c9a0e2875b58c8646169930d7381740ad41b..979f7cb6b25edcbd8fcf6174071b639c2f9f5980 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -35,7 +35,7 @@ class OldNode < ApplicationRecord
   # 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
 

-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,

diff --git a/app/models/old_node_tag.rb b/app/models/old_node_tag.rb
index f2cba896cf031c7b8efbc14742e83977b197137c..ec48c1c0483d51c251bc9d937b68c8a483eeda28 100644 (file)
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -18,7 +18,7 @@ class OldNodeTag < ApplicationRecord
 
   belongs_to :old_node, :foreign_key => [:node_id, :version]
 
 
   belongs_to :old_node, :foreign_key => [:node_id, :version]
 

-  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
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:node_id, :version] }
 end

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e948cae5ea6a70a3fd9c59572a487dc1e3532d89..39d53518d1273ae5ed1a2732cc2940fab41ea4e9 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -37,7 +37,7 @@ class OldRelation < ApplicationRecord
   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 :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index d6e6e19c2dfb921a4f4621e22f9d83b08b5f86c1..124c89ad51d2a8f941d51e1297cb3b88611ce158 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -18,7 +18,7 @@ class OldRelationTag < ApplicationRecord
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
 
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
 

-  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
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:relation_id, :version] }
 end

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 03c281e5a437c40f8f4aef0a8b5bcfaaf16bcdf2..8052899bf24588fab25a034128c0f510f0b5e035 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -37,7 +37,7 @@ class OldWay < ApplicationRecord
   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]
   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
 

-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true

   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 

diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 90bf704b6af2c1a5be5eb7c4ea4107d488a16a85..bbfffc2cbbe03ffc008b8e416bec8ab4fc1310ee 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -18,7 +18,7 @@ class OldWayTag < ApplicationRecord
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 

-  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
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:way_id, :version] }
 end

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 4200a08dd7c709da827e405759c7d5df968a5672..0adf1012d67e1b03f00595c44c06c317cd7ada45 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -39,8 +39,6 @@ class Relation < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :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]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index ad9a932661bddc63e75eeb428fe00330c327e47b..758ed37cc0d5afd0c9b6b5fa4eb4f9e2a08f3c3c 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -17,7 +17,7 @@ class RelationTag < ApplicationRecord
 
   belongs_to :relation
 
 
   belongs_to :relation
 

-  validates :relation, :presence => true, :associated => true
+  validates :relation, :associated => true

   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :relation_id }
 end
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :relation_id }
 end

diff --git a/app/models/report.rb b/app/models/report.rb
index 346c5eea95c3d13205f1bb5ad5bc3d4b6ce9436e..77a96764125bbc8e839d73773a3fbfa50a5d9aa9 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -25,8 +25,6 @@ class Report < ApplicationRecord
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 

-  validates :issue, :presence => true
-  validates :user, :presence => true

   validates :details, :presence => true, :characters => true
   validates :category, :presence => true
 
   validates :details, :presence => true, :characters => true
   validates :category, :presence => true
 

diff --git a/app/models/trace.rb b/app/models/trace.rb
index feefc077387b9ca32ea05ad247c2184de992ae8d..f2d81e31aa861f7d700cb546f680af906e1d4a5f 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -43,7 +43,7 @@ class Trace < ApplicationRecord
   has_one_attached :image, :service => Settings.trace_image_storage
   has_one_attached :icon, :service => Settings.trace_icon_storage
 
   has_one_attached :image, :service => Settings.trace_image_storage
   has_one_attached :icon, :service => Settings.trace_icon_storage
 

-  validates :user, :presence => true, :associated => true
+  validates :user, :associated => true

   validates :name, :presence => true, :length => 1..255, :characters => true
   validates :description, :presence => { :on => :create }, :length => 1..255, :characters => true
   validates :timestamp, :presence => true
   validates :name, :presence => true, :length => 1..255, :characters => true
   validates :description, :presence => { :on => :create }, :length => 1..255, :characters => true
   validates :timestamp, :presence => true

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index d5cad3978c81f087cacee2b13f3e152aa87df506..741aa335aca9c2f2375cb09bbe0093912e07115e 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -16,6 +16,6 @@ class UserPreference < ApplicationRecord
 
   belongs_to :user
 
 
   belongs_to :user
 

-  validates :user, :presence => true, :associated => true
+  validates :user, :associated => true

   validates :k, :v, :length => 1..255, :characters => true
 end
   validates :k, :v, :length => 1..255, :characters => true
 end

diff --git a/app/models/way.rb b/app/models/way.rb
index 933cb7c8b81a5bc6a7e29c3e49ac5b16b6f09fd2..767289d583ddc3b3a3769b37e4ba2714ad00aebb 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -41,8 +41,6 @@ class Way < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :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]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 0d32d8c41631402f7b104b6b60b881308a9ab6c5..93c4cdece779776f8a35c09e05636092bbe04bc7 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -17,7 +17,7 @@ class WayTag < ApplicationRecord
 
   belongs_to :way
 
 
   belongs_to :way
 

-  validates :way, :presence => true, :associated => true
+  validates :way, :associated => true

   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :way_id }
 end
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :way_id }
 end