X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/683722ed5c1b3224a04c23b4d175a0638964f713..b68b29b43c2e385af05d81815e347c2ab22ed269:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7a481fe6c..0abc27063 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,22 +1,25 @@
 class Issue < ActiveRecord::Base
 	belongs_to :reportable, :polymorphic => true
-	has_many :reports
-	has_many :comments, :class_name => "IssueComment"
+	belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+
+	has_many :reports, dependent: :destroy
+	has_many :comments, :class_name => "IssueComment", dependent: :destroy
+	
 	validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }
-	belongs_to :user
-	validates :user_id, :presence => true
+	validates :reported_user_id, :presence => true
 
 	# Check if more statuses are needed
 	enum status: %w( open ignored resolved )
+	enum type: %w( administrator moderator )
 
 	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
@@ -38,8 +41,8 @@ class Issue < ActiveRecord::Base
 
 		event :reopen do
 			transitions :from => :resolved, :to => :open
+			transitions :from => :ignored, :to => :open
 		end
 
 	end
-
 end