www.apply: take advantage of jobseeker_valid_eligibility_diagnosis an…

…notation

to prevent extra queries

jobseeker_eligibility_diagnosis could not be used because the
application eligibilit_diagnosis could be an expired diagnosis in the
case of accepted then cancelled applications.

itou/job_applications/models.py

@@ -227,10 +227,9 @@ def with_accepted_at(self):
             )
         )
 
-    def with_jobseeker_eligibility_diagnosis(self):
+    def with_jobseeker_valid_eligibility_diagnosis(self):
         """
-        Gives the "eligibility_diagnosis" linked to the job application or if none is found
-        the last valid eligibility diagnosis for this job seeker and this SIAE
+        Gives the last valid eligibility diagnosis for this job seeker and this SIAE
         """
         sub_query = Subquery(
             (
@@ -240,7 +239,18 @@ def with_jobseeker_eligibility_diagnosis(self):
             ),
             output_field=models.IntegerField(),
         )
-        return self.annotate(jobseeker_eligibility_diagnosis=Coalesce(F("eligibility_diagnosis"), sub_query, None))
+        return self.annotate(jobseeker_valid_eligibility_diagnosis=sub_query)
+
+    def with_jobseeker_eligibility_diagnosis(self):
+        """
+        Gives the "eligibility_diagnosis" linked to the job application or if none is found
+        the last valid eligibility diagnosis for this job seeker and this SIAE
+        """
+        return self.with_jobseeker_valid_eligibility_diagnosis().annotate(
+            jobseeker_eligibility_diagnosis=Coalesce(
+                F("eligibility_diagnosis"), F("jobseeker_valid_eligibility_diagnosis")
+            )
+        )
 
     def eligibility_validated(self):
         return self.filter(

itou/templates/apply/includes/list_card_body_company.html

@@ -29,7 +29,7 @@ <h3>
                                 PASS IAE {{ approval.get_state_display|lower }}
                             </span>
                         {% else %}
-                            {% if job_application.iae_eligibility_diagnosis_required %}
+                            {% if not job_application.jobseeker_valid_eligibility_diagnosis %}
                                 <span class="badge badge-xs rounded-pill bg-accent-02-lighter text-primary">
                                     <i class="ri-error-warning-line" aria-hidden="true"></i>
                                     Éligibilité IAE à valider

itou/www/apply/views/list_views.py

@@ -83,11 +83,6 @@ def _add_administrative_criteria(job_applications):
         job_application.preloaded_administrative_criteria_extra_nb = extra_nb
 
 
-def _add_eligibility_diagnosis_required(job_applications):
-    for job_app in job_applications:
-        job_app.iae_eligibility_diagnosis_required = job_app.eligibility_diagnosis_by_siae_required()
-
-
 @login_required
 @user_passes_test(lambda u: u.is_job_seeker, login_url=reverse_lazy("search:employers_home"), redirect_field_name=None)
 def list_for_job_seeker(request, template_name="apply/list_for_job_seeker.html"):
@@ -164,7 +159,6 @@ def list_prescriptions(request, template_name="apply/list_prescriptions.html"):
     _add_pending_for_weeks(job_applications_page)
     _add_user_can_view_personal_information(job_applications_page, request.user.can_view_personal_information)
     _add_administrative_criteria(job_applications_page)
-    _add_eligibility_diagnosis_required(job_applications_page)
 
     context = {
         "title": title,
@@ -293,7 +287,6 @@ def list_for_siae(request, template_name="apply/list_for_siae.html"):
     iae_company = company.kind in SIAE_WITH_CONVENTION_KINDS
     if iae_company:
         _add_administrative_criteria(job_applications_page)
-    _add_eligibility_diagnosis_required(job_applications_page)
 
     context = {
         "title": title,