Update ApiSerializers to use apply_deadline method

DFE-Digital · Jun 26, 2024 · b937e81 · b937e81
1 parent fe298cc
commit b937e81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/services/candidate_api/serializers/v1_1.rb b/app/services/candidate_api/serializers/v1_1.rb
@@ -5,7 +5,7 @@ def query
         Candidate
         .left_outer_joins(:application_forms)
         .where(application_forms: { recruitment_cycle_year: RecruitmentCycle.current_year })
-        .or(Candidate.where('candidates.created_at > ? ', CycleTimetable.apply_1_deadline(RecruitmentCycle.previous_year)))
+        .or(Candidate.where('candidates.created_at > ? ', CycleTimetable.apply_deadline(RecruitmentCycle.previous_year)))
         .distinct
         .includes(application_forms: :application_choices)
         .where('candidate_api_updated_at > ?', updated_since)

diff --git a/app/services/candidate_api/serializers/v1_2.rb b/app/services/candidate_api/serializers/v1_2.rb
@@ -22,7 +22,7 @@ def query
           .left_outer_joins(application_forms: { application_choices: %i[provider course interviews], application_references: [], application_qualifications: [] })
           .includes(application_forms: { application_choices: %i[provider course course_option interviews], application_qualifications: [], application_references: [] })
           .where('candidates.updated_at > :updated_since OR application_forms.updated_at > :updated_since OR application_choices.updated_at > :updated_since OR "references".updated_at > :updated_since OR application_qualifications.updated_at > :updated_since', updated_since:)
-          .where('application_forms.recruitment_cycle_year = ? OR candidates.created_at > ?', RecruitmentCycle.current_year, CycleTimetable.apply_1_deadline(RecruitmentCycle.previous_year))
+          .where('application_forms.recruitment_cycle_year = ? OR candidates.created_at > ?', RecruitmentCycle.current_year, CycleTimetable.apply_deadline(RecruitmentCycle.previous_year))
           .order(id: :asc)
           .distinct
       end

diff --git a/app/services/candidate_api/serializers/v1_3.rb b/app/services/candidate_api/serializers/v1_3.rb
@@ -22,7 +22,7 @@ def query
           .left_outer_joins(application_forms: { application_choices: %i[provider course interviews], application_references: [], application_qualifications: [] })
           .includes(application_forms: { application_choices: %i[provider course course_option interviews], application_qualifications: [], application_references: [] })
           .where('candidates.updated_at > :updated_since OR application_forms.updated_at > :updated_since OR application_choices.updated_at > :updated_since OR "references".updated_at > :updated_since OR application_qualifications.updated_at > :updated_since', updated_since:)
-          .where('application_forms.recruitment_cycle_year = ? OR candidates.created_at > ?', RecruitmentCycle.current_year, CycleTimetable.apply_1_deadline(RecruitmentCycle.previous_year))
+          .where('application_forms.recruitment_cycle_year = ? OR candidates.created_at > ?', RecruitmentCycle.current_year, CycleTimetable.apply_deadline(RecruitmentCycle.previous_year))
           .order(id: :asc)
           .distinct
       end