From cf4a72d3f52fbf9186f226b5e8a05fca22351d58 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sat, 18 Jan 2025 05:36:19 +0000
Subject: [PATCH] Optimize `journalized` method to use preloaded Issue
 association for better Activity view performance (#42077).

Patch by Go MAEDA (user:maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@23446 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 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|