Add scope to retrieve descendants of a recurrent course edition

app/controllers/course_editions/project_preferences_controller.rb

@@ -23,11 +23,11 @@ module CourseEditions
 
       # If the user has any preferences stored
       @any_preferences = current_user.project_preferences?(@course_edition)
-      if @course_edition.recurrent_edition.nil?
-        @other_preferences = false
+      @other_preferences = if @course_edition.recurrent_edition.nil?
+                             false
                            else
-        @other_preferences = ProjectPreference.where(user: current_user,
-                                                     course_edition: CourseEdition.where(recurrent_edition: @course_edition.recurrent_edition)).any?
+                             ProjectPreference.where(user: current_user,
+                                                     course_edition: CourseEdition.descendants_of(@course_edition.recurrent_edition)).any?
                            end
 
       @project_name = @course_edition.configuration.project_name_text(false, false)

app/controllers/course_editions/projects_controller.rb

@@ -54,9 +54,10 @@ module CourseEditions
                            ProjectInterest.joins(:project)
                                           .where(user: current_user,
                                                  projects: {
-                                                   course_edition_id: CourseEdition.where(recurrent_edition: @course_edition.recurrent_edition)
+                                                   course_edition_id: CourseEdition.descendants_of(@course_edition.recurrent_edition)
                                                  })
                                           .any?
+                         end
       apply_filters
       apply_ordering
       paginate_projects

app/models/course_edition.rb

@@ -223,6 +223,11 @@ class CourseEdition < ApplicationRecord
     where(recurrent: false)
   })
 
+  # Descendants of recurrent course edition
+  scope :descendants_of, lambda { |course_edition|
+    where(recurrent_edition: course_edition)
+  }
+
   def display_name
     "#{course.name} #{name}"
   end

app/models/project.rb

@@ -84,7 +84,7 @@ class Project < ApplicationRecord
   before_update :unset_approved_at, if: (-> { status_changed?(to: 'rejected') })
 
   def assign_to_recurrent_editions
-    CourseEdition.where(recurrent_edition_id: course_edition.id).find_each do |course_edition|
+    CourseEdition.descendants_of(course_edition).find_each do |course_edition|
       if periods.select { |period| period.id == course_edition.active_period.id }.any?
         copy_project(course_edition)
       end
@@ -412,7 +412,7 @@ class Project < ApplicationRecord
   def set_approved_at
     self.approved_at = updated_at
     unless !course_edition.recurrent ||
-           Project.where(original_project: self, course_edition: CourseEdition.where(recurrent_edition: course_edition)).any?
+           Project.where(original_project: self, course_edition: CourseEdition.descendants_of(course_edition)).any?
       assign_to_recurrent_editions
     end
   end

app/views/admin/course_editions/show/_periods.html.erb

@@ -188,8 +188,8 @@
             <td><%= period.starts_at %></td>
             <td><%= period.ends_at %></td>
             <td>
-              <% if CourseEdition.where(recurrent_edition_id: @course_edition.id).where(active_period: period).any? %>
-                <% CourseEdition.where(recurrent_edition_id: @course_edition.id)
+              <% if CourseEdition.descendants_of(@course_edition).where(active_period: period).any? %>
+                <% CourseEdition.descendants_of(@course_edition)
                                 .where(active_period: period)
                                 .includes(:course)
                                 .each do |e| %>

app/views/generic_projects/_form.html.erb

@@ -8,9 +8,8 @@
       <br/>
       If you want the changes to also apply to current instances of the <%= @project_name %>, you can select them here:
       <%= f.collection_select :projects_modify,
-                              Project.where(course_edition: CourseEdition.where(recurrent_edition_id: @specific_project.course_edition.id), original_project_id: @project.id)
-                                     .accessible_by(current_ability, :update)
-,
+                              Project.where(course_edition: CourseEdition.descendants_of(@specific_project.course_edition), original_project_id: @project.id)
+                                     .accessible_by(current_ability, :update),
                               :id,
                               ->(project) { "#{project.name} (#{project.course_edition.display_name})" },
                               { required: false, hide_label: true },