Merge remote-tracking branch 'upstream/pull/5387'

[rails.git] / app / models / issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1fe078ad9fca9a65d38b391a8bbdbea6c8752a14..a3f82ee40b11881bddf5d5226404f8209668f614 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -5,8 +5,8 @@
 #  id               :integer          not null, primary key
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null
 #  id               :integer          not null, primary key
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null

-#  reported_user_id :integer          not null
-#  status           :integer
+#  reported_user_id :integer
+#  status           :enum             default("open"), not null

 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer


@@ -17,42 +17,44 @@
 #
 # Indexes
 #
 #
 # Indexes
 #

-#  index_issues_on_reportable_id_and_reportable_type  (reportable_id,reportable_type)
+#  index_issues_on_assigned_role                      (assigned_role)
+#  index_issues_on_reportable_type_and_reportable_id  (reportable_type,reportable_id)

 #  index_issues_on_reported_user_id                   (reported_user_id)
 #  index_issues_on_reported_user_id                   (reported_user_id)

+#  index_issues_on_status                             (status)

 #  index_issues_on_updated_by                         (updated_by)
 #
 # Foreign Keys
 #
 #  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
+class Issue < ApplicationRecord

   belongs_to :reportable, :polymorphic => true
   belongs_to :reportable, :polymorphic => true

-  belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
-  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
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
 
   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
-  validates :assigned_role, :presence => true, :inclusion => %w[administrator moderator]

 
 

-  before_validation :set_default_assigned_role
-  before_validation :set_reported_user
+  ASSIGNED_ROLES = %w[administrator moderator].freeze
+  validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES

 
 

-  # Check if more statuses are needed
-  enum :status => %w[open ignored resolved]
+  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
 
   def read_reports

-    resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
+    resolved_at.present? ? reports.where(:updated_at => ...resolved_at) : nil

   end
 
   def unread_reports
   end
 
   def unread_reports

-    resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports
+    resolved_at.present? ? reports.where(:updated_at => resolved_at..) : reports

   end
 
   include AASM
   end
 
   include AASM


@@ -68,7 +70,7 @@ class Issue < ActiveRecord::Base
     event :resolve do
       transitions :from => :open, :to => :resolved
       after do
     event :resolve do
       transitions :from => :open, :to => :resolved
       after do

-        self.resolved_at = Time.now.getutc
+        self.resolved_at = Time.now.utc

       end
     end
 
       end
     end
 


@@ -90,9 +92,4 @@ class Issue < ActiveRecord::Base
                            reportable.user
                          end
   end
                            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
 end