Move the user api methods into a separate controller in the api namespace

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a08bfd6a4ca642d45130ab4ab35b0adf83e6914a..f18581b5f059670f01a52836aca272b2d77265fb 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -5,9 +5,9 @@
 #  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
-#  issue_type       :string
+#  reported_user_id :integer
+#  status           :enum             default("open"), not null
+#  assigned_role    :enum             not null

 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  updated_by       :integer
 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  updated_by       :integer


@@ -17,34 +17,37 @@
 #
 # 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
   belongs_to :reportable, :polymorphic => true
   belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_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
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
   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

 
 

-  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]
-  enum :type => %w[administrator moderator]
+  before_validation :set_reported_user

 
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
 
   scope :with_status, ->(issue_status) { where(:status => statuses[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
 
   def read_reports
     resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil