Récupération de l'objet 'SchoolYear' plutôt que l'année scolaire

betagouv · Oct 21, 2024 · 312e8ec · 312e8ec
1 parent a739d70
commit 312e8ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -155,7 +155,7 @@ def choose_redirect_page!
     end
 
     def fetch_students_for!(establishments)
-      ActiveJob.perform_all_later(establishments.map { |e| Sync::ClassesJob.new(e, selected_school_year.start_year) })
+      ActiveJob.perform_all_later(establishments.map { |e| Sync::ClassesJob.new(e, selected_school_year) })
     end
 
     def fetch_establishments!

diff --git a/app/jobs/sync/classes_job.rb b/app/jobs/sync/classes_job.rb
@@ -28,7 +28,7 @@ def perform(establishment, school_year)
       api = establishment.students_api
 
       api
-        .fetch_resource(:establishment_students, uai: establishment.uai, school_year:)
+        .fetch_resource(:establishment_students, uai: establishment.uai, school_year: school_year.start_year)
         .then { |data| api.mapper.new(data, establishment.uai).parse! }
     end
   end

diff --git a/spec/jobs/sync/classes_job_spec.rb b/spec/jobs/sync/classes_job_spec.rb
@@ -6,13 +6,16 @@
   include ActiveJob::TestHelper
 
   let(:establishment) { create(:establishment, :sygne_provider) }
+  let(:school_year) { SchoolYear.current }
   let(:api_double) { class_double(StudentsApi::Sygne::Api) }
   let(:mapper_double) { instance_double(Student::Mappers::Sygne) }
 
   before do
     allow(StudentsApi).to receive(:api_for).with("sygne").and_return(api_double)
 
-    allow(api_double).to receive(:fetch_resource).with(:establishment_students, uai: establishment.uai, school_year: 2022)
+    allow(api_double).to receive(:fetch_resource).with(:establishment_students,
+                                                       uai: establishment.uai,
+                                                       school_year: school_year.start_year)
     allow(api_double)
       .to receive(:mapper)
       .and_return(class_double(Student::Mappers::Sygne, new: mapper_double))
@@ -21,13 +24,13 @@
   end
 
   it "calls the matchingStudentsApi proxy" do
-    described_class.perform_now(establishment, 2022)
+    described_class.perform_now(establishment, school_year)
 
     expect(StudentsApi).to have_received(:api_for).with("sygne")
   end
 
   it "maps and parse the results" do
-    described_class.perform_now(establishment, 2022)
+    described_class.perform_now(establishment, school_year)
 
     expect(mapper_double).to have_received(:parse!)
   end
@@ -39,7 +42,7 @@
 
     it "rescues and retry" do
       perform_enqueued_jobs do
-        described_class.perform_now(establishment, 2022)
+        described_class.perform_now(establishment, school_year)
       rescue Faraday::UnauthorizedError # rubocop:disable Lint/SuppressedException
       end