Resolve N+1 query issue with discussions

app/models/concerns/noteable.rb

@@ -43,7 +43,12 @@ module Noteable
   end
   def resolvable_discussions
-    @resolvable_discussions ||= discussion_notes.resolvable.discussions(self)
+    @resolvable_discussions ||=
+      if defined?(@discussions)
+        @discussions.select(&:resolvable?)
+      else
+        discussion_notes.resolvable.discussions(self)
+      end
   end
   def discussions_resolvable?

app/models/discussion.rb

@@ -21,7 +21,8 @@ class Discussion
   end
   def self.build_collection(notes, context_noteable = nil)
-    notes.group_by { |n| n.discussion_id(context_noteable) }.values.map { |notes| build(notes, context_noteable) }
+    grouped_notes = notes.includes(:noteable).group_by { |n| n.discussion_id(context_noteable) }
+    grouped_notes.values.map { |notes| build(notes, context_noteable) }
   end
   # Returns an alphanumeric discussion ID based on `build_discussion_id`

changelogs/unreleased/dm-discussions-n-plus-1.yml

+---
+title: Resolve N+1 query issue with discussions
+merge_request:
+author: