Cleaned up caching in AbstractReferenceFilter

Cleaning this up any further is a bit tricky as the caches in question
should only be evaluated if RequestStore is actually enabled.

1 files changed, 11 insertions, 15 deletions

diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index 02ef27cf577..f21dbef216c 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -74,11 +74,7 @@ module Banzai
         if RequestStore.active?
           cache = find_objects_cache[object_class][project.id]
 
-          if cache.key?(id)
-            cache[id]
-          else
-            cache[id] = find_object(project, id)
-          end
+          get_or_set_cache(cache, id) { find_object(project, id) }
         else
           find_object(project, id)
         end
@@ -88,11 +84,7 @@ module Banzai
         if RequestStore.active?
           cache = project_refs_cache
 
-          if cache.key?(ref)
-            cache[ref]
-          else
-            cache[ref] = project_from_ref(ref)
-          end
+          get_or_set_cache(cache, ref) { project_from_ref(ref) }
         else
           project_from_ref(ref)
         end
@@ -107,11 +99,7 @@ module Banzai
         if RequestStore.active?
           cache = url_for_object_cache[object_class][project.id]
 
-          if cache.key?(object)
-            cache[object]
-          else
-            cache[object] = url_for_object(object, project)
-          end
+          get_or_set_cache(cache, object) { url_for_object(object, project) }
         else
           url_for_object(object, project)
         end
@@ -243,6 +231,14 @@ module Banzai
           hash[key] = Hash.new { |h, k| h[k] = {} }
         end
       end
+
+      def get_or_set_cache(cache, key)
+        if cache.key?(key)
+          cache[key]
+        else
+          cache[key] = yield
+        end
+      end
     end
   end
 end