Merge pull request #2326 from openstax/fix_missing_teacher_exercises

Fix missing teacher exercises

Author: nathanstitt

app/routines/get_page_exercise_ids_by_pool_types.rb

@@ -28,7 +28,7 @@ def exec(ecosystem: nil, course: nil, page_ids: nil, exercise_ids: nil, pool_typ
       page_ids = page_ids.map(&:to_i)
       ecosystem.pages.select { |page| page_ids.include? page.id }
     else
-      ecosystem.pages.select(*pool_method_name_by_pool_type.values).where(id: page_ids)
+      ecosystem.pages.select(:id, *pool_method_name_by_pool_type.values).where(id: page_ids)
     end
 
     # Build map of pool types to pools
@@ -45,9 +45,11 @@ def exec(ecosystem: nil, course: nil, page_ids: nil, exercise_ids: nil, pool_typ
     # Add teacher-created exercises if course is provided
     return if course.nil?
 
-    teacher_exercise_ids = Content::Models::Exercise.where(
+    teacher_exercises = Content::Models::Exercise.where(
       content_page_id: pages.map(&:id), user_profile_id: course.related_teacher_profile_ids
-    ).pluck(:id)
+    )
+    teacher_exercises = teacher_exercises.where(id: exercise_ids) unless exercise_ids.nil?
+    teacher_exercise_ids = teacher_exercises.pluck(:id)
 
     (pool_types - [ :reading_context, :reading_dynamic ]).each do |pool_type|
       outputs.exercise_ids_by_pool_type[pool_type].concat teacher_exercise_ids