A platform for community discussion. Free, open, simple.
PERF: Minor site setting & UC related changes (#41961)
Martin Brennand5c4e6ffe819
diff --git a/app/models/site.rb b/app/models/site.rbindex 7eaea993bc4..2e6896ce8c2 100644--- a/app/models/site.rb+++ b/app/models/site.rb@@ -156,15 +156,14 @@ class Siteendend+ can_lazy_load_categories = @guardian.can_lazy_load_categories?+@categories ||=begincategories = []self.class.all_categories_cache.each do |category|- if (- [email protected]_lazy_load_categories? ||- preloaded_category_ids.include?(category[:id])- ) &&+ if (!can_lazy_load_categories || preloaded_category_ids.include?(category[:id])) &&@guardian.can_see_serialized_category?(category_id: category[:id],read_restricted: category[:read_restricted],diff --git a/lib/site_settings/defaults_provider.rb b/lib/site_settings/defaults_provider.rbindex 484e1b00f88..a4e8bcd59f6 100644--- a/lib/site_settings/defaults_provider.rb+++ b/lib/site_settings/defaults_provider.rb@@ -6,17 +6,18 @@ end# A cache for providing default value based on site localeclass SiteSettings::DefaultsProviderDEFAULT_LOCALE = "en"+ DEFAULT_LOCALE_SYM = :endef initialize(site_setting)@site_setting = site_setting@defaults = {}- @defaults[DEFAULT_LOCALE.to_sym] = {}+ @defaults[DEFAULT_LOCALE_SYM] = {}@active_upcoming_change_overrides = Set.newenddef load_setting(name_arg, value, locale_defaults)name = name_arg.to_sym- @defaults[DEFAULT_LOCALE.to_sym][name] = value+ @defaults[DEFAULT_LOCALE_SYM][name] = valueif locale_defaultslocale_defaults.each do |locale, v|@@ -42,10 +43,10 @@ class SiteSettings::DefaultsProvider# Defaults loaded from yaml files before mutation by upcoming# changes and modifiers.def all_clean(locale = nil)- if locale- @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[locale.to_sym] || {})+ if locale && locale.to_sym != DEFAULT_LOCALE_SYM+ @defaults[DEFAULT_LOCALE_SYM].merge(@defaults[locale.to_sym] || {})else- @defaults[DEFAULT_LOCALE.to_sym].dup+ @defaults[DEFAULT_LOCALE_SYM].dupendend@@ -111,7 +112,7 @@ class SiteSettings::DefaultsProviderprivatedef has_key?(name)- @defaults[DEFAULT_LOCALE.to_sym].key?(name)+ @defaults[DEFAULT_LOCALE_SYM].key?(name)enddef current_dbdiff --git a/spec/lib/site_settings/defaults_provider_spec.rb b/spec/lib/site_settings/defaults_provider_spec.rbindex 51386b323e3..ec177958c06 100644--- a/spec/lib/site_settings/defaults_provider_spec.rb+++ b/spec/lib/site_settings/defaults_provider_spec.rb@@ -58,6 +58,35 @@ RSpec.describe SiteSettings::DefaultsProvider doit "returns the correct locale_default for boolean site settings" doexpect(settings.defaults.get(:test_boolean_override, :zh_CN)).to eq falseend++ it "does not merge with locale default if locale matches default locale" do+ Hash.any_instance.expects(:merge).never+ expect(settings.defaults.get(:test_default, :en)).to eq "test"+ end+ end++ describe ".all_clean" do+ it "returns all values according to locale" do+ expect(settings.defaults.all_clean).to eq(+ test_override: "default",+ test_default: "test",+ test_boolean_override: true,+ )+ expect(settings.defaults.all_clean("zh_CN")).to eq(+ test_override: "cn",+ test_default: "test",+ test_boolean_override: false,+ )+ end++ it "does not merge with DEFAULT_LOCALE if locale matches default locale" do+ Hash.any_instance.expects(:merge).never+ expect(settings.defaults.all_clean("en")).to eq(+ test_override: "default",+ test_default: "test",+ test_boolean_override: true,+ )+ endenddescribe ".set_regardless_of_locale" do@@ -202,6 +231,32 @@ RSpec.describe SiteSettings::DefaultsProvider doendend+ describe ".get" do+ context "when the upcoming change override is active" do+ before do+ settings.defaults.activate_upcoming_change_override(+ :increase_suggested_topics_max_days_old_default,+ )+ end++ it "returns the upcoming change default override" do+ expect(settings.defaults.get(:suggested_topics_max_days_old)).to eq(1000)+ end+ end++ context "when the upcoming change override is not active" do+ before do+ settings.defaults.deactivate_upcoming_change_override(+ :increase_suggested_topics_max_days_old_default,+ )+ end++ it "returns the original default" do+ expect(settings.defaults.get(:suggested_topics_max_days_old)).to eq(365)+ end+ end+ end+describe ".upcoming_change_override_metadata" dobefore dosettings.defaults.activate_upcoming_change_override(