+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index c2ae428631d..e573ebc667b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -664,5 +664,11 @@
post '/sample_reviews/unmap/:id' => 'sample_reviews#unmap_from_assignment'
post 'student_task/publishing_rights_update', controller: :student_task, action: :publishing_rights_update, method: :put
get 'student_view/flip_view', controller: :student_view, action: :flip_view
+
+ get 'get_dates', controller: :mentor_meeting, action: :get_dates
+ post 'add_date', controller: :mentor_meeting, action: :add_date
+ patch 'edit_date', controller: :mentor_meeting, action: :edit_date
+ post 'delete_date', controller: :mentor_meeting, action: :delete_date
+
# updated route and added specific controller action upon accessing this route
end
diff --git a/db/migrate/20240318185959_create_mentor_meetings.rb b/db/migrate/20240318185959_create_mentor_meetings.rb
new file mode 100644
index 00000000000..bf06e112232
--- /dev/null
+++ b/db/migrate/20240318185959_create_mentor_meetings.rb
@@ -0,0 +1,18 @@
+class CreateMentorMeetings < ActiveRecord::Migration[5.1]
+ def self.up
+ create_table :mentor_meetings do |t|
+ t.column :team_id, :integer, null: false
+ t.column :assignment_id, :integer, null: false
+ t.column :meeting_date, :string, null: false
+ end
+
+ execute "ALTER TABLE `mentor_meetings`
+ ADD CONSTRAINT `fk_mentor_meetings_mapping_team`
+ FOREIGN KEY (team_id) references teams(id)"
+
+ execute "ALTER TABLE `mentor_meetings`
+ ADD CONSTRAINT `fk_mentor_meetings_mapping_assignment`
+ FOREIGN KEY (assignment_id) references assignments(id)"
+
+ end
+end
diff --git a/db/migrate/20240318200827_remove_assignment_id_from_mentor_meetings.rb b/db/migrate/20240318200827_remove_assignment_id_from_mentor_meetings.rb
new file mode 100644
index 00000000000..e7d1c6a6911
--- /dev/null
+++ b/db/migrate/20240318200827_remove_assignment_id_from_mentor_meetings.rb
@@ -0,0 +1,9 @@
+class RemoveAssignmentIdFromMentorMeetings < ActiveRecord::Migration[5.1]
+ def up
+ # Remove the foreign key constraint
+ execute "ALTER TABLE `mentor_meetings` DROP FOREIGN KEY `fk_mentor_meetings_mapping_assignment`"
+
+ # Remove the column
+ remove_column :mentor_meetings, :assignment_id
+ end
+end
diff --git a/spec/controllers/mentor_meeting_controller_spec.rb b/spec/controllers/mentor_meeting_controller_spec.rb
new file mode 100644
index 00000000000..ce346c536e9
--- /dev/null
+++ b/spec/controllers/mentor_meeting_controller_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+RSpec.describe MentorMeetingController, type: :controller do
+ describe 'POST #add_date' do
+ it 'creates a new meeting date and triggers a notification' do
+ expect {
+ post :add_date, params: { team_id: 1, meeting_date: '2024-11-01' }
+ }.to change(MentorMeeting, :count).by(1)
+
+ expect(response.status).to eq(200)
+ expect(JSON.parse(response.body)['status']).to eq('success')
+ end
+ end
+
+ describe 'PATCH #edit_date' do
+ it 'updates the meeting date' do
+ mentor_meeting = MentorMeeting.create!(team_id: 1, meeting_date: '2024-11-01')
+ patch :edit_date, params: { team_id: 1, old_date: '2024-11-01', new_date: '2024-11-02' }
+
+ expect(response.status).to eq(200)
+ expect(JSON.parse(response.body)['status']).to eq('success')
+ expect(mentor_meeting.reload.meeting_date).to eq('2024-11-02')
+ end
+ end
+
+ describe 'DELETE #delete_date' do
+ it 'deletes the meeting date' do
+ mentor_meeting = MentorMeeting.create!(team_id: 1, meeting_date: '2024-11-01')
+ expect {
+ delete :delete_date, params: { team_id: 1, meeting_date: '2024-11-01' }
+ }.to change(MentorMeeting, :count).by(-1)
+
+ expect(response.status).to eq(200)
+ expect(JSON.parse(response.body)['status']).to eq('success')
+ end
+ end
+end
diff --git a/spec/factories/factories.rb b/spec/factories/factories.rb
index c359e784672..2765ebf380c 100644
--- a/spec/factories/factories.rb
+++ b/spec/factories/factories.rb
@@ -761,4 +761,10 @@
ta_id 1
course_id 1
end
+
+factory :meeting_date, class: MeetingDate do
+ date { Date.today } # Default to today's date
+ team # Assumes you have a team association set up
+ end
+
end
diff --git a/spec/models/mentor_management_spec.rb b/spec/models/mentor_management_spec.rb
index 1a818eafdb4..2df9240b480 100644
--- a/spec/models/mentor_management_spec.rb
+++ b/spec/models/mentor_management_spec.rb
@@ -1,3 +1,5 @@
+#require 'rails_helper'
+
describe MentorManagement do
# using let! so that state is automatically set up before each example group
# this could also be accomplished with before(:each) and instance methods
@@ -165,6 +167,14 @@
# There should be no assigning of mentors
expect(Team).to receive(:add_member).exactly(0).times
end
+
+ describe '#update_mentor_state' do
+ it 'does not assign if `auto_assign_mentor` is false' do
+ no_mentor_assignment = create(:assignment, auto_assign_mentor: false)
+
+ expect(Team).not_to receive(:add_member)
+ MentorManagement.assign_mentor(no_mentor_assignment.id, team.id)
+ end
end
context 'when the assignment or team already have a topic' do
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
index 146d3e6bfea..c7adab57cc6 100644
--- a/spec/models/team_spec.rb
+++ b/spec/models/team_spec.rb
@@ -97,14 +97,45 @@
context 'when parameterized user did not join in current team yet' do
context 'when current team is not full' do
- it 'does not raise an error' do
+ before do
allow_any_instance_of(Team).to receive(:user?).with(user).and_return(false)
allow_any_instance_of(Team).to receive(:full?).and_return(false)
allow(TeamsUser).to receive(:create).with(user_id: 1, team_id: 1).and_return(team_user)
allow(TeamNode).to receive(:find_by).with(node_object_id: 1).and_return(double('TeamNode', id: 1))
allow_any_instance_of(Team).to receive(:add_participant).with(1, user).and_return(double('Participant'))
+ end
+
+ it 'sends mail to mentor if user is a mentor' do
+ allow(MentorManagement).to receive(:user_a_mentor?).with(user).and_return(true)
+ allow(Assignment).to receive(:find).with(1).and_return(assignment)
+ allow(MailerHelper).to receive(:send_team_confirmation_mail_to_user).and_return(double('Mail', deliver: true))
+
+ expect(MailerHelper).to receive(:send_team_confirmation_mail_to_user).with(user, "[Expertiza] Added to a Team", "mentor_added_to_team", "#{team.name}", "").and_return(double('Mail', deliver: true))
+
+ expect(team.add_member(user)).to be true
+ end
+
+ it 'sends mail to user if the user is a participant only' do
+ allow(MentorManagement).to receive(:user_a_mentor?).with(user).and_return(false)
+ allow(Assignment).to receive(:find).with(1).and_return(assignment)
+ allow(MailerHelper).to receive(:send_team_confirmation_mail_to_user).and_return(double('Mail', deliver: true))
+
+ expect(MailerHelper).to receive(:send_team_confirmation_mail_to_user).with(user, "[Expertiza] Added to a Team", "user_added_to_team", "#{team.name}", "").and_return(double('Mail', deliver: true))
+ expect(team.add_member(user)).to be true
+
+ end
+
+ it 'sends dual-role mail if the user is both a mentor and a participant' do
+ allow(MentorManagement).to receive(:user_a_mentor?).with(user).and_return(true)
+ allow(user).to receive(:is_a?).with(Participant).and_return(true)
+ allow(Assignment).to receive(:find).with(1).and_return(assignment)
+ allow(MailerHelper).to receive(:send_team_confirmation_mail_to_user).and_return(double('Mail', deliver: true))
+
+ expect(MailerHelper).to receive(:send_team_confirmation_mail_to_user).with(user, "[Expertiza] Added to a Team", "dual_role_added_to_team", "#{team.name}", "").and_return(double('Mail', deliver: true))
+
expect(team.add_member(user)).to be true
end
+
end
end
end