|
diff --git a/app/views/users/index.js.erb b/app/views/users/index.js.erb
index e8f3fe9b5..64c531122 100644
--- a/app/views/users/index.js.erb
+++ b/app/views/users/index.js.erb
@@ -2,6 +2,15 @@ $('#resources-tbody').replaceWith('<%= escape_javascript(render("resources")) %>
$('#paginator .pagination').html('<%= escape_javascript(paginate(@users, :remote => true).to_s) %>');
$('#page_entries_info').html('<%= escape_javascript(page_entries_info(@users).to_s) %>');
+
+selected = $('#export_selected_selected_users').val().split(",");
+
+$('.selected_users').each(function() {
+ if (_.includes(selected, $(this).attr('value'))) {
+ $(this).prop('checked', true);
+ }
+})
+
$('.destroy-button').each(function() {
var search_by_name = $('#search_by_name').val();
var search_by_cpf = $('#search_by_cpf').val();
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index 981976dc2..8d44469c4 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -1,21 +1,23 @@
-if (Rails.application.secrets[:REDIS_MODE] == 'sentinel')
- config_redis = {
- url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SIDEKIQ]}",
- role: "master",
- sentinels: Rails.application.secrets[:REDIS_SENTINELS].split(";").map { |host| { host: host, port: 26379 }}
- }
-else
- config_redis = {
- url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SIDEKIQ]}"
- }
-end
+unless Rails.env.test? || Rails.env.development?
+ if (Rails.application.secrets[:REDIS_MODE] == 'sentinel')
+ config_redis = {
+ url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SIDEKIQ]}",
+ role: "master",
+ sentinels: Rails.application.secrets[:REDIS_SENTINELS].split(";").map { |host| { host: host, port: 26379 }}
+ }
+ else
+ config_redis = {
+ url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SIDEKIQ]}"
+ }
+ end
-$REDIS_DB = Redis.new(config_redis)
+ $REDIS_DB = Redis.new(config_redis)
-Sidekiq.configure_server do |config|
- config.redis = config_redis
-end
+ Sidekiq.configure_server do |config|
+ config.redis = config_redis
+ end
-Sidekiq.configure_client do |config|
- config.redis = config_redis
-end
\ No newline at end of file
+ Sidekiq.configure_client do |config|
+ config.redis = config_redis
+ end
+end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index ef9a609d2..b49788284 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,23 +1,26 @@
-if (Rails.application.secrets[:REDIS_MODE] == 'sentinel')
- redis_config = {
- servers: [{
- url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SESSION]}",
- role: "master",
- sentinels: Rails.application.secrets[:REDIS_SENTINELS].split(";").map { |host| { host: host, port: 26379 }},
- namespace: "sessions",
- expire_after: 2.days
- }],
- }
-else
- redis_config = {
- servers: [{
- url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SESSION]}"
- }],
- expire_after: 12.hours,
- key: "_#{Rails.application.class.parent_name.downcase}_session",
- threadsafe: true,
- secure: false
- }
-end
+unless Rails.env.test? || Rails.env.development?
+ if (Rails.application.secrets[:REDIS_MODE] == 'sentinel')
+ redis_config = {
+ servers: [{
+ url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SESSION]}",
+ role: "master",
+ sentinels: Rails.application.secrets[:REDIS_SENTINELS].split(";").map { |host| { host: host, port: 26379 }},
+ namespace: "sessions",
+ expire_after: 2.days
+ }],
+ }
+ else
+
+ redis_config = {
+ servers: [{
+ url: "#{Rails.application.secrets[:REDIS_URL]}#{Rails.application.secrets[:REDIS_DB_SESSION]}"
+ }],
+ expire_after: 12.hours,
+ key: "_#{Rails.application.class.parent_name.downcase}_session",
+ threadsafe: true,
+ secure: false
+ }
+ end
-Rails.application.config.session_store :redis_store, redis_config
\ No newline at end of file
+ Rails.application.config.session_store :redis_store, redis_config
+end
diff --git a/config/locales/models/absence_justification.yml b/config/locales/models/absence_justification.yml
index f30a8b2aa..ba5e0ea0c 100644
--- a/config/locales/models/absence_justification.yml
+++ b/config/locales/models/absence_justification.yml
@@ -10,6 +10,7 @@ pt-BR:
author_id: "Autor"
author: "Autor"
justification: "Justificativa"
+ school_calendar_id: "Calendário letivo"
absence_date: "Data inicial"
absence_date_end: "Data final"
students: "Alunos"
@@ -23,6 +24,10 @@ pt-BR:
author: "Autor"
class_number: "Aula"
period: "Turno"
+ teacher_id: "Professor"
+ legacy: "Antigo?"
+ user_id: "Usuário"
+ discarded_at: "Descartado?"
errors:
models:
diff --git a/config/locales/models/content_record.yml b/config/locales/models/content_record.yml
index be0f4a3b1..7bc20d51f 100644
--- a/config/locales/models/content_record.yml
+++ b/config/locales/models/content_record.yml
@@ -15,6 +15,8 @@ pt-BR:
daily_activities_record: "Registro das atividades"
contents: "Conteúdos"
contents_tags: "Adicionar novo"
+ teacher_id: "Professor(a)"
+ origin: "Origem"
errors:
models:
content_record:
diff --git a/config/locales/models/contents_lesson_plan.yml b/config/locales/models/contents_lesson_plan.yml
index 244fdc46c..d407879ee 100644
--- a/config/locales/models/contents_lesson_plan.yml
+++ b/config/locales/models/contents_lesson_plan.yml
@@ -2,4 +2,5 @@ pt-BR:
activerecord:
attributes:
contents_lesson_plan:
- content_id: "Conteúdo"
\ No newline at end of file
+ content_id: "Conteúdo"
+ position: "Posição"
diff --git a/config/locales/models/contents_teaching_plan.yml b/config/locales/models/contents_teaching_plan.yml
index eddc483b4..897546089 100644
--- a/config/locales/models/contents_teaching_plan.yml
+++ b/config/locales/models/contents_teaching_plan.yml
@@ -2,4 +2,5 @@ pt-BR:
activerecord:
attributes:
contents_teaching_plan:
- content_id: "Conteúdo"
\ No newline at end of file
+ content_id: "Conteúdo"
+ position: "Posição"
diff --git a/config/locales/models/daily_frequency_student.yml b/config/locales/models/daily_frequency_student.yml
index 9a4999398..2ce06192d 100644
--- a/config/locales/models/daily_frequency_student.yml
+++ b/config/locales/models/daily_frequency_student.yml
@@ -5,3 +5,5 @@ pt-BR:
student: "Aluno"
student_id: "Aluno"
present: "Presença"
+ absence_justification_student_id: "Justificativa de falta"
+ type_of_teaching: "Modalidade de ensino"
diff --git a/config/locales/models/descriptive_exam.yml b/config/locales/models/descriptive_exam.yml
index 5e0e6f491..7d642f985 100644
--- a/config/locales/models/descriptive_exam.yml
+++ b/config/locales/models/descriptive_exam.yml
@@ -13,6 +13,7 @@ pt-BR:
discipline: 'Disciplina'
discipline_id: 'Disciplina'
step: 'Etapa'
+ step_number: 'Etapa'
step_id: 'Etapa'
recorded_at: 'Data'
opinion_type: 'Tipo'
diff --git a/config/locales/models/descriptive_exam_student.yml b/config/locales/models/descriptive_exam_student.yml
index ebaa7f182..f5b839007 100644
--- a/config/locales/models/descriptive_exam_student.yml
+++ b/config/locales/models/descriptive_exam_student.yml
@@ -4,4 +4,5 @@ pt-BR:
descriptive_exam_student:
student: "Aluno"
student_id: "Aluno"
- value: "Avaliação descritiva"
\ No newline at end of file
+ value: "Avaliação descritiva"
+ discarded_at: 'Descartado'
diff --git a/config/locales/models/discipline_teaching_plan.yml b/config/locales/models/discipline_teaching_plan.yml
index c560a650a..485e78c0b 100644
--- a/config/locales/models/discipline_teaching_plan.yml
+++ b/config/locales/models/discipline_teaching_plan.yml
@@ -13,7 +13,10 @@ pt-BR:
discipline_id: "Disciplina"
author: "Autor"
objectives: "Objetivos"
+ objective_id: "Objetivo"
objectives_tags: "Objetivos"
contents_tags: "Conteúdos"
contents: "Conteúdos"
thematic_unit: "Unidade temática"
+ objective_id: "Objetivos"
+ position: "Posição"
diff --git a/config/locales/models/objectives_lesson_plan.yml b/config/locales/models/objectives_lesson_plan.yml
new file mode 100644
index 000000000..60c9b72b9
--- /dev/null
+++ b/config/locales/models/objectives_lesson_plan.yml
@@ -0,0 +1,6 @@
+pt-BR:
+ activerecord:
+ attributes:
+ objectives_lesson_plan:
+ objective_id: "Objetivo"
+ position: "Posição"
diff --git a/config/locales/models/objectives_teaching_plan.yml b/config/locales/models/objectives_teaching_plan.yml
new file mode 100644
index 000000000..03cb795b0
--- /dev/null
+++ b/config/locales/models/objectives_teaching_plan.yml
@@ -0,0 +1,6 @@
+pt-BR:
+ activerecord:
+ attributes:
+ objectives_teaching_plan:
+ objective_id: "Objetivo"
+ position: "Posição"
diff --git a/config/locales/models/observation_diary_record.yml b/config/locales/models/observation_diary_record.yml
index c45d69389..967e97b97 100644
--- a/config/locales/models/observation_diary_record.yml
+++ b/config/locales/models/observation_diary_record.yml
@@ -17,3 +17,4 @@ pt-BR:
notes: 'Observações'
teacher_id: 'Professor'
school_calendar_id: 'Calendário escolar'
+ discarded_at: 'Descartado'
diff --git a/config/locales/models/teaching_plan.yml b/config/locales/models/teaching_plan.yml
index 1c19f9b6c..d3a07fc80 100644
--- a/config/locales/models/teaching_plan.yml
+++ b/config/locales/models/teaching_plan.yml
@@ -25,6 +25,7 @@ pt-BR:
grade_ids: "Séries:"
opinion: "Parecer"
validated: "Plano de ensino validado"
+ teacher_id: "Professor(a)"
errors:
models:
diff --git a/config/locales/models/teaching_plan_attachment.yml b/config/locales/models/teaching_plan_attachment.yml
new file mode 100644
index 000000000..bfe1800ff
--- /dev/null
+++ b/config/locales/models/teaching_plan_attachment.yml
@@ -0,0 +1,12 @@
+pt-BR:
+ activerecord:
+ models:
+ teaching_plan_attachment:
+ one: "Anexo do Plano de ensino"
+ other: "Anexos do Plano de ensino"
+
+ attributes:
+ teaching_plan_attachment:
+ attachment_file_name: "Nome do anexo"
+ attachment_content_type: "Tipo do anexo"
+ attachment_file_size: "Tamanho do anexo"
diff --git a/config/locales/rails.yml b/config/locales/rails.yml
index 71a36b4fc..b0a15d682 100644
--- a/config/locales/rails.yml
+++ b/config/locales/rails.yml
@@ -14,7 +14,7 @@ pt-BR:
expired_password: 'Sua senha expirou, altere-a para continuar usando o sistema. Sua senha deve conter uma combinação de letras maiúsculas e minúsculas, números e símbolos (!@#$%*).'
weak_password: 'Sua senha deve conter uma combinação de letras maiúsculas e minúsculas, números e símbolos (!@#$%*)'
messages:
- extension_white_list_error: Tipo de arquivo não suportado
+ extension_whitelist_error: Tipo de arquivo não suportado
ieducar_api:
error:
messages:
diff --git a/config/routes.rb b/config/routes.rb
index fe7d313d5..714fc58ab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,7 +18,9 @@
resources :exam_rules, only: [:index]
get 'step_activity', to: 'step_activity#check'
get 'discipline_activity', to: 'discipline_activity#check'
+ get 'list_attendances_by_classroom', to: 'list_attendances_by_classroom#index'
get 'student_activity', to: 'student_activity#check'
+ get 'student_classroom_attendances', to: 'student_classroom_attendances#index'
resources :teacher_unities, only: [:index]
resources :teacher_classrooms, only: [:index] do
collection do
diff --git a/db/migrate/20240801124518_add_max_students_to_classrooms.rb b/db/migrate/20240801124518_add_max_students_to_classrooms.rb
new file mode 100644
index 000000000..b975f6854
--- /dev/null
+++ b/db/migrate/20240801124518_add_max_students_to_classrooms.rb
@@ -0,0 +1,5 @@
+class AddMaxStudentsToClassrooms < ActiveRecord::Migration[5.0]
+ def change
+ add_column :classrooms, :max_students, :integer
+ end
+end
diff --git a/spec/controllers/descriptive_exams_controller_spec.rb b/spec/controllers/descriptive_exams_controller_spec.rb
index c900d8c1b..dd91f0a87 100644
--- a/spec/controllers/descriptive_exams_controller_spec.rb
+++ b/spec/controllers/descriptive_exams_controller_spec.rb
@@ -21,6 +21,7 @@
exam_rule: exam_rule
)
}
+
let(:classrooms_grade) { create(:classrooms_grade, classroom: classroom, exam_rule: exam_rule) }
let(:student_enrollment_classroom) { create(:student_enrollment_classroom, classrooms_grade: classrooms_grade) }
let(:student_enrollment) { student_enrollment_classroom.student_enrollment }
@@ -53,13 +54,72 @@
sign_in(user)
allow(controller).to receive(:authorize).and_return(true)
allow(controller).to receive(:current_user_classroom).and_return(classroom)
+ allow(controller).to receive(:current_user_discipline).and_return(discipline)
allow(controller).to receive(:current_teacher).and_return(current_teacher)
allow(controller).to receive(:current_teacher_id).and_return(current_teacher.id)
allow(controller).to receive(:recorded_at_by_step).and_return('2017-03-01')
request.env['REQUEST_PATH'] = ''
end
- describe 'POST #create' do
+ describe "GET #new" do
+ let!(:descriptive_exam) {
+ create(
+ :descriptive_exam,
+ :with_teacher_discipline_classroom,
+ discipline_id: discipline.id,
+ classroom: classroom
+ )
+ }
+ let!(:step) { descriptive_exam.step }
+
+ before do
+ get :new, params: { locale: 'pt-BR' }
+ end
+
+ context "when user is authorized" do
+ it "assigns a new descriptive exam to @descriptive_exam" do
+ expect(assigns(:descriptive_exam)).to be_a_new(DescriptiveExam)
+ end
+
+ it "sets @descriptive_exam classroom_id to current user's classroom" do
+ expect(descriptive_exam.classroom_id).to eq(classroom.id)
+ end
+
+ it "sets @descriptive_exam discipline_id if opinion type is not 'Avaliação padrão (regular)'" do
+ allow_any_instance_of(DescriptiveExam).to receive(:opinion_types).and_return([OpenStruct.new(text: "Avaliação inclusiva")])
+ expect(descriptive_exam.discipline_id).to eq(discipline.id)
+ end
+ end
+
+ context "when user is not authorized" do
+ before {
+ allow(controller).to receive(:authorize).and_raise(Pundit::NotAuthorizedError)
+ get :new, params: { locale: 'pt-BR' }
+ }
+
+ it "redirects to root path with an alert message" do
+ expect(response).to redirect_to(root_path)
+ end
+ end
+ end
+
+ describe "POST #create" do
+ let(:valid_params) do
+ {
+ descriptive_exam: {
+ classroom_id: classroom.id,
+ discipline_id: discipline.id,
+ recorded_at: '2017-03-01',
+ opinion_type: classrooms_grade.exam_rule.opinion_type,
+ step_id: SchoolCalendarClassroomStep.first.id,
+ students: [
+ { id: student.id, student_id: student.id, dependence: false }
+ ]
+ },
+ locale: 'pt-BR'
+ }
+ end
+
context 'without success' do
it 'fails to create and renders the new template' do
post :create, params: params
@@ -74,13 +134,49 @@
expect(response).to redirect_to /avaliacoes-descritivas/
end
end
+
+ context "with valid params" do
+ it "creates a new descriptive exam" do
+ expect {
+ post :create, params: valid_params
+ }.to change(DescriptiveExam, :count).by(1)
+ end
+
+ it "redirects to the edit path for the created exam" do
+ post :create, params: valid_params
+ expect(response).to redirect_to(edit_descriptive_exam_path(DescriptiveExam.last))
+ end
+ end
+
+ context "with invalid params" do
+ let(:invalid_params) do
+ {
+ descriptive_exam: {
+ classroom_id: 50,
+ discipline_id: 50,
+ recorded_at: Date.current,
+ opinion_type: 'regular',
+ students_attributes: []
+ },
+ locale: 'pt-BR'
+ }
+ end
+
+ it "does not create a new exam and re-renders the new template" do
+ expect {
+ post :create, params: invalid_params
+ }.to_not change(DescriptiveExam, :count)
+ expect(flash[:error]).to match("Não localizamos uma regra de avaliação para a turma informada. Entre em contato com o administrador do sistema.")
+ end
+ end
end
- describe 'PUT #update' do
+ describe "PUT #update" do
let!(:descriptive_exam) {
create(
:descriptive_exam,
:with_teacher_discipline_classroom,
+ discipline_id: discipline.id,
classroom: classroom
)
}
@@ -95,5 +191,49 @@
expect(descriptive_exam.save).to be true
end
end
+
+ context "with valid params" do
+ it "updates the requested descriptive exam" do
+ put :update, params: { id: descriptive_exam.id, descriptive_exam: { recorded_at: Date.current }, locale: 'pt-BR' }
+ descriptive_exam.reload
+ expect(descriptive_exam.recorded_at).to eq(Date.current)
+ end
+
+ it "redirects to the new descriptive exam path" do
+ put :update, params: { id: descriptive_exam.id, descriptive_exam: { recorded_at: Date.current }, locale: 'pt-BR' }
+ expect(response).to redirect_to(new_descriptive_exam_path)
+ end
+ end
+
+ context "with invalid params" do
+ it "re-renders the edit template" do
+ put :update, params: { id: descriptive_exam.id, descriptive_exam: { discipline_id: nil }, locale: 'pt-BR' }
+ expect(response).to render_template(:edit)
+ end
+ end
+ end
+
+ describe "GET #find" do
+ context "when valid params are provided" do
+
+ it "returns the descriptive exam id as JSON" do
+ descriptive_exam = create(
+ :descriptive_exam,
+ :with_teacher_discipline_classroom,
+ discipline_id: discipline.id,
+ classroom: classroom
+ )
+ get :find, params: { classroom_id: classroom.id, discipline_id: discipline.id, opinion_type: 'regular', locale: 'pt-BR' }
+ expect(response.status).to eq(200)
+ end
+ end
+
+ context "when invalid params are provided" do
+ it "returns null as JSON" do
+ get :find, params: { classroom_id: nil, opinion_type: 'regular', locale: 'pt-BR' }
+ expect(response.body).to eq("null")
+ end
+ end
end
+
end
diff --git a/spec/controllers/entity_configurations_controller_spec.rb b/spec/controllers/entity_configurations_controller_spec.rb
index 4441dd567..fa91fe49f 100644
--- a/spec/controllers/entity_configurations_controller_spec.rb
+++ b/spec/controllers/entity_configurations_controller_spec.rb
@@ -55,8 +55,10 @@
describe 'PUT #update' do
it 'does not update and returns error when params are wrong' do
- params[:entity_configuration][:address_attributes][:id] = 0
+ params[:entity_configuration][:address_attributes][:city] = 0
+
put :update, params: params.merge(params)
+
expect(response).to have_http_status(302)
end
diff --git a/spec/factories/complementary_exams.rb b/spec/factories/complementary_exams.rb
index 026eee482..ced595501 100644
--- a/spec/factories/complementary_exams.rb
+++ b/spec/factories/complementary_exams.rb
@@ -18,7 +18,7 @@
end
if complementary_exam.recorded_at.blank?
- complementary_exam.recorded_at = step.try(:first_school_calendar_date) || Date.current
+ complementary_exam.recorded_at = Date.current
end
complementary_exam.step_number = step.try(:step_number) || 1 if complementary_exam.step_number.blank?
diff --git a/spec/factories/conceptual_exams.rb b/spec/factories/conceptual_exams.rb
index 519f0a92d..07e52a823 100644
--- a/spec/factories/conceptual_exams.rb
+++ b/spec/factories/conceptual_exams.rb
@@ -19,7 +19,7 @@
end
if conceptual_exam.recorded_at.blank?
- conceptual_exam.recorded_at = step.try(:first_school_calendar_date) || Date.current
+ conceptual_exam.recorded_at = Date.current
end
conceptual_exam.step_number = step.try(:step_number) || 1 if conceptual_exam.step_number.zero?
diff --git a/spec/factories/content_records.rb b/spec/factories/content_records.rb
index 57361e42d..a3bf63fa9 100644
--- a/spec/factories/content_records.rb
+++ b/spec/factories/content_records.rb
@@ -19,7 +19,7 @@
if content_record.record_date.blank?
step = classroom.calendar.classroom_steps.first
- content_record.record_date = step.first_school_calendar_date
+ content_record.record_date = Date.current
end
if content_record.teacher_id.blank? && content_record.teacher.present?
diff --git a/spec/factories/descriptive_exams.rb b/spec/factories/descriptive_exams.rb
index 0dbf9d5dc..ff9e72bc0 100644
--- a/spec/factories/descriptive_exams.rb
+++ b/spec/factories/descriptive_exams.rb
@@ -18,7 +18,7 @@
end
if descriptive_exam.recorded_at.blank?
- descriptive_exam.recorded_at = step.try(:first_school_calendar_date) || Date.current
+ descriptive_exam.recorded_at = Date.current
end
descriptive_exam.step_number = step.try(:step_number) || 1 if descriptive_exam.step_number.zero?
diff --git a/spec/factories/lesson_plans.rb b/spec/factories/lesson_plans.rb
index b4ec11df8..4873a1c49 100644
--- a/spec/factories/lesson_plans.rb
+++ b/spec/factories/lesson_plans.rb
@@ -37,7 +37,7 @@
step = evaluator.step || lesson_plan.classroom.calendar.classroom_steps.first
end
- lesson_plan.start_at ||= step.try(:first_school_calendar_date) || Date.current
+ lesson_plan.start_at ||= Date.current
lesson_plan.end_at ||= lesson_plan.start_at + 7.days
teacher = Teacher.find(lesson_plan.teacher_id) if lesson_plan.teacher_id.present?
diff --git a/spec/factories/transfer_notes.rb b/spec/factories/transfer_notes.rb
index 443622347..2b956623c 100644
--- a/spec/factories/transfer_notes.rb
+++ b/spec/factories/transfer_notes.rb
@@ -17,7 +17,7 @@
end
if transfer_note.recorded_at.blank?
- transfer_note.recorded_at = step.try(:first_school_calendar_date) || Date.current
+ transfer_note.recorded_at = Date.current
end
transfer_note.step_number = step.try(:step_number) || 1 if transfer_note.step_number.zero?
diff --git a/spec/factories/unique_daily_frequency_students.rb b/spec/factories/unique_daily_frequency_students.rb
new file mode 100644
index 000000000..34c640a59
--- /dev/null
+++ b/spec/factories/unique_daily_frequency_students.rb
@@ -0,0 +1,10 @@
+FactoryGirl.define do
+ factory :unique_daily_frequency_student do
+ classroom
+ student
+
+ frequency_date { Date.current }
+ present true
+ absences_by []
+ end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index cc50389b9..85b9222b9 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -15,6 +15,7 @@
user_role = create(:user_role, :administrator)
user.user_roles << user_role
user.current_user_role = user_role
+ user.fullname = 'Admin'
user.save!
end
end
diff --git a/spec/models/absence_justification_spec.rb b/spec/models/absence_justification_spec.rb
index 462acc454..aa7e6d024 100644
--- a/spec/models/absence_justification_spec.rb
+++ b/spec/models/absence_justification_spec.rb
@@ -50,7 +50,7 @@
school_calendar = classroom.calendar.school_calendar
teacher = teacher_discipline_classroom.teacher
user = create(:user, assumed_teacher_id: teacher.id)
- first_school_calendar_date = classroom.calendar.classroom_steps.first.first_school_calendar_date
+ first_school_calendar_date = Date.current
absence = create(
:absence_justification,
unity: classroom.unity,
diff --git a/spec/models/avaliation_spec.rb b/spec/models/avaliation_spec.rb
index b4013db28..bcf545802 100644
--- a/spec/models/avaliation_spec.rb
+++ b/spec/models/avaliation_spec.rb
@@ -62,7 +62,7 @@
:avaliation,
:with_teacher_discipline_classroom,
classroom: classroom,
- test_date: step.first_school_calendar_date,
+ test_date: Date.current,
test_setting: test_setting_with_sum_calculation_type
)
end
@@ -97,7 +97,7 @@
:avaliation,
:with_teacher_discipline_classroom,
classroom: classroom,
- test_date: step.first_school_calendar_date,
+ test_date: Date.current,
test_setting: test_setting_with_sum_calculation_type_that_allow_break_up,
test_setting_test: test_setting_with_sum_calculation_type_that_allow_break_up.tests.first
)
diff --git a/spec/models/complementary_exam_setting_spec.rb b/spec/models/complementary_exam_setting_spec.rb
index f8772fb23..292db882c 100644
--- a/spec/models/complementary_exam_setting_spec.rb
+++ b/spec/models/complementary_exam_setting_spec.rb
@@ -19,7 +19,7 @@
:complementary_exam,
:with_teacher_discipline_classroom,
classroom: classroom,
- recorded_at: step.first_school_calendar_date,
+ recorded_at: Date.current,
step_id: step.id,
complementary_exam_setting: complementary_exam_setting_with_two_grades
)
diff --git a/spec/reports/exam_record_report_spec.rb b/spec/reports/exam_record_report_spec.rb
index f64e72efa..f3fc4a29a 100644
--- a/spec/reports/exam_record_report_spec.rb
+++ b/spec/reports/exam_record_report_spec.rb
@@ -1,48 +1,63 @@
require 'rails_helper'
RSpec.describe ExamRecordReport, type: :report do
- it 'should be created' do
- entity_configuration = create(:entity_configuration)
- discipline = create(:discipline)
- classroom = create(
- :classroom,
- :with_classroom_semester_steps,
- :with_teacher_discipline_classroom,
- :with_student_enrollment_classroom,
- discipline: discipline
- )
- school_calendar = classroom.calendar.school_calendar
- student = classroom.student_enrollment_classrooms.first.student_enrollment.student
- avaliation = create(
- :avaliation,
- school_calendar: school_calendar,
- classroom: classroom,
- discipline: discipline,
- teacher_id: classroom.teacher_discipline_classrooms.first.teacher_id,
- test_date: Date.current
- )
- daily_note = create(:daily_note, avaliation: avaliation)
- teacher = create(:teacher)
- test_setting = create(:test_setting)
- create(:daily_note_student, daily_note: daily_note, student: student)
+ context 'should be created' do
+ let!(:entity_configuration){ create(:entity_configuration) }
+ let!(:discipline){ create(:discipline) }
+ let!(:classroom){
+ create(
+ :classroom,
+ :with_classroom_semester_steps,
+ :with_teacher_discipline_classroom,
+ :with_student_enrollment_classroom,
+ discipline: discipline
+ )
+ }
+ let!(:school_calendar){ classroom.calendar.school_calendar }
+ let!(:student){ classroom.student_enrollment_classrooms.first.student_enrollment.student}
+ let!(:avaliation){
+ create(
+ :avaliation,
+ school_calendar: school_calendar,
+ classroom: classroom,
+ discipline: discipline,
+ teacher_id: classroom.teacher_discipline_classrooms.first.teacher_id,
+ test_date: Date.current
+ )
+ }
+ let!(:daily_note) { create(:daily_note, avaliation: avaliation) }
+ let!(:teacher) { create(:teacher) }
+ let!(:test_setting) { create(:test_setting) }
+ let!(:daily_note_student) {create(:daily_note_student, daily_note: daily_note, student: student)}
- daily_notes = DailyNote.all
- students = StudentEnrollment.all
+ it 'successfully creates the ExamRecordReportForm' do
+ daily_notes = DailyNote.all
+ students = StudentEnrollment.all
- subject = ExamRecordReport.build(
- entity_configuration,
- teacher,
- school_calendar.year,
- classroom.calendar.classroom_steps.last,
- test_setting,
- daily_notes,
- students,
- [],
- [],
- [],
- false,
- ).render
+ resource_params = {
+ unity_id: classroom.unity_id,
+ classroom_id: classroom.id,
+ discipline_id: discipline.id,
+ school_calendar_classroom_step_id: classroom.calendar.classroom_steps.first.id
+ }
- expect(subject).to be_truthy
+ exam_record_report_form = ExamRecordReportForm.new(resource_params)
+
+ subject = ExamRecordReport.build(
+ entity_configuration,
+ teacher,
+ school_calendar.year,
+ exam_record_report_form.classroom_step,
+ test_setting,
+ exam_record_report_form.daily_notes_classroom_steps,
+ exam_record_report_form.info_students,
+ exam_record_report_form.complementary_exams,
+ exam_record_report_form.school_term_recoveries,
+ exam_record_report_form.recovery_lowest_notes?,
+ exam_record_report_form.lowest_notes
+ ).render
+
+ expect(subject).to be_truthy
+ end
end
end
diff --git a/spec/services/api/classroom_attendance_service_spec.rb b/spec/services/api/classroom_attendance_service_spec.rb
new file mode 100644
index 000000000..fc366d8f1
--- /dev/null
+++ b/spec/services/api/classroom_attendance_service_spec.rb
@@ -0,0 +1,423 @@
+require 'rails_helper'
+
+RSpec.describe Api::ClassroomAttendanceService do
+ include ActiveSupport::Testing::TimeHelpers
+
+ before(:all) do
+ travel_to Time.zone.local(2024, 4, 1, 0, 0, 0)
+ end
+
+ after(:all) do
+ travel_back
+ end
+
+ let(:classroom) { create(:classroom, id: 1, year: '2024', api_code: "01") }
+ let(:discipline) { create(:discipline) }
+ let(:school_calendar) {
+ create(
+ :school_calendar,
+ year: '2024',
+ unity_id: classroom.unity_id
+ )
+ }
+ let!(:school_calendar_step) {
+ create(
+ :school_calendar_step,
+ school_calendar: school_calendar,
+ step_number: 1,
+ start_at: '2024-02-02',
+ end_at: '2024-12-12'
+ )
+ }
+ let(:start_at) { '2024-02-02'}
+ let(:end_at) { '2024-12-12'}
+ let(:year) { '2024'}
+ let(:params_classrooms) do
+ {
+ '0' => classroom.api_code
+ }
+ end
+ let(:classrooms_grades) { create(:classrooms_grade, classroom: classroom) }
+ let(:student_enrollment_classroom) { create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ }
+ let(:student_enrollment) { student_enrollment_classroom.student_enrollment }
+ let(:student) { student_enrollment.student }
+ let!(:daily_frequency) {
+ create(
+ :daily_frequency,
+ classroom: classroom,
+ frequency_date: '2024-04-01',
+ class_number: nil,
+ discipline_id: nil
+ )
+ }
+ let!(:daily_frequency_student) {
+ create(
+ :daily_frequency_student,
+ student: student,
+ present: true,
+ daily_frequency: daily_frequency
+ )
+ }
+
+ before do
+ UnitySchoolDay.create!(unity: classroom.unity, school_day: '2024-04-01')
+ UnitySchoolDay.create!(unity: classroom.unity, school_day: '2024-03-29')
+ UnitySchoolDay.create!(unity: classroom.unity, school_day: '2024-03-28')
+ end
+
+ context 'when the params include only one classroom' do
+ subject(:service) do
+ Api::ClassroomAttendanceService.call(params_classrooms, start_at, end_at, year)
+ end
+
+ let(:daily_frequency_two) {
+ create(:daily_frequency,
+ classroom: classroom,
+ frequency_date: '2024-03-29',
+ class_number: nil,
+ discipline_id: nil
+ )
+ }
+
+ it 'return correct classroom, attendance and enrollments data' do
+ expect(service.first[:classroom_name]).to include(classroom.description)
+ expect(service.first[:grades]).to include(
+ {
+ id: classrooms_grades.grade.api_code,
+ name: classrooms_grades.grade.description,
+ course_id: classrooms_grades.grade.course.api_code,
+ course_name: classrooms_grades.grade.course.description
+ }
+ )
+ expect(service.first[:attendance_and_enrollments]).to include(
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ }
+ )
+ end
+
+ it 'return nil when the student_enrollment_classroom has discarded_at' do
+ student_enrollment_classroom.update(discarded_at: '2024-03-29')
+
+ expect(service.first[:attendance_and_enrollments]).to be_nil
+ end
+
+ it 'return 100% attendance and all students enrolled' do
+ create(:daily_frequency_student, student: student, present: true, daily_frequency: daily_frequency_two)
+
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-03-29" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ }
+ }
+ )
+ end
+
+ it 'return global frequency count for the classroom' do
+ daily_frequency_class_number_one = create(
+ :daily_frequency,
+ classroom: classroom,
+ frequency_date: '2024-04-01',
+ class_number: '1',
+ discipline: discipline
+ )
+ create(:daily_frequency_student,student: student, present: true,
+daily_frequency: daily_frequency_class_number_one)
+
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 0,
+ enrollments: 1
+ },
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ }
+ }
+ )
+ end
+
+ it 'return attendance for all students actives in the classroom' do
+ student_enrollment_classroom_two = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-29'
+ )
+ student_enrollment_two = student_enrollment_classroom_two.student_enrollment
+ student_two = student_enrollment_two.student
+
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency)
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 1,
+ enrollments: 2
+ },
+ "2024-04-01" => {
+ frequencies: 2,
+ enrollments: 2
+ }
+ }
+ )
+ end
+
+ it 'return only the attendance of students with enrollment on the date' do
+ student_enrollment_classroom_two = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ student_enrollment_two = student_enrollment_classroom_two.student_enrollment
+ student_two = student_enrollment_two.student
+ student_enrollment_classroom_three = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ student_enrollment_three = student_enrollment_classroom_three.student_enrollment
+ student_three = student_enrollment_three.student
+
+ # Lança a frequencia alunos para 01/04/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency)
+ create(:daily_frequency_student, student: student_three, present: true, daily_frequency: daily_frequency)
+
+ # Lança a frequencia alunos para 29/03/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+ create(:daily_frequency_student, student: student_three, present: true,
+daily_frequency: daily_frequency_two)
+
+ # Insere saida do aluno de forma retroativa
+ student_enrollment_classroom_two.update(left_at: '2024-03-29')
+
+ service = Api::ClassroomAttendanceService.call(params_classrooms, start_at, end_at, year)
+
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 2,
+ enrollments: 2
+ },
+ "2024-03-29" => {
+ frequencies: 2,
+ enrollments: 3
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 3
+ }
+ }
+ )
+ end
+
+ it 'return only the attendance of students without discarded enrollments' do
+ student_enrollment_classroom_three = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ student_enrollment_three = student_enrollment_classroom_three.student_enrollment
+ student_three = student_enrollment_three.student
+ student_enrollment_classroom_two = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ student_enrollment_two = student_enrollment_classroom_two.student_enrollment
+ student_two = student_enrollment_two.student
+
+ # Lança a frequencia alunos para 01/04/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency)
+ create(:daily_frequency_student, student: student_three, present: true, daily_frequency: daily_frequency)
+
+ # Lança a frequencia alunos para 29/03/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ student_enrollment_classroom_three.update(discarded_at: '2024-03-29')
+
+ service = Api::ClassroomAttendanceService.call(params_classrooms, start_at, end_at, year)
+
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 2,
+ enrollments: 2
+ },
+ "2024-03-29" => {
+ frequencies: 1,
+ enrollments: 2
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 2
+ }
+ }
+ )
+ end
+ end
+
+ context 'when the parameters include multiple classrooms' do
+ subject(:service) do
+ Api::ClassroomAttendanceService.call(params_classrooms_two, start_at, end_at, year)
+ end
+
+ let(:classroom_two) { create(:classroom, id: 2, year: '2024', api_code: '02', unity: classroom.unity) }
+ let(:classrooms_grades_two) { create(:classrooms_grade, classroom: classroom_two) }
+ let(:params_classrooms_two) do
+ {
+ "0" => classroom.api_code,
+ "1" => classroom_two.api_code
+ }
+ end
+ let(:student_enrollment_classroom_two) { create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades,
+ joined_at: '2024-03-28'
+ )
+ }
+ let!(:student_enrollment_two) { student_enrollment_classroom_two.student_enrollment }
+ let!(:student_two) { student_enrollment_two.student }
+
+ it 'return attendance for a student re-enrolled in a new classroom' do
+ # Lança a frequencia alunos para 01/04/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency)
+
+ # Lança a frequencia alunos para 29/03/2024
+ daily_frequency_two = create(:daily_frequency, classroom: classroom, frequency_date: '2024-03-29')
+ create(:daily_frequency_student, student: student, present: true, daily_frequency: daily_frequency_two)
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ # Mudar a enturmacao
+ student_enrollment_classroom_two.update(left_at: '2024-03-29')
+
+ # Re-Enturmei o aluno na nova a turma
+ new_student_enrollment_classroom = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades_two,
+ student_enrollment: student_enrollment_two,
+ joined_at: '2024-03-28'
+ )
+
+ # Lança a frequencia alunos para 01/04/2024 para outra turma
+ daily_frequency_two = create(:daily_frequency, classroom: classroom_two, frequency_date: '2024-04-01')
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ expect(service.first[:classroom_id]).to include(classroom.api_code)
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 2,
+ enrollments: 2
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 2
+ }
+ }
+ )
+ expect(service.last[:classroom_id]).to include(classroom_two.api_code)
+ expect(service.last[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 0,
+ enrollments: 1
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 1
+ }
+ }
+ )
+
+ end
+
+ it 'return frequencies that are not associated with discarded enrollments' do
+ # Lança a frequencia alunos para 01/04/2024
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency)
+
+ daily_frequency_two = create(:daily_frequency, classroom: classroom, frequency_date: '2024-03-29')
+ create(:daily_frequency_student, student: student, present: true, daily_frequency: daily_frequency_two)
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ # Mudar a enturmacao
+ student_enrollment_classroom_two.update(discarded_at: '2024-03-29')
+
+ # Re-Enturmei o aluno na nova a turma
+ new_student_enrollment_classroom = create(
+ :student_enrollment_classroom,
+ classrooms_grade: classrooms_grades_two,
+ student_enrollment: student_enrollment_two,
+ joined_at: '2024-03-28'
+ )
+
+ daily_frequency_two = create(:daily_frequency, classroom: classroom_two, frequency_date: '2024-04-01')
+ create(:daily_frequency_student, student: student_two, present: true, daily_frequency: daily_frequency_two)
+
+ expect(service.first[:classroom_id]).to include(classroom.api_code)
+ expect(service.first[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 1
+ }
+ }
+ )
+ expect(service.last[:classroom_id]).to include(classroom_two.api_code)
+ expect(service.last[:attendance_and_enrollments]).to include(
+ {
+ "2024-04-01" => {
+ frequencies: 1,
+ enrollments: 1
+ },
+ "2024-03-29" => {
+ frequencies: 0,
+ enrollments: 1
+ },
+ "2024-03-28" => {
+ frequencies: 0,
+ enrollments: 1
+ }
+ }
+ )
+
+ end
+ end
+end
diff --git a/spec/services/complementary_exam_calculator_spec.rb b/spec/services/complementary_exam_calculator_spec.rb
index f946a22f8..03505c8af 100644
--- a/spec/services/complementary_exam_calculator_spec.rb
+++ b/spec/services/complementary_exam_calculator_spec.rb
@@ -16,7 +16,7 @@
:complementary_exam,
:with_teacher_discipline_classroom,
classroom: classroom,
- recorded_at: step.first_school_calendar_date,
+ recorded_at: Date.current,
step_id: step.id,
complementary_exam_setting: complementary_exam_setting
)
diff --git a/spec/services/complementary_exam_settings_fetcher_spec.rb b/spec/services/complementary_exam_settings_fetcher_spec.rb
index 48a0cdad9..7b243e712 100644
--- a/spec/services/complementary_exam_settings_fetcher_spec.rb
+++ b/spec/services/complementary_exam_settings_fetcher_spec.rb
@@ -23,7 +23,7 @@
:with_teacher_discipline_classroom,
classroom: classroom,
discipline: discipline,
- recorded_at: step.first_school_calendar_date,
+ recorded_at: Date.current,
step_id: step.id,
complementary_exam_setting: complementary_exam_setting
)
diff --git a/spec/services/contents_for_discipline_record_fetcher_spec.rb b/spec/services/contents_for_discipline_record_fetcher_spec.rb
index 051f50d86..1a708cc31 100644
--- a/spec/services/contents_for_discipline_record_fetcher_spec.rb
+++ b/spec/services/contents_for_discipline_record_fetcher_spec.rb
@@ -62,7 +62,7 @@
end
it 'fetches contents from teaching plan' do
- date = classroom.calendar.classroom_steps.first.first_school_calendar_date
+ date = Date.current
teaching_plan = create(
:teaching_plan,
diff --git a/spec/services/daily_note_creator_spec.rb b/spec/services/daily_note_creator_spec.rb
deleted file mode 100644
index 85457f2f9..000000000
--- a/spec/services/daily_note_creator_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe DailyNoteCreator, type: :service do
- before(:each) do
- SchoolCalendarDayValidator.any_instance.stub(:validate_each).and_return(true)
- end
-
- let(:classroom) { create(:classroom, :score_type_numeric) }
- let(:avaliation) {
- create(
- :avaliation,
- :with_teacher_discipline_classroom,
- classroom: classroom
- )
- }
-
- it 'create daily note when avaliation is passed by parameter' do
- creator = described_class.new(
- avaliation_id: avaliation.id
- )
-
- expect { creator.find_or_create }.to change { DailyNote.count }.to(1)
- end
-
- context 'exist student enrollments' do
- let(:student_enrollment) { create(:student_enrollment) }
-
- before do
- StudentEnrollmentClassroom.create!(
- classrooms_grade: classroom.classrooms_grades.first,
- student_enrollment: student_enrollment,
- joined_at: Date.current.beginning_of_year,
- left_at: ''
- )
- end
-
- it 'create daily note students' do
- StudentEnrollmentsList.any_instance.stub(:student_enrollments).and_return([student_enrollment])
- creator = described_class.new(
- avaliation_id: avaliation.id
- )
-
- expect { creator.find_or_create }.to change { DailyNoteStudent.count }.to(1)
- end
- end
-end
diff --git a/spec/services/delete_dispensed_exams_and_frequencies_service_spec.rb b/spec/services/delete_dispensed_exams_and_frequencies_service_spec.rb
index 960f703a2..2eb7bcb7f 100644
--- a/spec/services/delete_dispensed_exams_and_frequencies_service_spec.rb
+++ b/spec/services/delete_dispensed_exams_and_frequencies_service_spec.rb
@@ -17,6 +17,7 @@
let(:first_semester) { 1 }
let(:second_semester) { 2 }
let(:inexisting_step) { 3 }
+ let!(:user) { create(:user, :with_user_role_administrator) }
subject do
DeleteDispensedExamsAndFrequenciesService.new(
diff --git a/spec/services/exam_poster/conceptual_exam_poster_spec.rb b/spec/services/exam_poster/conceptual_exam_poster_spec.rb
index aa2348cb6..aa0139f22 100644
--- a/spec/services/exam_poster/conceptual_exam_poster_spec.rb
+++ b/spec/services/exam_poster/conceptual_exam_poster_spec.rb
@@ -12,7 +12,7 @@
classroom: classroom
)
}
- let!(:exam_posting) {
+ let(:exam_posting) {
create(
:ieducar_api_exam_posting,
school_calendar_classroom_step: classroom.calendar.classroom_steps.first,
@@ -35,7 +35,7 @@
}
context 'when student uses_differentiated_exam_rule' do
- let!(:conceptual_exam) {
+ let(:conceptual_exam) {
student = create(:student, uses_differentiated_exam_rule: true)
create(
:conceptual_exam,
@@ -85,7 +85,7 @@
end
context 'when classroom score type is numeric and concept' do
- let!(:classroom) {
+ let(:classroom) {
create(
:classroom,
:with_classroom_semester_steps,
@@ -94,7 +94,7 @@
}
context 'when discipline score type is numeric after being concept' do
- let!(:teacher_discipline_classroom) {
+ let(:teacher_discipline_classroom) {
create(
:teacher_discipline_classroom,
classroom: classroom,
@@ -139,7 +139,7 @@
end
context 'when discipline score type is concept' do
- let!(:teacher_discipline_classroom) {
+ let(:teacher_discipline_classroom) {
create(
:teacher_discipline_classroom,
classroom: classroom,
@@ -184,7 +184,7 @@
end
context 'when discipline score type is numeric' do
- let!(:teacher_discipline_classroom) {
+ let(:teacher_discipline_classroom) {
create(
:teacher_discipline_classroom,
classroom: classroom,
@@ -228,7 +228,7 @@
end
context 'when classroom score type is numeric after being concept' do
- let!(:classroom) {
+ let(:classroom) {
create(
:classroom,
:with_classroom_semester_steps,
@@ -272,7 +272,7 @@
end
context 'when classroom score type is concept' do
- let!(:classroom) {
+ let(:classroom) {
create(
:classroom,
:with_classroom_semester_steps,
@@ -316,14 +316,14 @@
end
context 'when discipline is exempted' do
- let!(:classroom) {
+ let(:classroom) {
create(
:classroom,
:with_classroom_semester_steps,
:score_type_concept
)
}
- let!(:specific_step) {
+ let(:specific_step) {
create(
:specific_step,
classroom: classroom,
@@ -364,4 +364,53 @@
)
end
end
+
+ context 'when student discipline is exempted' do
+ let(:classroom) {
+ create(
+ :classroom,
+ :with_classroom_semester_steps,
+ :score_type_concept
+ )
+ }
+ let!(:student_enrollment_exempted_discipline) {
+ create(
+ :student_enrollment_exempted_discipline,
+ discipline: discipline,
+ student_enrollment: conceptual_exam.student.student_enrollments.first
+ )
+ }
+
+ it 'does not return warning_messages and ignores the conceptual_exam_value' do
+ subject.post!
+
+ expect(subject.instance_variable_get(:@warning_messages)).to be_empty
+ expect(subject.instance_variable_get(:@requests)).to be_empty
+ end
+
+ it 'returns a warning message when the student has no conceptual_exam_value and is exempt from another discipline' do
+ discipline_other = create(:discipline)
+ create(
+ :teacher_discipline_classroom,
+ classroom: classroom,
+ discipline: discipline_other,
+ teacher: classroom.teacher_discipline_classrooms.first.teacher,
+ score_type: ScoreTypes::CONCEPT
+ )
+ create(:conceptual_exam_value,
+ conceptual_exam: conceptual_exam,
+ discipline: discipline_other,
+ value: nil
+ )
+
+ subject.post!
+
+ response = [
+ "O aluno #{conceptual_exam.student.name} não possui nota lançada no diário de notas conceituais na " \
+ "turma #{classroom.description} disciplina: #{discipline_other.description}"
+ ]
+
+ expect(subject.instance_variable_get(:@warning_messages)).to eq(response)
+ end
+ end
end
diff --git a/spec/services/ieducar_api/base_spec.rb b/spec/services/ieducar_api/base_spec.rb
index 4362e4e66..4acdb4d49 100644
--- a/spec/services/ieducar_api/base_spec.rb
+++ b/spec/services/ieducar_api/base_spec.rb
@@ -148,9 +148,11 @@
unity_id: unity_id
)
- expect {
- subject.fetch(path: path, resource: resource)
- }.to raise_error('URL do i-Educar informada não é válida.')
+ VCR.use_cassette('wrong_url') do
+ expect {
+ subject.fetch(path: path, resource: resource)
+ }.to raise_error('URL do i-Educar informada não é válida.')
+ end
end
it 'returns an error when providing an invalid client url' do
diff --git a/spec/services/list_grades_by_step_builder_spec.rb b/spec/services/list_grades_by_step_builder_spec.rb
index b303899a0..521674fd8 100644
--- a/spec/services/list_grades_by_step_builder_spec.rb
+++ b/spec/services/list_grades_by_step_builder_spec.rb
@@ -53,10 +53,11 @@
end
it 'returns list of grades with group_child_education' do
- group_children_education = grades_group_children_education
+ group_children_education = [{ id: 'group_1', name: 'Grupo 1 - Bebê (0 a 11 meses)',
+ text: 'Grupo 1 - Bebê (0 a 11 meses)' }]
expect(@list_grades.size).to eq(10)
- expect(@list_grades).to include(*group_children_education)
+ expect(@list_grades).to include(group_children_education.first)
end
end
@@ -67,33 +68,14 @@
end
it 'returns list of grades with group_child_education' do
- grades_children_education = grades_children_education
+ grades_children_education = [
+ { id: 'nursery_1', name: 'Creche - 0 a 1 ano e 6 meses',
+ text: 'Creche - 0 a 1 ano e 6 meses' }
+ ]
expect(@list_grades.size).to eq(4)
- expect(@list_grades).to include(*grades_children_education)
+ expect(@list_grades).to include(grades_children_education.first)
end
end
end
-
- def grades_group_children_education
- [
- { id: 'nursery_1', name: 'Creche - 0 a 1 ano e 6 meses',
- text: 'Creche - 0 a 1 ano e 6 meses' },
- { id: 'group_1', name: 'Grupo 1 - Bebê (0 a 11 meses)',
- text: 'Grupo 1 - Bebê (0 a 11 meses)' },
- { id: 'group_4', name: 'Grupo 4 - CBP (3 anos a 3 anos e 11 meses)',
- text: 'Grupo 4 - CBP (3 anos a 3 anos e 11 meses)' }
- ]
- end
-
- def grades_children_education
- [
- { id: 'nursery_1', name: 'Creche - 0 a 1 ano e 6 meses',
- text: 'Creche - 0 a 1 ano e 6 meses' },
- { id: 'nursery_2', name: 'Creche - 1 ano e 7 meses a 3 anos e 11 meses',
- text: 'Creche - 1 ano e 7 meses a 3 anos e 11 meses' },
- { id: 'preschool', name: 'Pré-escola - 4 a 5 anos',
- text: 'Pré-escola - 4 a 5 anos' }
- ]
- end
end
diff --git a/spec/services/old_steps_conceptual_values_fetcher_spec.rb b/spec/services/old_steps_conceptual_values_fetcher_spec.rb
index a4a0560f6..902822ffa 100644
--- a/spec/services/old_steps_conceptual_values_fetcher_spec.rb
+++ b/spec/services/old_steps_conceptual_values_fetcher_spec.rb
@@ -18,7 +18,7 @@
classroom: classroom,
student: student,
step_id: step.id,
- recorded_at: step.first_school_calendar_date,
+ recorded_at: Date.current,
step_number: step.step_number
)
exam.save(validate: false)
diff --git a/spec/services/remove_daily_note_students_spec.rb b/spec/services/remove_daily_note_students_spec.rb
index 39b7b862a..46e15dc5a 100644
--- a/spec/services/remove_daily_note_students_spec.rb
+++ b/spec/services/remove_daily_note_students_spec.rb
@@ -19,6 +19,7 @@
create(
:avaliation,
school_calendar: school_calendar,
+ test_date: Date.current,
classroom: classroom,
discipline: teacher_discipline_classroom.discipline,
teacher_id: teacher_discipline_classroom.teacher.id
@@ -31,8 +32,8 @@
:student_enrollment_classroom,
student_enrollment: student_enrollment,
classrooms_grade: classroom_grades,
- left_at: '2017-04-04',
- joined_at: '2017-03-01'
+ joined_at: '2017-02-02', # data de entrada do aluno na turma
+ left_at: '2017-04-04' # data de saída do aluno na turma
)
}
let(:transfer_note) {
@@ -65,35 +66,47 @@
)
end
- describe 'when a student has a note OR transfer_note' do
+ describe 'when a student has a daily_note OR transfer_note' do
context 'and is enrolled on the date' do
- it 'should return an empty array, no modifications made' do
+ it 'return an empty array, no modifications made' do
expect(subject).to eq []
end
end
context 'and is NOT in enrolled on the date' do
- it 'should return an empty array, no modifications made' do
+ it 'return an empty array, no modifications made' do
student_enrollment_classroom.update(left_at: '2017-02-25')
expect(subject).to eq []
end
end
end
- describe 'when a student does NOT have note OR transfer note' do
+ describe 'when a student does NOT have daily_note OR transfer note' do
before { daily_note_student.update(note: nil, transfer_note: nil) }
context 'and is enrolled on the date' do
- it 'should return an array with daily_note_student without modification' do
+ it 'return an array with daily_note_student without modification' do
expect(subject).to eq [daily_note_student]
end
end
context 'and is NOT in enrolled on the date' do
- it 'should return an array with daily_note_student with discarded' do
+ it 'return an array with daily_note_student with discarded' do
+ # 01/03/2017 - avaliacao
+ # 01/02/2017 - entrada do aluno na turma
student_enrollment_classroom.update(left_at: '2017-02-25')
expect(subject.map(&:discarded?)).to eq [true]
+ expect(subject.map(&:active)).to eq [false]
+ end
+
+ it 'return an array with daily_note_student with discarded' do
+ # 01/03/2017 - avaliacao
+ # 04/04/2017 - saida do aluno na turma
+ student_enrollment_classroom.update(joined_at: '2017-03-02')
+
+ expect(subject.map(&:discarded?)).to eq [true]
+ expect(subject.map(&:active)).to eq [false]
end
end
end
diff --git a/spec/services/school_day_checker_spec.rb b/spec/services/school_day_checker_spec.rb
new file mode 100644
index 000000000..ea7101ed5
--- /dev/null
+++ b/spec/services/school_day_checker_spec.rb
@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+RSpec.describe SchoolDayChecker, type: :service do
+ let(:classroom) { create(:classroom) }
+ let(:classroom_grades) { create_list(:classrooms_grade, 3, classroom: classroom)}
+ let(:school_calendar) { create(:school_calendar, :with_one_step, unity: classroom.unity) }
+
+ describe '#day_allows_entry?' do
+ context 'when there is a non-school event and it does not allow entries directly linked to the classroom' do
+ let!(:date) { '2017-03-03'.to_date }
+ let!(:school_calendar_event) {
+ create(
+ :school_calendar_event,
+ school_calendar: school_calendar,
+ start_date: '2017-03-03',
+ end_date: '2017-03-03',
+ classroom: classroom,
+ course: classroom_grades.first.grade.course,
+ grade: classroom_grades.first.grade,
+ coverage: "by_classroom",
+ event_type: EventTypes::NO_SCHOOL
+ )
+ }
+
+ it 'returns false for a school day when grade_id and classroom_id are provided' do
+ grade_id = classroom_grades.first.grade.id
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, classroom.id, nil).day_allows_entry?
+
+ expect(subject).to be false
+ end
+
+ it 'returns true for a school day when only classroom_id is provided' do
+ # Atenção! Quando enviamos apenas o parametro de turma
+ # O serviço não está verificando corretamente se a turma tem vinculo com o evento,
+ # Por isso temos esse retorno true (retorno correto seria false,
+ # pois essa turma tem vinculo com evento não letivo)
+ grade_id = classroom_grades.first.grade.id
+ subject = SchoolDayChecker.new(school_calendar, date, nil, classroom.id, nil).day_allows_entry?
+
+ expect(subject).to be true
+ end
+
+ it 'returns false for a school day when grade_id is provided' do
+ grade_id = classroom_grades.first.grade.id
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, nil, nil).day_allows_entry?
+
+ expect(subject).to be false
+ end
+
+ it 'returns true for a school day when course is provided' do
+ course_id = classroom_grades.first.grade.course.id
+ subject = SchoolDayChecker.new(school_calendar, date, nil, nil, course_id).day_allows_entry?
+
+ expect(subject).to be false
+ end
+ end
+
+ context 'when there is a non-school event and it does not allow entries directly linked to the course' do
+ let(:date) { '2017-04-04'.to_date }
+ let(:grade_id) { classroom_grades.first.grade.id }
+ let!(:school_calendar_event) {
+ create(
+ :school_calendar_event,
+ school_calendar: school_calendar,
+ start_date: '2017-04-04',
+ end_date: '2017-04-04',
+ classroom: nil,
+ course: classroom_grades.first.grade.course,
+ grade: nil,
+ coverage: "by_course",
+ event_type: EventTypes::NO_SCHOOL
+ )
+ }
+
+ it 'returns false for school day when only classroom_id is provided' do
+ subject = SchoolDayChecker.new(school_calendar, date, nil, classroom.id, nil).day_allows_entry?
+ expect(subject).to be false
+ end
+
+ it 'returns false for school day when the classroom_id and grade_id are provided' do
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, classroom.id, nil).day_allows_entry?
+ expect(subject).to be false
+ end
+
+ it 'returns false for school day when only grade is linked to the course' do
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, nil, nil).day_allows_entry?
+ expect(subject).to be false
+ end
+
+ it 'returns false for school day when only course is linked to the event' do
+ course_id = classroom_grades.first.grade.course.id
+ subject = SchoolDayChecker.new(school_calendar, date, nil, nil, course_id).day_allows_entry?
+ expect(subject).to be false
+ end
+ end
+
+ context 'when there is a non-school event and it does not allow entries directly linked to the grade' do
+ let(:date) { '2017-05-05'.to_date }
+ let(:grade_id) { classroom_grades.first.grade.id }
+ let!(:school_calendar_event) {
+ create(
+ :school_calendar_event,
+ school_calendar: school_calendar,
+ start_date: '2017-05-05',
+ end_date: '2017-05-05',
+ classroom: nil,
+ course: classroom_grades.first.grade.course,
+ grade: classroom_grades.first.grade,
+ coverage: "by_grade",
+ event_type: EventTypes::NO_SCHOOL
+ )
+ }
+
+ it 'returns true for a school day when only classroom is linked to the grade' do
+ # Atenção! Quando enviamos apenas o parametro de turma
+ # O serviço não está verificando corretamente se a turma tem vinculo com o evento,
+ # Por isso temos esse retorno true (retorno correto seria false,
+ # pois essa turma tem vinculo com evento nao letivo)
+ subject = SchoolDayChecker.new(school_calendar, date, nil, classroom.id, nil).day_allows_entry?
+ expect(subject).to be true
+ end
+
+ it 'returns false for a school day when the classroom_id and grade_id are provided' do
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, classroom.id, nil).day_allows_entry?
+ expect(subject).to be false
+ end
+
+ it 'returns false for a school day when only grade is provided' do
+ subject = SchoolDayChecker.new(school_calendar, date, grade_id, nil, nil).day_allows_entry?
+ expect(subject).to be false
+ end
+
+ it 'returns false for a school day when the course is provided' do
+ # Atenção! Quando enviamos apenas o parametro de curso
+ # O serviço não está verificando corretamente se a curso tem vinculo com o evento,
+ # Por isso temos esse retorno false (retorno correto seria true,
+ # pois esse evento não letivo está vinculado apenas para a serie e nao para o curso)
+ course_id = classroom_grades.first.grade.course.id
+ subject = SchoolDayChecker.new(school_calendar, date, nil, nil, course_id).day_allows_entry?
+
+ expect(subject).to be false
+ end
+ end
+ end
+
+end
diff --git a/spec/services/student_enrollment_classrooms_retriever_spec.rb b/spec/services/student_enrollment_classrooms_retriever_spec.rb
index 0c42e42f6..5c087815c 100644
--- a/spec/services/student_enrollment_classrooms_retriever_spec.rb
+++ b/spec/services/student_enrollment_classrooms_retriever_spec.rb
@@ -71,13 +71,13 @@
end
it 'should return nil for blank params' do
- expect(
+ expect{
StudentEnrollmentClassroomsRetriever.call(
search_type: '',
classrooms: '',
disciplines: ''
)
- ).to be_nil
+ }.to raise_error(ArgumentError, 'Invalid search type')
end
end
@@ -209,8 +209,8 @@
end
context 'when there is a range of dates to search for student_enrollment_classrooms' do
- # Cria enturmacao que ficara enturmada de janeiro a dezembro de 2022
- # Nao deve estar no retorno do servico que se refere a 2023
+ # Cria enturmacao que ficara enturmada de fevereiro a dezembro de 2022
+ # Não deve estar no retorno do servico que se refere a 2023
let!(:student_enrollment_classrooms_out_date) {
create_list(
:student_enrollment_classroom,
@@ -356,7 +356,7 @@
classrooms: classroom_grade.classroom_id,
disciplines: discipline,
date: '2023-03-03',
- grade: classroom_grade_without_liked.grade
+ grades: classroom_grade_without_liked.grade
)
grade_id = list_enrollment_classrooms.map { |ec|
@@ -540,6 +540,45 @@
expect(student_with_differentiated_exam_rule).to eq([true])
end
end
+
+ context 'when include_inactive is set to false' do
+ subject(:list_enrollment_classrooms) {
+ StudentEnrollmentClassroomsRetriever.call(
+ search_type: :by_date_range,
+ classrooms: classroom_grade.classroom_id,
+ disciplines: discipline,
+ start_at: '2023-02-02',
+ end_at: '2023-04-02',
+ include_inactive: false
+ )
+ }
+
+ before do
+ create(
+ :student_enrollment_classroom,
+ student_enrollment_id: student_enrollment_classrooms.first.student_enrollment_id,
+ classrooms_grade: classroom_grade,
+ joined_at: '2023-05-02',
+ left_at: '2023-06-02'
+ )
+ end
+
+ context 'and show_inactive_enrollments is enabled in configuration' do
+ before { GeneralConfiguration.first.update(show_inactive_enrollments: true) }
+
+ it 'returns only active student_enrollment_classrooms in the date_range' do
+ expect(list_enrollment_classrooms.size).to eq(3)
+ end
+ end
+
+ context 'and show_inactive_enrollments is disabled in configuration' do
+ before { GeneralConfiguration.first.update(show_inactive_enrollments: false) }
+
+ it 'returns only active student_enrollment_classrooms in the date_range' do
+ expect(list_enrollment_classrooms.size).to eq(3)
+ end
+ end
+ end
end
def create_differentiated_exam_rule
diff --git a/spec/services/students_in_recovery_fetcher_spec.rb b/spec/services/students_in_recovery_fetcher_spec.rb
index fe3bd5a2b..63d84d74f 100644
--- a/spec/services/students_in_recovery_fetcher_spec.rb
+++ b/spec/services/students_in_recovery_fetcher_spec.rb
@@ -47,7 +47,7 @@
context 'with only one enrollment' do
it 'returns that enrollment if student is enrolled' do
- expect(subject.fetch).to eq([student])
+ expect(subject.fetch.pluck(:student)).to eq([student])
end
it 'does not return enrollment if student joined after the test' do
@@ -67,9 +67,10 @@
classroom: classroom,
discipline: discipline
)
+
daily_note = create(:daily_note, avaliation: avaliation)
create(:daily_note_student, student: student, daily_note: daily_note, note: 2)
- expect(subject.fetch).to eq([student])
+ expect(subject.fetch.pluck(:student)).to eq([student])
end
it 'does not return if student is not in recovery' do
diff --git a/spec/services/unique_daily_frequency_students_creator_spec.rb b/spec/services/unique_daily_frequency_students_creator_spec.rb
new file mode 100644
index 000000000..71ddea035
--- /dev/null
+++ b/spec/services/unique_daily_frequency_students_creator_spec.rb
@@ -0,0 +1,217 @@
+require 'rails_helper'
+
+RSpec.describe UniqueDailyFrequencyStudentsCreator, type: :service do
+ include ActiveSupport::Testing::TimeHelpers
+
+ before(:all) do
+ travel_to Time.zone.local(2024, 4, 1, 0, 0, 0)
+ end
+
+ after(:all) do
+ travel_back
+ end
+
+ let(:classroom) { create(:classroom) }
+ let(:teacher) { create(:teacher) }
+ let(:discipline) { create(:discipline) }
+ let!(:teacher_discipline_classroom) {
+ create(:teacher_discipline_classroom,
+ teacher: teacher,
+ classroom: classroom,
+ discipline: discipline,
+ year: 2024,
+ allow_absence_by_discipline: 0
+ )
+ }
+ let(:daily_frequency) {
+ create(
+ :daily_frequency,
+ :with_teacher,
+ :with_students,
+ classroom: classroom,
+ teacher: teacher,
+ class_number: nil,
+ discipline_id: nil,
+ frequency_date: '2024-04-01'
+ )
+ }
+ let(:school_calendar) {
+ create(
+ :school_calendar,
+ year: '2024',
+ unity_id: classroom.unity_id
+ )
+ }
+ let!(:school_calendar_step) {
+ create(
+ :school_calendar_step,
+ school_calendar: school_calendar,
+ step_number: 1,
+ start_at: '2024-02-02',
+ end_at: '2024-12-12'
+ )
+ }
+
+ context '#create!' do
+ subject(:unique_daily_frequency_student_creator) do
+ described_class.create!(
+ classroom.id,
+ daily_frequency.frequency_date,
+ teacher.id
+ )
+ end
+
+ it 'creates a unique_daily_frequency_student record' do
+ student_id = daily_frequency.students.first.student_id
+ expected_attributes = {
+ present: daily_frequency.students.first.present,
+ classroom_id: classroom.id,
+ frequency_date: daily_frequency.frequency_date
+ }
+
+ expect { unique_daily_frequency_student_creator }.to change { UniqueDailyFrequencyStudent.count }.by(1)
+ expect(unique_daily_frequency_student_creator).to eq({ student_id => expected_attributes })
+ end
+
+ it 'does not return unique_daily_frequency_student when daily_frequency_student is inactive' do
+ daily_frequency_students_inative = create(
+ :daily_frequency_student, daily_frequency: daily_frequency, active: false)
+ create(:daily_frequency_student, daily_frequency: daily_frequency, active: true)
+ create(:daily_frequency_student, daily_frequency: daily_frequency, active: true)
+
+ expect(unique_daily_frequency_student_creator).not_to have_key(daily_frequency_students_inative.student_id)
+ end
+ end
+
+ context '#teacher_lesson_on_classroom?' do
+ subject(:unique_daily_frequency_student_creator) do
+ described_class.create!(
+ classroom.id,
+ daily_frequency.frequency_date,
+ teacher.id
+ )
+ end
+
+ let(:expected_attributes) do
+ {
+ present: daily_frequency.students.first.present,
+ classroom_id: classroom.id,
+ frequency_date: daily_frequency.frequency_date
+ }
+ end
+
+ it 'creates a UniqueDailyFrequencyStudent record when the teacher has a lesson in the classroom' do
+ student_id = daily_frequency.students.first.student_id
+
+ expect(unique_daily_frequency_student_creator).to eq({ student_id => expected_attributes })
+ end
+
+ it 'raises ActiveRecord::RecordInvalid when the teacher does not have a lesson in the classroom' do
+ teacher_discipline_classroom.destroy
+ expect{unique_daily_frequency_student_creator}.to raise_error(ActiveRecord::RecordInvalid)
+ end
+ end
+
+ context '#validate_parameters!' do
+ it 'creates a UniqueDailyFrequencyStudent record when params are correct' do
+ unique_daily_frequency_student_creator = described_class.create!(
+ classroom.id,
+ daily_frequency.frequency_date,
+ teacher.id
+ )
+ expected_attributes = {
+ present: daily_frequency.students.first.present,
+ classroom_id: classroom.id,
+ frequency_date: daily_frequency.frequency_date
+ }
+
+ student_id = daily_frequency.students.first.student_id
+ expect(unique_daily_frequency_student_creator).to eq({ student_id => expected_attributes })
+ end
+
+ it 'returns raises ArgumentError when params are nil' do
+ expect{
+ UniqueDailyFrequencyStudentsCreator.create!(nil, nil, nil)
+ }.to raise_error(ArgumentError,
+ /Parâmetros inválidos: classroom_id, frequency_date ou teacher_id não estão presentes/)
+ end
+ end
+
+ context 'when the classroom also has frequencies by discipline and class_number' do
+ let(:daily_frequency_two) {
+ create(
+ :daily_frequency,
+ :with_teacher,
+ classroom: classroom,
+ discipline: discipline,
+ teacher: teacher,
+ class_number: '1',
+ frequency_date: daily_frequency.frequency_date
+ )
+ }
+ let(:daily_frequency_three) {
+ create(
+ :daily_frequency,
+ :with_teacher,
+ classroom: classroom,
+ discipline: discipline,
+ teacher: teacher,
+ class_number: '2',
+ frequency_date: daily_frequency.frequency_date
+ )
+ }
+
+ subject(:unique_daily_frequency_student_creator) do
+ described_class.create!(
+ classroom.id,
+ daily_frequency.frequency_date,
+ teacher.id
+ )
+ end
+
+ it 'returns only one frequency per day' do
+ create(:daily_frequency_student,
+ daily_frequency: daily_frequency_two,
+ active: true,
+ student: daily_frequency.students.first.student
+ )
+ create(:daily_frequency_student,
+ daily_frequency: daily_frequency_three,
+ active: true,
+ student: daily_frequency.students.first.student
+ )
+
+ student_id = daily_frequency.students.first.student_id
+ expected_attributes = {
+ present: daily_frequency.students.first.present,
+ classroom_id: classroom.id,
+ frequency_date: daily_frequency.frequency_date
+ }
+
+ expect(unique_daily_frequency_student_creator).to eq({ student_id => expected_attributes })
+ end
+ end
+
+ context 'when the frequency is retroactively removed' do
+ it 'removes the created unique_daily_frequency_student' do
+ student = daily_frequency.students.first.student
+ frequency_date = daily_frequency.frequency_date
+ unique_daily_frequency_student = create(:unique_daily_frequency_student,
+ student: student, classroom: classroom, frequency_date: frequency_date
+ )
+
+ daily_frequency.students.destroy
+ daily_frequency.destroy
+
+ unique_daily_frequency_student_creator = described_class.create!(
+ classroom.id,
+ '2024-04-01',
+ teacher.id
+ )
+
+ expect(UniqueDailyFrequencyStudent.find_by(id: unique_daily_frequency_student.id)).to be_nil
+
+ end
+ end
+
+end
diff --git a/spec/support/vcr.rb b/spec/support/vcr.rb
index 5a90eb17b..70985315a 100644
--- a/spec/support/vcr.rb
+++ b/spec/support/vcr.rb
@@ -2,5 +2,5 @@
c.cassette_library_dir = 'spec/cassettes'
c.hook_into :webmock
c.default_cassette_options = { :record => :new_episodes }
- c.allow_http_connections_when_no_cassette = true
+ c.allow_http_connections_when_no_cassette = false
end
|