diff --git a/app/models/bubble/assignable.rb b/app/models/bubble/assignable.rb index 3619341ee..3abf18d39 100644 --- a/app/models/bubble/assignable.rb +++ b/app/models/bubble/assignable.rb @@ -6,6 +6,9 @@ module Bubble::Assignable has_many :assignees, through: :assignments has_many :assigners, through: :assignments + + scope :assigned_to, ->(user) { joins(:assignments).where(assignments: { assignee: user }) } + scope :assigned_by, ->(user) { joins(:assignments).where(assignments: { assigner: user }) } end def assign(users, assigner: Current.user) diff --git a/app/models/user.rb b/app/models/user.rb index 46e00237e..643f0f7c5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -8,7 +8,6 @@ class User < ApplicationRecord has_many :buckets, through: :accesses has_many :bubbles, through: :buckets - has_many :assignments, foreign_key: :assignee_id, dependent: :destroy has_many :assignings, foreign_key: :assigner_id, class_name: "Assignment" has_many :assigned_bubbles, through: :assignments, source: :bubble