pupilfirst · bodhish · Jul 20, 2023 · May 28, 2023 · May 28, 2023 · May 28, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
       - "docs/**"
 env:
   PF_IMAGE_NAME: pupilfirst
-  PF_VERSION: "2023.1"
+  PF_VERSION: "2023.2"
   YARN_CHECKSUM_BEHAVIOR: ignore
 jobs:
   tests:

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -15,7 +15,6 @@ class ApplicationController < ActionController::Base
   helper_method :avatar
   helper_method :current_host
   helper_method :current_school
-  helper_method :current_founder
   helper_method :current_coach
   helper_method :current_school_admin
 
@@ -89,29 +88,6 @@ def current_coach
     @current_coach ||= current_user&.faculty
   end
 
-  def current_founder
-    @current_founder ||=
-      begin
-        if current_user.present?
-          founder_id = read_cookie(:founder_id)
-
-          # Founders in current school for the user
-          founders = current_user.founders
-
-          # Try to select founder from value stored in cookie.
-          founder =
-            if founder_id.present?
-              founders.not_dropped_out.find_by(id: founder_id)
-            else
-              nil
-            end
-
-          # Return selected founder, if any, or return the first founder (if any).
-          founder.presence || founders.not_dropped_out.first
-        end
-      end
-  end
-
   def current_school_admin
     @current_school_admin ||=
       begin
@@ -158,10 +134,9 @@ def observable_redirect_to(url)
   def pundit_user
     OpenStruct.new(
       current_user: current_user,
-      current_founder: current_founder,
       current_school: current_school,
       current_coach: current_coach,
-      current_school_admin: current_school_admin,
+      current_school_admin: current_school_admin
     )
   end
 
@@ -203,15 +178,6 @@ def sign_out_if_required
     redirect_to root_url if service.signed_out?
   end
 
-  def authenticate_founder!
-    # User must be logged in.
-    authenticate_user!
-
-    return if current_founder.present? && !current_founder.dropped_out_at?
-
-    redirect_to root_path
-  end
-
   def storable_location?
     non_html_response =
       destroy_user_session_path ||
