fetch commit

Author: Chinzzii

app/controllers/teams_controller.rb

@@ -39,26 +39,30 @@ def members
   end
 
   # POST /teams/:id/members
-  # Adds a new member to the team unless it's already full
+  # Adds a new member to the team.
   def add_member
-    return render json: { errors: ['Team is full'] }, status: :unprocessable_entity if @team.full?
-
+    # Find the user specified in the request.
     user = User.find(team_participant_params[:user_id])
-    participant = Participant.find_by(user: user, parent_id: @team.parent_id)
 
+    # Determine the correct type of participant (Assignment or Course) based on the team type.
+    participant_class = @team.is_a?(AssignmentTeam) ? AssignmentParticipant : CourseParticipant
+    
+    # Find the specific participant record for this user in the team's context.
+    participant = participant_class.find_by(user_id: user.id, parent_id: @team.parent_id)
+
+    # If no participant record exists, the user isn't part of the assignment/course.
     unless participant
-      return render json: { error: 'Participant not found for this team context' }, status: :not_found
+      return render json: { errors: ["#{user.name} is not a participant in this context."] }, status: :unprocessable_entity
     end
 
-    teams_participants = @team.teams_participants.build(participant: participant, user: participant.user)
+    # Delegate the add operation to the Team model with the found participant.
+    result = @team.add_member(participant)
 
-    if teams_participants.save
-      render json: participant.user, serializer: UserSerializer, status: :created
+    if result[:success]
+      render json: user, serializer: UserSerializer, status: :created
     else
-      render json: { errors: teams_participants.errors.full_messages }, status: :unprocessable_entity
+      render json: { errors: [result[:error]] }, status: :unprocessable_entity
     end
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: 'User not found' }, status: :not_found
   end
 
   # DELETE /teams/:id/members/:user_id

app/models/mentored_team.rb

@@ -14,16 +14,14 @@ def mentor
   alias_method :mentor_user, :mentor
 
   # Adds members to the team who are not mentors
-  def add_member(user)
-    participant = assignment.participants.find_by(user_id: user.id)
-    return false if participant&.duty&.name&.downcase&.include?('mentor')
-
-    res = super(user)
-    if res.is_a?(Hash)
-      res[:success]
-    else
-      !!res
+  def add_member(participant)
+    # Fail fast if the participant's duty is 'mentor'.
+    if participant.duty&.name&.downcase&.include?('mentor')
+      return { success: false, error: 'Mentors cannot be added as regular members.' }
     end
+
+    # If not a mentor, proceed with the standard add_member logic.
+    super(participant)
   end
 
   # Assigning a user as mentor of the team
@@ -44,7 +42,7 @@ def assign_mentor(user)
 
     participant.save!
 
-    if participant.duty != duty
+    unless participant.duty == duty
       participant.duty = duty
       participant.save!
     end

app/models/team.rb

@@ -45,36 +45,21 @@ def participant_on_team?(participant)
     scope.teams.any? { |team| team.participants.include?(participant) }
   end
 
-  # Adds participant in the team
-  def add_member(participant_or_user)
-    participant =
-      case participant_or_user
-      when AssignmentParticipant, CourseParticipant
-        participant_or_user
-      when User
-        participant_type = is_a?(AssignmentTeam) ? AssignmentParticipant : CourseParticipant
-        participant_type.find_by(user_id: participant_or_user.id, parent_id: parent_id)
-      else
-        nil
-      end
-
-    return { success: false, error: "#{participant_or_user.name} is not a participant in this #{is_a?(AssignmentTeam) ? 'assignment' : 'course'}" } if participant.nil?
-    return { success: false, error: "Participant already on the team" } if participants.exists?(id: participant.id)
-    return { success: false, error: "Unable to add participant: team is at full capacity." } if full?
-
-    team_participant = TeamsParticipant.create(
-      participant_id: participant.id,
-      team_id: id,
-      user_id: participant.user_id
-    )
-
-    if team_participant.persisted?
-      { success: true }
-    else
-      { success: false, error: team_participant.errors.full_messages.join(', ') }
-    end
-  rescue StandardError => e
-    { success: false, error: e.message }
+  # Adds a participant to the team.
+  # This method now expects a Participant object directly.
+  def add_member(participant)
+    # Fail fast if the team is already full.
+    return { success: false, error: "Team is at full capacity." } if full?
+
+    # Check if this participant is already on a team in this context.
+    return { success: false, error: "Participant is already on a team for this context." } if participant_on_team?(participant)
+    
+    # Use create! to add the participant to the team.
+    teams_participants.create!(participant: participant, user: participant.user)
+    { success: true }
+  rescue ActiveRecord::RecordInvalid => e
+    # Catch potential validation errors from TeamsParticipant.
+    { success: false, error: e.record.errors.full_messages.join(', ') }
   end
 
   # Determines whether a given participant is eligible to join the team.

config/database.yml

@@ -13,7 +13,7 @@ default: &default
   adapter: mysql2
   encoding: utf8mb4
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: dev
+  username: root
   password: expertiza
   host: <%= ENV.fetch("DB_HOST", "localhost") %>
   port: <%= ENV.fetch("DB_PORT", "3306") %>