Remove redundant presence validation on belongs_to

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

diff --git a/app/models/report.rb b/app/models/report.rb
index cc9605dea210e7e402db6a1b12600882aae6f8af..77a96764125bbc8e839d73773a3fbfa50a5d9aa9 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -2,27 +2,38 @@
 #
 # Table name: reports
 #
 #
 # Table name: reports
 #

-#  id               :integer          not null, primary key
-#  issue_id         :integer
-#  reporter_user_id :integer
-#  details          :text             not null
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  id         :integer          not null, primary key
+#  issue_id   :integer          not null
+#  user_id    :integer          not null
+#  details    :text             not null
+#  category   :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null

 #
 # Indexes
 #
 #
 # Indexes
 #

-#  index_reports_on_issue_id          (issue_id)
-#  index_reports_on_reporter_user_id  (reporter_user_id)
+#  index_reports_on_issue_id  (issue_id)
+#  index_reports_on_user_id   (user_id)

 #
 # Foreign Keys
 #
 #
 # Foreign Keys
 #

-#  reports_issue_id_fkey          (issue_id => issues.id) ON DELETE => cascade
-#  reports_reporter_user_id_fkey  (reporter_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 :issue, :counter_cache => true

-  belongs_to :user, :class_name => "User", :foreign_key => :reporter_user_id
+  belongs_to :user

 
 

-  validates :details, :presence => true
+  validates :details, :presence => true, :characters => true
+  validates :category, :presence => true
+
+  def self.categories_for(reportable)
+    case reportable.class.name
+    when "DiaryEntry", "DiaryComment" then %w[spam offensive threat other]
+    when "User" then %w[spam offensive threat vandal other]
+    when "Note" then %w[spam personal abusive other]
+    else %w[other]
+    end
+  end

 end
 end