@@ -230,7 +196,7 @@ def store_user_location
 
   def avatar(
     name,
-    founder: nil,
+    student: nil,
     faculty: nil,
     version: :mid,
     background_shape: :circle
@@ -239,15 +205,15 @@ def avatar(
       return helpers.image_tag(faculty.image).html_safe
     end
 
-    if founder.present? && founder.avatar.attached?
-      return helpers.image_tag(founder.avatar_variant(version)).html_safe
+    if student.present? && student.avatar.attached?
+      return helpers.image_tag(student.avatar_variant(version)).html_safe
     end
 
     Scarf::InitialAvatar
       .new(
         name,
         font_family: ["Source Sans Pro", "sans-serif"],
-        background_shape: background_shape,
+        background_shape: background_shape
       )
       .svg
       .html_safe
@@ -258,7 +224,7 @@ def domain_redirection_required?
 
     return false if current_domain.primary? || current_school.domains.one?
     !Schools::Configuration.new(
-      current_school,
+      current_school
     ).disable_primary_domain_redirection?
   end
 

diff --git a/app/controllers/concerns/discord_account_requirable.rb b/app/controllers/concerns/discord_account_requirable.rb
@@ -8,7 +8,7 @@ def require_discord_account
 
     # Redirect only if the user is an active student in the course.
     unless current_user
-             .founders
+             .students
              .joins(cohort: :course)
              .where(courses: { id: course.id })
              .merge(Cohort.active)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
@@ -115,7 +115,7 @@ def find_course
   def save_tag
     return if params[:tag].blank?
 
-    if params[:tag].in?(current_school.founder_tag_list)
+    if params[:tag].in?(current_school.student_tag_list)
       session[:applicant_tag] = params[:tag]
     end
   end

diff --git a/app/controllers/organisations/students_controller.rb b/app/controllers/organisations/students_controller.rb
@@ -5,13 +5,13 @@ class StudentsController < ApplicationController
 
     # GET /org/students/:id
     def show
-      student = authorize Founder.find(params[:id])
+      student = authorize Student.find(params[:id])
       @presenter = StudentPresenter.new(view_context, student)
     end
 
     # GET /org/students/:id/submissions
     def submissions
-      student = authorize Founder.find(params[:id])
+      student = authorize Student.find(params[:id])
       @presenter = StudentPresenter.new(view_context, student)
       raise_not_found if @presenter.reviewed_submissions.empty?
     end

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
@@ -48,8 +48,8 @@ def prepare_courses
 
         course[:active_students] = @organisation
           .users
-          .joins(:founders)
-          .where(founders: { cohort_id: cohort_ids })
+          .joins(:students)
+          .where(students: { cohort_id: cohort_ids })
           .distinct
           .count
 
@@ -65,9 +65,9 @@ def prepare_counts
     scope = @organisation.users
 
     {
-      total_students: scope.joins(:founders).distinct.count,
+      total_students: scope.joins(:students).distinct.count,
       active_students:
-        scope.joins(founders: :cohort).merge(Cohort.active).distinct.count
+        scope.joins(students: :cohort).merge(Cohort.active).distinct.count
     }
   end
 end
diff --git a/app/controllers/founders_controller.rb → app/controllers/students_controller.rb b/app/controllers/founders_controller.rb → app/controllers/students_controller.rb
@@ -1,7 +1,7 @@
-class FoundersController < ApplicationController
+class StudentsController < ApplicationController
   # GET /students/:id/report
   def report
-    student = authorize(Founder.find(params[:id]))
+    student = authorize(Student.find(params[:id]))
     @course = student.course
     render html: '', layout: 'app_router'
   end

diff --git a/app/controllers/targets_controller.rb b/app/controllers/targets_controller.rb
@@ -16,7 +16,7 @@ def show
   def details_v2
     student =
       current_user
-        .founders
+        .students
         .joins(:course)
         .where(courses: { id: @course.id })
         .first if current_user.present?

diff --git a/app/forms/schools/coaches/update_form.rb b/app/forms/schools/coaches/update_form.rb
@@ -59,7 +59,7 @@ def faculty
 
       def clear_faculty_enrollments
         FacultyCohortEnrollment.where(faculty: faculty).destroy_all
-        FacultyFounderEnrollment.where(faculty: faculty).destroy_all
+        FacultyStudentEnrollment.where(faculty: faculty).destroy_all
       end
     end
   end

diff --git a/app/graphql/concerns/query_authorize_coach.rb b/app/graphql/concerns/query_authorize_coach.rb
@@ -7,6 +7,6 @@ def query_authorized?
 
     return false if course&.school != current_school
 
-    current_user.faculty.cohorts.exists?(id: submission.founders.first.cohort)
+    current_user.faculty.cohorts.exists?(id: submission.students.first.cohort)
   end
 end
diff --git a/app/graphql/concerns/query_authorize_community_user.rb b/app/graphql/concerns/query_authorize_community_user.rb
@@ -12,7 +12,7 @@ def authorized_create?
 
     # User should have access to the community
     current_user
-      .founders
+      .students
       .includes(:course)
       .where(courses: { id: community.courses })
       .any?

diff --git a/app/graphql/concerns/query_authorize_student.rb b/app/graphql/concerns/query_authorize_student.rb
@@ -7,7 +7,7 @@ def query_authorized?
     # Has access to school
     return false unless course&.school == current_school && student.present?
 
-    # Founder has access to the course
+    # Student has access to the course
     return false unless !student.cohort.ended?
 
     # Level must be accessible.
@@ -28,7 +28,7 @@ def target_can_be_completed?
   def student
     @student ||=
       current_user
-        .founders
+        .students
         .joins(:level)
         .where(levels: { course_id: course })
         .first
@@ -44,7 +44,7 @@ def target
 
   def students
     if target.team_target? && student.team.exists?
-      student.team.founders
+      student.team.students
     else
       [student]
     end

diff --git a/app/graphql/concerns/validate_course_export.rb b/app/graphql/concerns/validate_course_export.rb
@@ -15,7 +15,7 @@ class RequireValidTags < GraphQL::Schema::Validator
     def validate(_object, _context, value)
       course = Course.find_by(id: value[:course_id])
       current_school = course&.school
-      tags = current_school.founder_tags.where(id: value[:tag_ids])
+      tags = current_school.student_tags.where(id: value[:tag_ids])
       return if value[:tag_ids].count == tags.count
       I18n.t("mutations.export_course_report.tag_not_found_error")
     end

diff --git a/app/graphql/concerns/validate_student_submission.rb b/app/graphql/concerns/validate_student_submission.rb
@@ -7,7 +7,7 @@ def validate(_object, context, value)
       course = target.course
       student =
         context[:current_user]
-          .founders
+          .students
           .joins(:level)
           .where(levels: { course_id: course })
           .first

diff --git a/app/graphql/concerns/validate_submission_gradable.rb b/app/graphql/concerns/validate_submission_gradable.rb
@@ -14,7 +14,7 @@ def validate(_object, _context, value)
       submission_review_allowed =
         (days_since_submission < submission_review_allowed_days)
 
-      if (submission.founders.active.empty? && !submission_review_allowed)
+      if (submission.students.active.empty? && !submission_review_allowed)
         return(
           I18n.t('validate_submission_gradable.owners_should_be_active.error')
         )

diff --git a/app/graphql/mutations/create_course_export.rb b/app/graphql/mutations/create_course_export.rb
@@ -42,7 +42,7 @@ def resolve(_params)
     end
 
     def tags
-      @tags ||= current_school.founder_tags.where(id: @params[:tag_ids])
+      @tags ||= current_school.student_tags.where(id: @params[:tag_ids])
     end
 
     def cohorts

diff --git a/app/graphql/mutations/create_grading.rb b/app/graphql/mutations/create_grading.rb
@@ -240,7 +240,7 @@ def allow_token_auth?
     end
 
     def update_coach_note
-      submission.founders.each do |student|
+      submission.students.each do |student|
         CoachNote.create!(
           note: @params[:note],
           author_id: current_user.id,

diff --git a/app/graphql/mutations/create_student_from_applicant.rb b/app/graphql/mutations/create_student_from_applicant.rb
@@ -23,7 +23,7 @@ def resolve(_params)
     end
 
     def convert_applicant
-      Founder.transaction do
+      Student.transaction do
         student =
           Applicants::CreateStudentService.new(applicant).create(@params[:tags])
 

diff --git a/app/graphql/mutations/create_students.rb b/app/graphql/mutations/create_students.rb
@@ -74,7 +74,7 @@ def emails_must_be_valid
 
       def soft_limit_student_count
         if @cohort.blank? || @cohort.course.blank? ||
-             @cohort.course.founders.count < 100_000
+             @cohort.course.students.count < 100_000
           return
         end
 

diff --git a/app/graphql/mutations/create_team.rb b/app/graphql/mutations/create_team.rb
@@ -46,7 +46,7 @@ def size_grater_than_two
 
       def students_should_belong_to_the_same_cohort
         if @cohort
-             .founders
+             .students
              .where(id: @value[:student_ids], team_id: nil)
              .count == @value[:student_ids].count
           return
@@ -71,7 +71,7 @@ def create_team
     end
 
     def students
-      @students ||= cohort.founders.where(id: @params[:student_ids])
+      @students ||= cohort.students.where(id: @params[:student_ids])
     end
 
     def cohort

diff --git a/app/graphql/mutations/create_topic.rb b/app/graphql/mutations/create_topic.rb
@@ -78,11 +78,11 @@ def topic_category
     def create_subscribers(topic)
       users =
         User
-          .joins(faculty: :faculty_founder_enrollments)
+          .joins(faculty: :faculty_student_enrollments)
           .where(
             faculty: {
-              faculty_founder_enrollments: {
-                founder_id: current_user.founders.active
+              faculty_student_enrollments: {
+                student_id: current_user.students.active
               }
             }
           )
@@ -107,7 +107,7 @@ def target
     def target_accessible?(some_target)
       current_school_admin.present? || current_user.faculty.present? ||
         current_user
-          .founders
+          .students
           .joins(:course)
           .exists?(courses: { id: some_target.course.id })
     end

diff --git a/app/graphql/mutations/destroy_team.rb b/app/graphql/mutations/destroy_team.rb
@@ -21,7 +21,7 @@ def resolve(_params)
 
     def destroy_team
       Team.transaction do
-        team.founders.each { |student| student.update!(team: nil) }
+        team.students.each { |student| student.update!(team: nil) }
         team.reload.destroy!
       end
     end

diff --git a/app/graphql/mutations/re_activate_student.rb b/app/graphql/mutations/re_activate_student.rb
@@ -20,7 +20,7 @@ def resolve(_params)
 
     class ValidateStudentStatus < GraphQL::Schema::Validator
       def validate(_object, _context, value)
-        @student = Founder.find_by(id: value[:id])
+        @student = Student.find_by(id: value[:id])
 
         return if @student.dropped_out_at?
 
@@ -37,7 +37,7 @@ def resource_school
     end
 
     def student
-      @student ||= Founder.find_by(id: @params[:id])
+      @student ||= Student.find_by(id: @params[:id])
     end
   end
 end
diff --git a/app/graphql/mutations/re_run_github_action.rb b/app/graphql/mutations/re_run_github_action.rb
@@ -21,7 +21,7 @@ class StudentHasAGithubAccount < GraphQL::Schema::Validator
       def validate(_object, _context, value)
         submission = TimelineEvent.find_by(id: value[:submission_id])
 
-        if submission.founders.first.github_repository.blank?
+        if submission.students.first.github_repository.blank?
           return I18n.t("mutations.re_run_github_action.validation_error.student_has_no_github_account")
         end
       end