fix-cache-returns-nil (#3213)

diff --git a/app/lib/settings/extend.rb b/app/lib/settings/extend.rb
index 407c3480f0f39a4c47684bc4cdb94f1eaa165ead..884b4987459ae6fda769bf7e2a4e53fa6a82ecef 100644 (file)
--- a/app/lib/settings/extend.rb
+++ b/app/lib/settings/extend.rb
@@ -5,7 +5,7 @@ module Settings
     extend ActiveSupport::Concern
 
     def settings
-      ScopedSettings.for_thing(self)
+      @settings ||= ScopedSettings.new(self)
     end
   end
 end

diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
index 82b70d12801b152bd2f81c3ad345bd29f438f0b9..68f97b5ae6f0645c164c8788ed0a29a5d390e085 100644 (file)
--- a/app/lib/settings/scoped_settings.rb
+++ b/app/lib/settings/scoped_settings.rb
@@ -1,14 +1,69 @@
 # frozen_string_literal: true
 
 module Settings
-  class ScopedSettings < ::Setting
-    def self.for_thing(object)
+  class ScopedSettings
+    def initialize(object)
       @object = object
-      self
     end
 
-    def self.thing_scoped
-      unscoped.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
+    # rubocop:disable Style/MethodMissing
+    def method_missing(method, *args)
+      method_name = method.to_s
+      # set a value for a variable
+      if method_name[-1] == '='
+        var_name = method_name.sub('=', '')
+        value = args.first
+        self[var_name] = value
+      else
+        # retrieve a value
+        self[method_name]
+      end
+    end
+    # rubocop:enable Style/MethodMissing
+
+    def respond_to?(_method_name, _include_private = false)
+      true
+    end
+
+    def all_as_records
+      vars = thing_scoped
+      records = vars.map { |r| [r.var, r] }.to_h
+
+      Setting.send(:default_settings).each do |key, default_value|
+        next if records.key?(key) || default_value.is_a?(Hash)
+        records[key] = Setting.new(var: key, value: default_value)
+      end
+
+      records
+    end
+
+    def []=(key, value)
+      key = key.to_s
+      record = thing_scoped.find_by(var: key) || thing_scoped.new(var: key)
+      record.value = value
+      record.save!
+
+      Rails.cache.write(Setting.cache_key(key, @object), value)
+      value
+    end
+
+    def [](key)
+      Rails.cache.fetch(Setting.cache_key(key, @object)) do
+        db_val = thing_scoped.find_by(var: key.to_s)
+        if db_val
+          default_value = Setting.send(:default_settings)[key]
+          return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash)
+          db_val.value
+        else
+          Setting.send(:default_settings)[key]
+        end
+      end
+    end
+
+    protected
+
+    def thing_scoped
+      Setting.unscoped.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
     end
   end
 end

diff --git a/app/models/setting.rb b/app/models/setting.rb
index db16f228b3a4c9f5c92d22b5c78fe6cfd4192dca..f5c95777af9f5751ae4c9c5fbc3cbf3168469d09 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -35,7 +35,6 @@ class Setting < RailsSettings::Base
           default_settings[key]
         end
       end
-
       val
     end