Use reports_count so that counter_cache works automatically.

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0abc27063de4c547eb212a3642b8d5e696b124ce..472c860c68b29ccc476256d5053a1026e83e46e2 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,48 +1,63 @@
 class Issue < ActiveRecord::Base
 class Issue < ActiveRecord::Base

-       belongs_to :reportable, :polymorphic => true
-       belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :reportable, :polymorphic => true
+  belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by

 
 

-       has_many :reports, dependent: :destroy
-       has_many :comments, :class_name => "IssueComment", dependent: :destroy
-       
-       validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }
-       validates :reported_user_id, :presence => true
+  has_many :reports, :dependent => :destroy
+  has_many :comments, :class_name => "IssueComment", :dependent => :destroy

 
 

-       # Check if more statuses are needed
-       enum status: %w( open ignored resolved )
-       enum type: %w( administrator moderator )
+  validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
+  validates :reported_user_id, :presence => true

 
 

-       scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])}
+  before_validation :set_reported_user

 
 

-       def read_reports
-               resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
-       end
+  # Check if more statuses are needed
+  enum :status => %w[open ignored resolved]
+  enum :type => %w[administrator moderator]

 
 

-       def unread_reports
+  scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
+
+  def read_reports
+    resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
+  end
+
+  def unread_reports

     resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports
     resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports

-       end
-
-       include AASM
-       aasm :column => :status, :no_direct_assignment => true do
-               state :open, :initial => true
-               state :ignored
-               state :resolved
-
-               event :ignore do
-                       transitions :from => :open, :to => :ignored 
-               end
-
-               event :resolve do
-                       transitions :from => :open, :to => :resolved
-                       after do
-                               self.resolved_at = Time.now.getutc
-                       end
-               end
-
-               event :reopen do
-                       transitions :from => :resolved, :to => :open
-                       transitions :from => :ignored, :to => :open
-               end
-
-       end
+  end
+
+  include AASM
+  aasm :column => :status, :no_direct_assignment => true do
+    state :open, :initial => true
+    state :ignored
+    state :resolved
+
+    event :ignore do
+      transitions :from => :open, :to => :ignored
+    end
+
+    event :resolve do
+      transitions :from => :open, :to => :resolved
+      after do
+        self.resolved_at = Time.now.getutc
+      end
+    end
+
+    event :reopen do
+      transitions :from => :resolved, :to => :open
+      transitions :from => :ignored, :to => :open
+    end
+  end
+
+  private
+
+  def set_reported_user
+    self.reported_user = case reportable.class.name
+                         when "User"
+                           reportable
+                         when "Note"
+                           reportable.author
+                         else
+                           reportable.user
+                         end
+  end

 end
 end