X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1d24228a3bd3ac2b233078475c6d44d9c547bbc7..8dc8479e12b50878ca6b476a4dd72fe1da1f24ad:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a08bfd6a4..83923f242 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -7,7 +7,7 @@
 #  reportable_id    :integer          not null
 #  reported_user_id :integer          not null
 #  status           :integer
-#  issue_type       :string
+#  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  updated_by       :integer
@@ -38,11 +38,14 @@ class Issue < ActiveRecord::Base
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
   validates :reported_user_id, :presence => true
 
+  ASSIGNED_ROLES = %w[administrator moderator].freeze
+  validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES
+
+  before_validation :set_default_assigned_role
   before_validation :set_reported_user
 
   # 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]) }
 
@@ -89,4 +92,9 @@ class Issue < ActiveRecord::Base
                            reportable.user
                          end
   end
+
+  def set_default_assigned_role
+    role = %w[Changeset Note].include?(reportable.class.name) ? "moderator" : "administrator"
+    self.assigned_role = role if assigned_role.blank?
+  end
 end