Merge pull request #3721 from manyfold3d/performance

Optimised database queries

Author: Floppy

app/controllers/collections_controller.rb

@@ -28,7 +28,7 @@ def index
       @collections = @collections.page(page).per(helpers.pagination_settings["per_page"])
     end
     # Eager load
-    @collections = @collections.includes :collections, :collection, :links, models: [:preview_file, :library]
+    @collections = @collections.includes :collections, :collection, :links
     # Apply tag filters in-place
     @filter_in_place = true
     render layout: "card_list_page"
@@ -85,7 +85,7 @@ def get_collection
       authorize Collection
       @title = t(".unknown")
     else
-      @collection = policy_scope(Collection).includes(:links, :caber_relations).find_param(params[:id])
+      @collection = policy_scope(Collection).find_param(params[:id])
       authorize @collection
       @title = @collection.name
     end

app/controllers/concerns/filterable.rb

@@ -10,7 +10,7 @@ def get_filters
   end
 
   def filtered_models(filters)
-    models = policy_scope(Model).includes(:tags, :creator, :collection)
+    models = policy_scope(Model).all
     models = filter_by_library(models, filters[:library])
     models = filter_by_missing_tag(models, filters[:missingtag], filters[:library])
     models = filter_by_tag(models, filters[:tag])

app/controllers/concerns/model_listable.rb

@@ -30,7 +30,7 @@ def prepare_model_list
     end
 
     # Load extra data
-    @models = @models.includes [:library, :creator, :collection]
+    @models = @models.includes [:creator, :collection]
     @models = @models.preload [:model_files, :preview_file] # Use preload query to avoid joining JSON fields
   end
 end

app/controllers/creators_controller.rb

@@ -25,7 +25,7 @@ def index
       @creators = @creators.page(page).per(helpers.pagination_settings["per_page"])
     end
     # Eager load data
-    @creators = @creators.includes(:links, :models)
+    @creators = @creators.includes(:links, :collections)
     # Apply tag filters in-place
     @filter_in_place = true
     render layout: "card_list_page"
@@ -80,7 +80,7 @@ def get_creator
       authorize Creator
       @title = t(".unknown")
     else
-      @creator = policy_scope(Creator).includes(:links, :caber_relations).find_param(params[:id])
+      @creator = policy_scope(Creator).find_param(params[:id])
       authorize @creator
       @title = @creator.name
     end

app/controllers/models_controller.rb

@@ -122,7 +122,7 @@ def scan
 
   def bulk_edit
     authorize Model
-    @models = filtered_models @filters
+    @models = filtered_models(@filters).includes(:collection, :creator)
     generate_available_tag_list
     if helpers.pagination_settings["models"]
       page = params[:page] || 1
@@ -221,7 +221,7 @@ def model_params
   end
 
   def get_model
-    @model = policy_scope(Model).includes(:model_files, :creator, :preview_file, :library, :tags, :taggings, :links, :caber_relations).find_param(params[:id])
+    @model = policy_scope(Model).includes(:model_files, :creator, :preview_file, :library, :links).find_param(params[:id])
     authorize @model
     @title = @model.name
   end

app/controllers/problems_controller.rb

@@ -26,7 +26,7 @@ def index
     # Don't show types ignored in user settings
     query = query.visible(helpers.problem_settings)
     query = query.includes([:problematic])
-    @problems = query.page(page).per(50).order([:category, :problematic_type])
+    @problems = query.page(page).per(50).order([:category, :problematic_type]).includes(problematic: [:library, :model])
     # Do we have any filters at all?
     @filters_applied = [:show_ignored, :severity, :category, :type].any? { |k| params.has_key?(k) }
   end

app/controllers/settings/users_controller.rb

@@ -3,7 +3,7 @@ class Settings::UsersController < ApplicationController
   respond_to :html
 
   def index
-    @users = policy_scope(Federails::Actor).where(entity_type: "User").where.not(entity_id: nil)
+    @users = policy_scope(Federails::Actor).where(entity_type: "User").where.not(entity_id: nil).includes(entity: [:roles])
     render layout: "settings"
   end
 

app/lib/timeline.rb

@@ -2,7 +2,7 @@ module Timeline
   ACCESS_PERMISSIONS = ["view", "edit", "own"]
 
   def self.local(actions = ["Create", "Update"], entity_types = ["Federails::Actor"], limit = 20, for_user: nil)
-    Federails::Activity.where(action: actions, entity_type: entity_types).order(created_at: :desc).limit(limit).select do |activity| # rubocop:todo Pundit/UsePolicyScope
+    Federails::Activity.where(action: actions, entity_type: entity_types).includes(:actor, entity: {entity: :model_files}).order(created_at: :desc).limit(limit).select do |activity| # rubocop:todo Pundit/UsePolicyScope
       if activity.entity_type == "Federails::Actor"
         entity = activity.entity&.entity
 

config/environments/development.rb

@@ -78,9 +78,4 @@
   # config.action_cable.disable_request_forgery_protection = true
 
   config.active_job.queue_adapter = :sidekiq
-
-  config.after_initialize do
-    Bullet.enable = true
-    Bullet.bullet_logger = true
-  end
 end

config/initializers/bullet.rb

@@ -0,0 +1,11 @@
+Rails.application.config.after_initialize do
+  if Rails.env.development?
+    Bullet.enable = true
+    Bullet.raise = true
+
+    # Features
+    Bullet.n_plus_one_query_enable = true
+    Bullet.unused_eager_loading_enable = true
+    Bullet.counter_cache_enable = false
+  end
+end