Merge pull request #17473 from opf/implementation/60018-ensure-remind…

…ers-are-included-in-notifications-eager-loading-wrapper

implementation/60018 Add notification polymorphic resource as part of the eager loading list to avoid isolated query

lib/api/v3/notifications/notification_eager_loading_wrapper.rb

@@ -35,23 +35,6 @@ def wrap(notifications)
             notifications
               .includes(API::V3::Notifications::NotificationRepresenter.to_eager_load)
               .to_a
-              .tap { |loaded_notifications| set_resource(loaded_notifications) }
-          end
-
-          private
-
-          # The resource cannot be loaded by rails eager loading means (include)
-          # because it is a polymorphic association. That being as it is, currently only
-          # work packages are assigned.
-          def set_resource(notifications)
-            work_packages_by_id = WorkPackage
-                                    .includes(:project)
-                                    .where(id: notifications.pluck(:resource_id).uniq)
-                                    .index_by(&:id)
-
-            notifications.each do |notification|
-              notification.resource = work_packages_by_id[notification.resource_id]
-            end
           end
         end
       end

lib/api/v3/notifications/notification_representer.rb

@@ -104,7 +104,7 @@ def _type
           "Notification"
         end
 
-        self.to_eager_load = %i[actor journal reminder]
+        self.to_eager_load = [:actor, :journal, :reminder, { resource: :project }]
       end
     end
   end