Revert "WIP: change models to allow multiple teachers"

This reverts commit c89b30b.

Author: loiswells97

app/controllers/api/class_members_controller.rb

@@ -13,10 +13,6 @@ def index
 
       if result.success?
         @class_members = result[:class_members]
-        puts "the class members are:"
-        @class_members.each do |class_member|
-          pp class_member
-        end
         render :index, formats: [:json], status: :ok
       else
         render json: { error: result[:error] }, status: :unprocessable_entity

app/controllers/api/school_classes_controller.rb

@@ -12,15 +12,15 @@ def index
     end
 
     def show
-      @school_class_with_teachers = @school_class.with_teachers
+      @school_class_with_teacher = @school_class.with_teacher
       render :show, formats: [:json], status: :ok
     end
 
     def create
       result = SchoolClass::Create.call(school: @school, school_class_params:)
 
       if result.success?
-        @school_class_with_teachers = result[:school_class].with_teachers
+        @school_class_with_teacher = result[:school_class].with_teacher
         render :show, formats: [:json], status: :created
       else
         render json: { error: result[:error] }, status: :unprocessable_entity
@@ -32,7 +32,7 @@ def update
       result = SchoolClass::Update.call(school_class:, school_class_params:)
 
       if result.success?
-        @school_class_with_teachers = result[:school_class].with_teachers
+        @school_class_with_teacher = result[:school_class].with_teacher
         render :show, formats: [:json], status: :ok
       else
         render json: { error: result[:error] }, status: :unprocessable_entity

app/models/ability.rb

@@ -74,12 +74,7 @@ def define_school_teacher_abilities(user:, school:)
     can(%i[read], School, id: school.id)
     can(%i[read], :school_member)
     can(%i[create], SchoolClass, school: { id: school.id })
-    # can(%i[read update destroy], SchoolClass) do |school_class|
-    #   school_class.school.id == school.id && school_class.teacher_ids.include?(user.id)
-    # end
-    #  can read update or destroy the class if user is one of the teachers of the class
-    # can(%i[read update destroy], SchoolClass, school: { id: school.id }, teacher_ids: )
-    can(%i[read update destroy], SchoolClass, id: SchoolClass.with_class_teacher(user.id).select(:id), school: { id: school.id })
+    can(%i[read update destroy], SchoolClass, school: { id: school.id }, teacher_id: user.id)
     can(%i[read create create_batch destroy], ClassMember,
         school_class: { school: { id: school.id }, teacher_id: user.id })
     can(%i[read], :school_owner)

app/models/class_student.rb renamed to app/models/class_member.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ClassStudent < ApplicationRecord
+class ClassMember < ApplicationRecord
   belongs_to :school_class
   delegate :school, to: :school_class
   attr_accessor :student

app/models/class_teacher.rb

@@ -2,43 +2,35 @@
 
 class SchoolClass < ApplicationRecord
   belongs_to :school
-  has_many :students, class_name: :ClassStudent, inverse_of: :school_class, dependent: :destroy
-  has_many :class_teachers, class_name: :ClassTeacher, inverse_of: :school_class, dependent: :destroy
+  has_many :members, class_name: :ClassMember, inverse_of: :school_class, dependent: :destroy
   has_many :lessons, dependent: :nullify
-  accepts_nested_attributes_for :class_teachers
 
-  scope :with_class_teacher, ->(user_id) { joins(:class_teachers).where(class_teachers: { id: user_id }) }
-
-  # validates :teacher_id, presence: true
+  validates :teacher_id, presence: true
   validates :name, presence: true
-  # validate :teacher_has_the_school_teacher_role_for_the_school
+  validate :teacher_has_the_school_teacher_role_for_the_school
 
   def self.teachers
-    User.from_userinfo(ids: ClassTeacher.pluck(:teacher_id))
+    User.from_userinfo(ids: pluck(:teacher_id))
   end
 
   def self.with_teachers
     by_id = teachers.index_by(&:id)
-    all.map { |instance| [instance, instance.teacher_ids.map { |teacher_id| by_id[teacher_id] }] }
-  end
-
-  def teacher_ids
-    class_teachers.pluck(:teacher_id)
+    all.map { |instance| [instance, by_id[instance.teacher_id]] }
   end
 
-  def with_teachers
-    [self, User.from_userinfo(ids: teacher_ids)]
+  def with_teacher
+    [self, User.from_userinfo(ids: teacher_id).first]
   end
 
-  # private
+  private
 
-  # def teacher_has_the_school_teacher_role_for_the_school
-  #   return unless teacher_id_changed? && errors.blank?
+  def teacher_has_the_school_teacher_role_for_the_school
+    return unless teacher_id_changed? && errors.blank?
 
-  #   user = User.new(id: teacher_id)
-  #   return if user.school_teacher?(school)
+    user = User.new(id: teacher_id)
+    return if user.school_teacher?(school)
 
-  #   msg = "'#{teacher_id}' does not have the 'school-teacher' role for organisation '#{school.id}'"
-  #   errors.add(:user, msg)
-  # end
+    msg = "'#{teacher_id}' does not have the 'school-teacher' role for organisation '#{school.id}'"
+    errors.add(:user, msg)
+  end
 end

app/models/school_class.rb

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
-json.array!(@school_classes_with_teachers) do |school_class, teachers|
+json.array!(@school_classes_with_teachers) do |school_class, teacher|
   json.call(
     school_class,
     :id,
     :description,
     :school_id,
+    :teacher_id,
     :name,
     :created_at,
     :updated_at
   )
 
-  json.teachers(teachers) do |teacher|
-    json.call(
-      teacher,
-      :id,
-      :name
-    )
-  end
+  json.teacher_name(teacher&.name)
 end

app/views/api/school_classes/index.json.jbuilder

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
-school_class, teachers = @school_class_with_teachers
+school_class, teacher = @school_class_with_teacher
 
 json.call(
   school_class,
   :id,
   :description,
   :school_id,
+  :teacher_id,
   :name,
   :created_at,
   :updated_at
 )
 
-json.teachers(teachers) do |teacher|
-  json.call(
-    teacher,
-    :id,
-    :name
-  )
-end
+json.teacher_name(teacher&.name)