correct memoization in successor and predecessor of Journal

opf · Jan 13, 2025 · fdf0fe7 · fdf0fe7
1 parent b269952
commit fdf0fe7
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/app/models/journal.rb b/app/models/journal.rb
@@ -162,11 +162,13 @@ def previous
   end
 
   def successor
-    @successor ||= self.class
-                       .where(journable_type:, journable_id:)
-                       .where("#{self.class.table_name}.version > ?", version)
-                       .order(version: :asc)
-                       .first
+    return @successor if defined?(@successor)
+
+    @successor = self.class
+                     .where(journable_type:, journable_id:)
+                     .where("#{self.class.table_name}.version > ?", version)
+                     .order(version: :asc)
+                     .first
   end
 
   def noop?
@@ -194,14 +196,16 @@ def has_file_links?
   end
 
   def predecessor
-    @predecessor ||= if initial?
-                       nil
-                     else
-                       self.class
-                         .where(journable_type:, journable_id:)
-                         .where("#{self.class.table_name}.version < ?", version)
-                         .order(version: :desc)
-                         .first
-                     end
+    return @predecessor if defined?(@predecessor)
+
+    @predecessor = if initial?
+                     nil
+                   else
+                     self.class
+                       .where(journable_type:, journable_id:)
+                       .where("#{self.class.table_name}.version < ?", version)
+                       .order(version: :desc)
+                       .first
+                   end
   end
 end