From 3e70c11cff86b053c33b23cfffed047e58006e95 Mon Sep 17 00:00:00 2001
From: MAEDA Go <maeda@farend.jp>
Date: Mon, 6 Jan 2025 18:27:36 +0900
Subject: [PATCH 1/2] Optimize `journalized` method to use preloaded Issue
 association for better Activity view performance

---
 app/models/journal.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 446eac7a6..e83905a3c 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -104,6 +104,15 @@ class Journal < ApplicationRecord
     (details.empty? && notes.blank?) ? false : super()
   end
 
+  def journalized
+    if journalized_type == 'Issue' && association(:issue).loaded?
+      # Avoid extra query by using preloaded association
+      issue
+    else
+      super
+    end
+  end
+
   # Returns journal details that are visible to user
   def visible_details(user=User.current)
     details.select do |detail|
-- 
2.47.1