Adds the storable journals to the includes for eager loading the acti…

…vity records.
opf · Jul 19, 2023 · f0994f5 · f0994f5
1 parent 6b48768
commit f0994f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/api/v3/activities/activities_by_work_package_api.rb b/lib/api/v3/activities/activities_by_work_package_api.rb
@@ -38,6 +38,7 @@ class ActivitiesByWorkPackageAPI < ::API::OpenProjectAPI
             journals = @work_package.journals.includes(:data,
                                                        :customizable_journals,
                                                        :attachable_journals,
+                                                       :storable_journals,
                                                        :bcf_comment)
 
             Activities::ActivityCollectionRepresenter.new(journals,

diff --git a/lib/api/v3/activities/activity_eager_loading_wrapper.rb b/lib/api/v3/activities/activity_eager_loading_wrapper.rb
@@ -135,7 +135,7 @@ def predecessor_journals(journals)
                   ) AS journals
                 SQL
               )
-              .includes(:attachable_journals, :customizable_journals)
+              .includes(:attachable_journals, :customizable_journals, :storable_journals)
           end
         end
       end

diff --git a/spec/requests/api/v3/activities_by_work_package_resource_spec.rb b/spec/requests/api/v3/activities_by_work_package_resource_spec.rb
@@ -87,7 +87,7 @@
         include_context 'create activity'
       end
 
-      context 'with an errorenous work package' do
+      context 'with an erroneous work package' do
         before do
           work_package.subject = ''
           work_package.save!(validate: false)