X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f227804093a5a82eaf724f9b028b25aa7cbf41a1..387d130e87b79cb428f7554c1a233de5d0627ae9:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index dd068859a..54947be30 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -30,11 +30,11 @@
 #  issues_updated_by_fkey        (updated_by => users.id)
 #
 
-class Issue < ActiveRecord::Base
+class Issue < ApplicationRecord
   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
+  belongs_to :reported_user, :class_name => "User", :optional => true
+  belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by, :optional => true
+  belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by, :optional => true
 
   has_many :reports, :dependent => :destroy
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy
@@ -44,10 +44,10 @@ class Issue < ActiveRecord::Base
   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
 
-  scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
+  scope :with_status, ->(issue_status) { where(:status => issue_status) }
+  scope :visible_to, ->(user) { where(:assigned_role => user.roles.map(&:role)) }
 
   def read_reports
     resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
@@ -70,7 +70,7 @@ class Issue < ActiveRecord::Base
     event :resolve do
       transitions :from => :open, :to => :resolved
       after do
-        self.resolved_at = Time.now.getutc
+        self.resolved_at = Time.now.utc
       end
     end
 
@@ -92,13 +92,4 @@ class Issue < ActiveRecord::Base
                            reportable.user
                          end
   end
-
-  def set_default_assigned_role
-    if assigned_role.blank?
-      self.assigned_role = case reportable
-                           when Note then "moderator"
-                           else "administrator"
-                           end
-    end
-  end
 end