X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/80a241f7985fec6ec853e48a25823446b59b7682..c71fd544e0b33246dfcc677ec830efc2031d419e:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9eb6aac4c..27c0a7cc9 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -6,7 +6,7 @@
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null
 #  reported_user_id :integer
-#  status           :integer
+#  status           :enum             default(NULL), not null
 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer
@@ -17,19 +17,21 @@
 #
 # Indexes
 #
-#  index_issues_on_reportable_id_and_reportable_type  (reportable_id,reportable_type)
+#  index_issues_on_reportable_type_and_reportable_id  (reportable_type,reportable_id)
 #  index_issues_on_reported_user_id                   (reported_user_id)
 #  index_issues_on_updated_by                         (updated_by)
 #
 # Foreign Keys
 #
-#  issues_reported_user_id_fkey  (reported_user_id => users.id) ON DELETE => cascade
-#  issues_updated_by_fkey        (updated_by => users.id) ON DELETE => cascade
+#  issues_reported_user_id_fkey  (reported_user_id => users.id)
+#  issues_resolved_by_fkey       (resolved_by => users.id)
+#  issues_updated_by_fkey        (updated_by => users.id)
 #
 
 class Issue < ActiveRecord::Base
   belongs_to :reportable, :polymorphic => true
   belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
 
   has_many :reports, :dependent => :destroy
@@ -43,9 +45,6 @@ class Issue < ActiveRecord::Base
   before_validation :set_default_assigned_role
   before_validation :set_reported_user
 
-  # 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
@@ -93,7 +92,11 @@ class Issue < ActiveRecord::Base
   end
 
   def set_default_assigned_role
-    role = %w[Changeset Note].include?(reportable.class.name) ? "moderator" : "administrator"
-    self.assigned_role = role if assigned_role.blank?
+    if assigned_role.blank?
+      self.assigned_role = case reportable
+                           when Note then "moderator"
+                           else "administrator"
+                           end
+    end
   end
 end