From 243a081aa99422c4bbe355a809462dbc571fef01 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 14 Oct 2024 11:18:50 -0500 Subject: [PATCH] Make the previously-slow query target feed query configurable. Default to on --- admin/config/application.rb | 2 +- ruby/lib/jam_ruby/models/feed.rb | 7 +++++-- ruby/spec/support/utilities.rb | 4 ++++ web/config/application.rb | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/admin/config/application.rb b/admin/config/application.rb index 73e9717e7..b90bcaaf3 100644 --- a/admin/config/application.rb +++ b/admin/config/application.rb @@ -131,7 +131,7 @@ module JamAdmin config.email_smtp_starttls_auto = true config.verify_email_enabled = false - config.musician_count = '200,000+' + config.musician_count = '300,000+' config.facebook_app_id = ENV['FACEBOOK_APP_ID'] || '468555793186398' config.facebook_app_secret = ENV['FACEBOOK_APP_SECRET'] || '546a5b253972f3e2e8b36d9a3dd5a06e' diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb index f4da3cd80..066e5fd10 100644 --- a/ruby/lib/jam_ruby/models/feed.rb +++ b/ruby/lib/jam_ruby/models/feed.rb @@ -31,9 +31,12 @@ module JamRuby target_user = params[:user] target_band = params[:band] + # TODO: SPEED UP QUERY. CURRENTLY TAKES FOR EVER. - if target_user or target_band - return { query: [], next_page: nil} + if Rails.application.config.targeted_feed_disabled + if target_user or target_band + return { query: [], next_page: nil} + end end #query = Feed.includes([:recording]).includes([:music_session]).limit(limit) diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb index a0703f8e6..f9f3025b9 100644 --- a/ruby/spec/support/utilities.rb +++ b/ruby/spec/support/utilities.rb @@ -82,6 +82,10 @@ def app_config false end + def targeted_feed_disabled + false + end + def audiomixer_path # you can specify full path to audiomixer with AUDIOMIXER_PATH env variable... # or we check for audiomixer path in the user's workspace diff --git a/web/config/application.rb b/web/config/application.rb index b3361beea..a5b7e73ea 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -444,6 +444,7 @@ if defined?(Bundler) } config.vst_enabled = true config.midi_enabled = true + config.targeted_feed_disabled = false config.verify_email_enabled = false config.kickbox_api_key = 'e262991e292dd5fe382c4a69f2b359f718cf267712b8684c9c28d6402ec18965' config.check_bounced_emails = false