fixing n+1 and tests

Author: loiswells97

app/controllers/api/school_classes_controller.rb

@@ -7,13 +7,19 @@ class SchoolClassesController < ApiController
     before_action :load_and_authorize_school_class
 
     def index
-      school_classes = @school.classes.accessible_by(current_ability)
-      school_classes = school_classes.joins(:teachers).where(teachers: { teacher_id: current_user.id }) if params[:my_classes] == 'true'
+      if current_user&.school_teacher?(@school) || current_user&.school_owner?(@school)
+        school_classes = @school.classes.accessible_by(current_ability).includes(:lessons)
+      else
+        school_classes = @school.classes.accessible_by(current_ability)
+      end
+
+      school_classes = school_classes.joins(:teachers).where(teachers: { teacher_id: current_user&.id }) if params[:my_classes] == 'true'
       @school_classes_with_teachers = school_classes.with_teachers
+
       if current_user&.school_teacher?(@school) || current_user&.school_owner?(@school)
         render :teacher_index, formats: [:json], status: :ok
       else
-        render :index, formats: [:json], status: :ok
+        render :student_index, formats: [:json], status: :ok
       end
     end
 

app/views/api/school_teachers/_school_teacher.json.jbuilder

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-json.call(teacher, :id, :name)
-json.type('teacher')
+if teacher.present?
+  json.call(teacher, :id, :name)
+  json.type('teacher')
 
-include_email = local_assigns.fetch(:include_email, true)
+  include_email = local_assigns.fetch(:include_email, true)
 
-json.email(teacher.email) if include_email
+  json.email(teacher.email) if include_email
+end