From a06e20b6c55a45b98d008e82290e3b1ec8680c93 Mon Sep 17 00:00:00 2001
From: Hauke Klement <dev@hklement.de>
Date: Wed, 11 Mar 2015 14:24:24 +0100
Subject: [PATCH] use eager loading to reduce the number of database queries

---
 app/controllers/execution_environments_controller.rb | 2 +-
 app/controllers/exercises_controller.rb              | 2 +-
 app/controllers/external_users_controller.rb         | 2 +-
 app/controllers/file_types_controller.rb             | 2 +-
 app/controllers/internal_users_controller.rb         | 2 +-
 app/controllers/submissions_controller.rb            | 2 +-
 app/controllers/teams_controller.rb                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/execution_environments_controller.rb b/app/controllers/execution_environments_controller.rb
index 23e73768..9f9a4b92 100644
--- a/app/controllers/execution_environments_controller.rb
+++ b/app/controllers/execution_environments_controller.rb
@@ -34,7 +34,7 @@ class ExecutionEnvironmentsController < ApplicationController
   private :execution_environment_params
 
   def index
-    @execution_environments = ExecutionEnvironment.all.order(:name)
+    @execution_environments = ExecutionEnvironment.all.includes(:user).order(:name)
     authorize!
   end
 
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 11b0668b..cf951030 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -78,7 +78,7 @@ class ExercisesController < ApplicationController
 
   def index
     @search = policy_scope(Exercise).search(params[:q])
-    @exercises = @search.result.order(:title)
+    @exercises = @search.result.includes(:execution_environment, :user).order(:title)
     authorize!
   end
 
diff --git a/app/controllers/external_users_controller.rb b/app/controllers/external_users_controller.rb
index 454b3046..cbc2b4f7 100644
--- a/app/controllers/external_users_controller.rb
+++ b/app/controllers/external_users_controller.rb
@@ -5,7 +5,7 @@ class ExternalUsersController < ApplicationController
   private :authorize!
 
   def index
-    @users = ExternalUser.all
+    @users = ExternalUser.all.includes(:consumer)
     authorize!
   end
 
diff --git a/app/controllers/file_types_controller.rb b/app/controllers/file_types_controller.rb
index d15de715..ea813f22 100644
--- a/app/controllers/file_types_controller.rb
+++ b/app/controllers/file_types_controller.rb
@@ -28,7 +28,7 @@ class FileTypesController < ApplicationController
   private :file_type_params
 
   def index
-    @file_types = FileType.all.order(:name)
+    @file_types = FileType.all.includes(:user).order(:name)
     authorize!
   end
 
diff --git a/app/controllers/internal_users_controller.rb b/app/controllers/internal_users_controller.rb
index f8585e58..f17e6078 100644
--- a/app/controllers/internal_users_controller.rb
+++ b/app/controllers/internal_users_controller.rb
@@ -62,7 +62,7 @@ class InternalUsersController < ApplicationController
 
   def index
     @search = InternalUser.search(params[:q])
-    @users = @search.result.order(:name)
+    @users = @search.result.includes(:consumer).order(:name)
     authorize!
   end
 
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 8cdcc106..2feb452c 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -34,7 +34,7 @@ class SubmissionsController < ApplicationController
 
   def index
     @search = Submission.search(params[:q])
-    @submissions = @search.result.paginate(page: params[:page])
+    @submissions = @search.result.includes(:exercise, :user).paginate(page: params[:page])
     authorize!
   end
 
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 167f5899..40aea9e1 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -22,7 +22,7 @@ class TeamsController < ApplicationController
   end
 
   def index
-    @teams = Team.all.order(:name)
+    @teams = Team.all.includes(:internal_users).order(:name)
     authorize!
   end