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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7a481fe6c..963a27a6e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,45 +1,48 @@
 class Issue < ActiveRecord::Base
-	belongs_to :reportable, :polymorphic => true
-	has_many :reports
-	has_many :comments, :class_name => "IssueComment"
-	validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] }
-	belongs_to :user
-	validates :user_id, :presence => true
-
-	# Check if more statuses are needed
-	enum status: %w( open ignored resolved )
-
-	scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])}
-
-	def read_reports
-		resolved_at.present? ? reports.where("created_at < ?", resolved_at) : nil
-	end
-
-	def unread_reports
-    resolved_at.present? ? reports.where("created_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
-		end
-
-	end
-
+  belongs_to :reportable, :polymorphic => true
+  belongs_to :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
+
+  # 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("updated_at < ?", resolved_at) : nil
+  end
+
+  def unread_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