同企業所属の研修生を取得するスコープを削除してメソッドを追加

app/controllers/home_controller.rb

@@ -12,7 +12,7 @@ def index
         @completed_learnings = current_user.learnings.where(status: 3).includes(:practice).order(updated_at: :desc)
         @inactive_students = User.with_attached_avatar.inactive_students_and_trainees.order(last_activity_at: :desc)
         @job_seeking_users = User.with_attached_avatar.job_seeking.includes(:reports, :products, :works, :course, :company)
-        @collegue_trainees = User.with_attached_avatar.collegue_trainees(current_user).includes(:reports, :products, :comments)
+        @collegue_trainees = current_user.collegue_trainees&.with_attached_avatar&.includes(:reports, :products, :comments)
         display_events_on_dashboard
         display_welcome_message_for_adviser
         set_required_fields

app/models/user.rb

@@ -222,12 +222,6 @@ class User < ApplicationRecord
   scope :unretired, -> { where(retired_on: nil) }
   scope :advisers, -> { where(adviser: true) }
   scope :not_advisers, -> { where(adviser: false) }
-  scope :same_company, lambda { |user|
-    where(company_id: user.company_id)
-  }
-  scope :collegue_trainees, lambda { |user|
-    same_company(user).students_and_trainees
-  }
   scope :students_and_trainees, lambda {
     where(
       admin: false,
@@ -666,8 +660,20 @@ def wip_exists?
       products.wip.exists? || announcements.wip.exists? || events.wip.exists?
   end
 
+  def belongs_company?
+    !company.nil?
+  end
+
   def belongs_company_and_adviser?
-    adviser? && !company.nil?
+    adviser? && belongs_company?
+  end
+
+  def collegues
+    company.users if belongs_company?
+  end
+
+  def collegue_trainees
+    collegues.students_and_trainees if belongs_company_and_adviser?
   end
 
   private