Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app/models/advisement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class Advisement < ApplicationRecord
message: :advisement_professor_uniqueness
}

validate :main_advisor_authorization

after_create :notify_advisor

def to_label
Expand Down Expand Up @@ -89,4 +91,15 @@ def notify_advisor
]
Notifier.send_emails(notifications: emails)
end

def main_advisor_authorization
if professor && main_advisor && enrollment
has_authorization = professor.advisement_authorizations.
where(level: enrollment.level).
exists?
unless has_authorization
errors.add(:base, :main_advisor_should_has_level)
end
end
end
end
1 change: 1 addition & 0 deletions config/locales/advisement.pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pt-BR:
models:
advisement:
advisement_professor_uniqueness: "não pode ser orientador duas vezes da mesma matrícula"
main_advisor_should_has_level: "O orientador principal deve ter credenciamento no nivel da matrícula"

models:
advisement:
Expand Down
1 change: 0 additions & 1 deletion spec/factories/factory_advisement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
factory :advisement do
professor
enrollment
main_advisor { true }
end
end
4 changes: 4 additions & 0 deletions spec/features/advisements_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@

@destroy_all << FactoryBot.create(:dismissal, enrollment: @enrollment1, date: Date.today, dismissal_reason: @dismissal_reason)

@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor2, level: @level2)
@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level1)

@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment2, professor: @professor2, main_advisor: true)
@destroy_all << @record = FactoryBot.create(:advisement, enrollment: @enrollment3, professor: @professor1, main_advisor: true)
Expand Down
1 change: 1 addition & 0 deletions spec/features/class_enrollment_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
@destroy_all << @course_class7 = FactoryBot.create(:course_class, name: "Pesquisa", course: @course6, professor: @professor3, year: 2022, semester: 2)
@destroy_all << @course_class8 = FactoryBot.create(:course_class, name: "Programação", course: @course7, professor: @professor1, year: 2022, semester: 2)

@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << @sponsor1 = FactoryBot.create(:sponsor, name: "CNPq")
@destroy_all << @scholarship_type2 = FactoryBot.create(:scholarship_type, name: "Projeto")
Expand Down
1 change: 1 addition & 0 deletions spec/features/class_enrollments_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
@destroy_all << @course_class7 = FactoryBot.create(:course_class, name: "Pesquisa", course: @course6, professor: @professor3, year: 2022, semester: 2)
@destroy_all << @course_class8 = FactoryBot.create(:course_class, name: "Programação", course: @course7, professor: @professor1, year: 2022, semester: 2)

@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << @sponsor1 = FactoryBot.create(:sponsor, name: "CNPq")
@destroy_all << @scholarship_type2 = FactoryBot.create(:scholarship_type, name: "Projeto")
Expand Down
1 change: 1 addition & 0 deletions spec/features/enrollment_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
@destroy_all << @course_class7 = FactoryBot.create(:course_class, name: "Pesquisa", course: @course6, professor: @professor3, year: 2022, semester: 2)
@destroy_all << @course_class8 = FactoryBot.create(:course_class, name: "Programação", course: @course7, professor: @professor1, year: 2022, semester: 2)

@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << @sponsor1 = FactoryBot.create(:sponsor, name: "CNPq")
@destroy_all << @scholarship_type2 = FactoryBot.create(:scholarship_type, name: "Projeto")
Expand Down
1 change: 1 addition & 0 deletions spec/features/enrollments_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
@destroy_all << FactoryBot.create(:dismissal, enrollment: @enrollment2, date: 1.day.ago, dismissal_reason: @dismissal_reason2)

@destroy_all << @professor1 = FactoryBot.create(:professor, name: "Erica", cpf: "3")
@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << @sponsor1 = FactoryBot.create(:sponsor, name: "CNPq")
@destroy_all << @scholarship_type2 = FactoryBot.create(:scholarship_type, name: "Projeto")
Expand Down
1 change: 1 addition & 0 deletions spec/features/pendencies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
@destroy_all << @course_class7 = FactoryBot.create(:course_class, name: "Pesquisa", course: @course6, professor: @professor3, year: 0.years.ago.year, semester: YearSemester.current.semester)
@destroy_all << @course_class8 = FactoryBot.create(:course_class, name: "Programação", course: @course7, professor: @professor1, year: 0.years.ago.year, semester: YearSemester.current.semester)

@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)
@destroy_all << @sponsor1 = FactoryBot.create(:sponsor, name: "CNPq")
@destroy_all << @scholarship_type2 = FactoryBot.create(:scholarship_type, name: "Projeto")
Expand Down
1 change: 1 addition & 0 deletions spec/features/scholarship_durations_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@


@destroy_all << @professor1 = FactoryBot.create(:professor, name: "Erica", cpf: "3")
@destroy_all << FactoryBot.create(:advisement_authorization, professor: @professor1, level: @level2)
@destroy_all << FactoryBot.create(:advisement, enrollment: @enrollment1, professor: @professor1, main_advisor: true)

