Issue reopens on Reports coming in after instance update

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f678e94e13ec67d7461e2e9c7e4d34e572951bac..604b73d986ef69b9bda2e5897c0a7e3d0fcb282e 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,7 +1,12 @@
 class Issue < ActiveRecord::Base
        belongs_to :reportable, :polymorphic => true
+       belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+
        has_many :reports
+       has_many :comments, :class_name => "IssueComment"
+       
        validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }
+       validates :reported_user_id, :presence => true
 
        # Check if more statuses are needed
        enum status: %w( open ignored resolved )
@@ -9,11 +14,11 @@ class Issue < ActiveRecord::Base
        scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])}
 
        def read_reports
-               resolved_at.present? ? reports.where("created_at < ?", resolved_at) : nil
+               resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
        end
 
        def unread_reports
-    resolved_at.present? ? reports.where("created_at >= ?", resolved_at) : reports
+    resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports
        end
 
        include AASM
@@ -35,6 +40,7 @@ class Issue < ActiveRecord::Base
 
                event :reopen do
                        transitions :from => :resolved, :to => :open
+                       transitions :from => :ignored, :to => :open
                end
 
        end