X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a20e28809f5ca1e3f3579faeaf118fff3ecc4994..191d7f371031cec6a1b83157d3e9f17dee787075:/app/models/report.rb

diff --git a/app/models/report.rb b/app/models/report.rb
index fcfa61b98..346c5eea9 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -3,8 +3,8 @@
 # Table name: reports
 #
 #  id         :integer          not null, primary key
-#  issue_id   :integer
-#  user_id    :integer
+#  issue_id   :integer          not null
+#  user_id    :integer          not null
 #  details    :text             not null
 #  category   :string           not null
 #  created_at :datetime         not null
@@ -17,23 +17,24 @@
 #
 # Foreign Keys
 #
-#  reports_issue_id_fkey  (issue_id => issues.id) ON DELETE => cascade
-#  reports_user_id_fkey   (user_id => users.id) ON DELETE => cascade
+#  reports_issue_id_fkey  (issue_id => issues.id)
+#  reports_user_id_fkey   (user_id => users.id)
 #
 
-class Report < ActiveRecord::Base
+class Report < ApplicationRecord
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 
-  validates :details, :presence => true
+  validates :issue, :presence => true
+  validates :user, :presence => true
+  validates :details, :presence => true, :characters => true
   validates :category, :presence => true
 
   def self.categories_for(reportable)
     case reportable.class.name
-    when "DiaryEntry" then %w[spam offensive threat other]
-    when "DiaryComment" then %w[spam offensive threat other]
+    when "DiaryEntry", "DiaryComment" then %w[spam offensive threat other]
     when "User" then %w[spam offensive threat vandal other]
-    when "Note" then %w[spam vandalism personal abusive other]
+    when "Note" then %w[spam personal abusive other]
     else %w[other]
     end
   end