@destroy_all << @user = create_confirmed_user([@role_adm])
Expand Down
38 changes: 31 additions & 7 deletions spec/models/advisement_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@
it "should return the expected string" do
professor1_name = "Leonardo"
professor2_name = "Vanessa"
@destroy_later << professor0 = FactoryBot.create(:professor)
@destroy_later << professor1 = FactoryBot.create(:professor, name: professor1_name)
@destroy_later << professor2 = FactoryBot.create(:professor, name: professor2_name)
@destroy_later << advisement = FactoryBot.create(:advisement)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor0, level: level)
@destroy_later << advisement = FactoryBot.create(:advisement, professor: professor0, enrollment: enrollment)
@destroy_later << FactoryBot.create(:advisement, professor: professor1, enrollment: advisement.enrollment, main_advisor: false)
@destroy_later << FactoryBot.create(:advisement, professor: professor2, enrollment: advisement.enrollment, main_advisor: false)
expect(advisement.co_advisor_list).to eql("#{professor1_name} , #{professor2_name}")
Expand All @@ -71,37 +75,57 @@
describe "active" do
context "should return true when " do
it "the enrollment does not have a dismissal" do
@destroy_later << advisement = FactoryBot.create(:advisement)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << professor1 = FactoryBot.create(:professor)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor1, level: level)
@destroy_later << advisement = FactoryBot.create(:advisement, enrollment: enrollment, professor: professor1)
expect(advisement.active).to be_truthy
end
end
context "should return false when " do
it "the enrollment have a dismissal" do
@destroy_later << advisement = FactoryBot.create(:advisement)
@destroy_later << FactoryBot.create(:dismissal, enrollment: advisement.enrollment)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << professor1 = FactoryBot.create(:professor)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor1, level: level)
@destroy_later << advisement = FactoryBot.create(:advisement, enrollment: enrollment, professor: professor1)
@destroy_later << FactoryBot.create(:dismissal, enrollment: enrollment)
expect(advisement.active).to be_falsey
end
end
end
describe "co_advisor" do
context "should return true when " do
it "the enrollment have another advisement" do
@destroy_later << other_advisement = FactoryBot.create(:advisement)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << professor1 = FactoryBot.create(:professor)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor1, level: level)
@destroy_later << other_advisement = FactoryBot.create(:advisement, professor: professor1, enrollment: enrollment)
@destroy_later << FactoryBot.create(:advisement, enrollment: other_advisement.enrollment, main_advisor: false)
expect(other_advisement.co_advisor).to be_truthy
end
end
context "should return false when " do
it "the enrollment does not have another advisement" do
@destroy_later << advisement = FactoryBot.create(:advisement)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << professor1 = FactoryBot.create(:professor)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor1, level: level)
@destroy_later << advisement = FactoryBot.create(:advisement, professor: professor1, enrollment: enrollment, main_advisor: true)
expect(advisement.co_advisor).to be_falsey
end
end
end
describe "enrollment_has_advisors" do
context "should return true when " do
it "the enrollment have one advisement" do
@destroy_later << advisement = FactoryBot.create(:advisement)
@destroy_later << level = FactoryBot.create(:level)
@destroy_later << professor1 = FactoryBot.create(:professor)
@destroy_later << enrollment = FactoryBot.create(:enrollment, level: level)
@destroy_later << FactoryBot.create(:advisement_authorization, professor: professor1, level: level)
@destroy_later << advisement = FactoryBot.create(:advisement, professor: professor1, enrollment: enrollment, main_advisor: true)
expect(advisement.enrollment_has_advisors).to be_truthy
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/models/enrollment_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ def prepare_course_class(allocations, to_destroy, attributes = {})
@destroy_later << professor_role = FactoryBot.create(:role_professor)
@destroy_scenario << @advisor = FactoryBot.create(:professor)
@destroy_scenario << @user = FactoryBot.create(:user, roles: [professor_role], professor: @advisor)
@destroy_scenario << FactoryBot.create(:advisement_authorization, professor: @advisor, level: @level)
@destroy_scenario << FactoryBot.create(:advisement, professor: @advisor, enrollment: enrollment3)
@destroy_scenario << course1 = FactoryBot.create(:course, course_type: @course_type)
@destroy_scenario << course2 = FactoryBot.create(:course, course_type: @course_type)
Expand Down
7 changes: 7 additions & 0 deletions spec/models/enrollment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@
expect(enrollment).not_to be_valid
expect(enrollment).to have_error(:main_advisor_uniqueness).on(:base)
end
it "has different level of his main advisor" do
professor = FactoryBot.build(:professor)
level = FactoryBot.build(:level)
professor.advisement_authorizations.build(level: level)
advisement = enrollment.advisements.build(professor: professor, main_advisor: true)
expect(advisement).to have_error(:main_advisor_should_has_level).on :base
end
end
end
describe "thesis_defense_date" do
Expand Down
Loading