GEIQ: Afficher le diagnostic GEIQ d'une candidature acceptée dans le passé [GEN-1701]

itou/eligibility/admin.py

@@ -181,7 +181,7 @@ def get_queryset(self, request):
 class GEIQEligibilityDiagnosisAdmin(AbstractEligibilityDiagnosisAdmin):
     raw_id_fields = AbstractEligibilityDiagnosisAdmin.raw_id_fields + ("author_geiq",)
     readonly_fields = AbstractEligibilityDiagnosisAdmin.readonly_fields + (
-        "has_eligibility",
+        "is_valid",
         "allowance_amount",
     )
     inlines = (
@@ -190,10 +190,6 @@ class GEIQEligibilityDiagnosisAdmin(AbstractEligibilityDiagnosisAdmin):
         PkSupportRemarkInline,
     )
 
-    @admin.display(boolean=True, description="éligibilité GEIQ confirmée")
-    def has_eligibility(self, obj):
-        return obj.eligibility_confirmed
-
     @admin.display(description="montant de l'aide")
     def allowance_amount(self, obj):
         return f"{obj.allowance_amount} EUR"

itou/eligibility/models/geiq.py

@@ -37,10 +37,9 @@
 
 class GEIQEligibilityDiagnosisQuerySet(CommonEligibilityDiagnosisQuerySet):
     def authored_by_prescriber_or_geiq(self, geiq):
-        # In ordering, priority is given to prescriber authored diagnoses
         return self.filter(
             models.Q(author_geiq=geiq) | models.Q(author_prescriber_organization__isnull=False)
-        ).order_by(models.F("author_prescriber_organization").desc(nulls_last=True), "-created_at")
+        ).order_by("-created_at")
 
     def diagnoses_for(self, job_seeker, for_geiq=None):
         # Get *all* GEIQ diagnoses for given job seeker (even expired)
@@ -151,10 +150,6 @@ def save(self, *args, **kwargs):
 
         return result
 
-    @property
-    def eligibility_confirmed(self) -> bool:
-        return bool(self.allowance_amount) and self.is_valid
-
     @property
     def allowance_amount(self) -> int:
         return geiq_allowance_amount(self.author.is_prescriber_with_authorized_org, self.administrative_criteria.all())

itou/templates/apply/includes/eligibility_badge.html

@@ -16,7 +16,7 @@
         </span>
     {% endif %}
 {% elif is_subject_to_geiq_eligibility_rules %}
-    {% if geiq_eligibility_diagnosis.eligibility_confirmed %}
+    {% if geiq_eligibility_diagnosis.is_valid and geiq_eligibility_diagnosis.allowance_amount %}
         <span class="badge badge-base rounded-pill bg-success-lighter text-success">
             <i class="ri-check-line" aria-hidden="true"></i>
             Éligibilité GEIQ confirmée

itou/templates/apply/includes/geiq/geiq_diagnosis_details.html

@@ -1,13 +1,13 @@
-{% if diagnosis.is_valid %}
-    {% if diagnosis.eligibility_confirmed %}
+{% if diagnosis.is_valid or job_application.state.is_accepted and diagnosis %}
+    {% if diagnosis.allowance_amount %}
         <hr class="my-4">
         <h3>Éligibilité public prioritaire GEIQ validée</h3>
     {% else %}
         <hr class="my-4">
         <h3>Éligibilité public prioritaire GEIQ non confirmée</h3>
     {% endif %}
 
-    {% if diagnosis.eligibility_confirmed %}
+    {% if diagnosis.allowance_amount %}
         <p>
             Éligibilité GEIQ confirmée par <b>{{ diagnosis.author.get_full_name }} ({{ diagnosis.author_structure.display_name }})</b>
         </p>
@@ -26,7 +26,7 @@ <h4>Situation administrative du candidat</h4>
         {% endif %}
     {% endwith %}
 
-    {% if diagnosis.eligibility_confirmed %}
+    {% if diagnosis.allowance_amount %}
         <p>
             <b>Durée de validité du diagnostic :</b> du {{ diagnosis.created_at|date:"d/m/Y" }} au {{ diagnosis.expires_at|date:"d/m/Y" }}.
         </p>
@@ -52,7 +52,7 @@ <h4>Situation administrative du candidat</h4>
                 </div>
             </div>
         {% endif %}
-    {% else %}
+    {% elif request.user.is_employer %}
         {# Existing GEIQ, diagnosis but no allowance #}
         <div class="alert alert-warning mt-4">
             <div class="row">
@@ -77,37 +77,37 @@ <h4>Situation administrative du candidat</h4>
     {% endif %}
 {% else %}
     {# Diagnosis either does not exist or has expired : this part is for GEIQ only #}
-    {% if request.user.is_employer %}
-        <hr class="my-4">
-        <div class="row align-items-center">
-            <div class="col-12 col-md">
-                <h3 class="mb-2 mb-md-0">Éligibilité public prioritaire GEIQ non confirmée</h3>
-            </div>
+    <hr class="my-4">
+    <div class="row align-items-center">
+        <div class="col-12 col-md">
+            <h3 class="mb-2 mb-md-0">Éligibilité public prioritaire GEIQ non confirmée</h3>
+        </div>
+        {% if request.user.is_employer %}
             <div class="col-12 col-md-auto">
                 {% with back_and_next_url=request.get_full_path|urlencode %}
                     <a href="{% url 'apply:geiq_eligibility' job_application_id=job_application.pk %}?back_url={{ back_and_next_url }}&next_url={{ back_and_next_url }}" class="btn btn-secondary">
                         Vérifier
                     </a>
                 {% endwith %}
             </div>
-        </div>
-        {# GEIQ eligibility diagnosis expired #}
-        {% if diagnosis and not diagnosis.is_valid %}
-            <div class="alert alert-warning mt-4">
-                <div class="row">
-                    <div class="col-auto pe-0">
-                        <i class="ri-alert-line ri-xl text-warning"></i>
-                    </div>
-                    <div class="col">
-                        <p>
-                            <b>Aide à l'accompagement GEIQ</b>
-                        </p>
-                        <p>
-                            Le diagnostic du candidat a expiré le {{ diagnosis.expires_at|date:"d F Y" }}. Si vous souhaitez bénéficier d’une aide à l’accompagnement, veuillez renseigner à nouveau la situation administrative du candidat.
-                        </p>
+            {# GEIQ eligibility diagnosis expired #}
+            {% if diagnosis and not diagnosis.is_valid %}
+                <div class="alert alert-warning mt-4">
+                    <div class="row">
+                        <div class="col-auto pe-0">
+                            <i class="ri-alert-line ri-xl text-warning"></i>
+                        </div>
+                        <div class="col">
+                            <p>
+                                <b>Aide à l'accompagement GEIQ</b>
+                            </p>
+                            <p>
+                                Le diagnostic du candidat a expiré le {{ diagnosis.expires_at|date:"d F Y" }}. Si vous souhaitez bénéficier d’une aide à l’accompagnement, veuillez renseigner à nouveau la situation administrative du candidat.
+                            </p>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {% endif %}
         {% endif %}
-    {% endif %}
+    </div>
 {% endif %}

itou/templates/apply/process_details.html

@@ -34,7 +34,7 @@ <h2>Informations générales</h2>
             <div class="c-box mb-4">
                 <h3>Informations personnelles</h3>
                 {% include "apply/includes/job_seeker_info.html" with job_seeker=job_application.job_seeker job_application=job_application can_view_personal_information=can_view_personal_information can_edit_personal_information=can_edit_personal_information request=request csrf_token=csrf_token SenderKind=SenderKind only %}
-                {% if job_application.to_company.kind == CompanyKind.GEIQ and geiq_eligibility_diagnosis %}
+                {% if job_application.to_company.kind == CompanyKind.GEIQ %}
                     {# GEIQ eligibility details #}
                     {% include "apply/includes/geiq/geiq_diagnosis_details.html" with diagnosis=geiq_eligibility_diagnosis %}
                 {% else %}

itou/www/apply/views/process_views.py

@@ -49,14 +49,17 @@ def check_waiting_period(job_application):
         raise PermissionDenied(apply_view_constants.ERROR_CANNOT_OBTAIN_NEW_FOR_PROXY)
 
 
-def _get_geiq_eligibility_diagnosis_for_company(job_application):
-    # Get current GEIQ diagnosis or *last expired one*
-    return (
-        job_application.geiq_eligibility_diagnosis
-        or GEIQEligibilityDiagnosis.objects.diagnoses_for(
-            job_application.job_seeker, job_application.to_company
-        ).first()
-    )
+def _get_geiq_eligibility_diagnosis(job_application, only_prescriber):
+    # Return the job_application diagnosis if it's accepted
+    if job_application.state.is_accepted:
+        # but not if the viewer is a prescriber and the diangosis was made by the company
+        if only_prescriber and job_application.geiq_eligibility_diagnosis.author_geiq:
+            return None
+        return job_application.geiq_eligibility_diagnosis
+    return GEIQEligibilityDiagnosis.objects.diagnoses_for(
+        job_application.job_seeker,
+        job_application.to_company if not only_prescriber else None,
+    ).first()
 
 
 @login_required
@@ -86,10 +89,11 @@ def details_for_jobseeker(request, job_application_id, template_name="apply/proc
     )
 
     back_url = get_safe_url(request, "back_url", fallback_url=reverse_lazy("apply:list_for_job_seeker"))
-    geiq_eligibility_diagnosis = None
 
-    if job_application.to_company.kind == CompanyKind.GEIQ:
-        geiq_eligibility_diagnosis = _get_geiq_eligibility_diagnosis_for_company(job_application)
+    geiq_eligibility_diagnosis = (
+        job_application.to_company.kind == CompanyKind.GEIQ
+        and _get_geiq_eligibility_diagnosis(job_application, only_prescriber=False)
+    )
 
     context = {
         "can_view_personal_information": request.user.can_view_personal_information(job_application.job_seeker),
@@ -141,10 +145,11 @@ def details_for_company(request, job_application_id, template_name="apply/proces
     )
 
     back_url = get_safe_url(request, "back_url", fallback_url=reverse_lazy("apply:list_for_siae"))
-    geiq_eligibility_diagnosis = None
 
-    if job_application.to_company.kind == CompanyKind.GEIQ:
-        geiq_eligibility_diagnosis = _get_geiq_eligibility_diagnosis_for_company(job_application)
+    geiq_eligibility_diagnosis = (
+        job_application.to_company.kind == CompanyKind.GEIQ
+        and _get_geiq_eligibility_diagnosis(job_application, only_prescriber=False)
+    )
 
     context = {
         "can_view_personal_information": True,  # SIAE members have access to personal info
@@ -206,10 +211,7 @@ def details_for_prescriber(request, job_application_id, template_name="apply/pro
     # Latest GEIQ diagnosis for this job seeker created by a *prescriber*
     geiq_eligibility_diagnosis = (
         job_application.to_company.kind == CompanyKind.GEIQ
-        and GEIQEligibilityDiagnosis.objects.valid()
-        .filter(job_seeker=job_application.job_seeker, author_prescriber_organization__isnull=False)
-        .select_related("author", "author_geiq", "author_prescriber_organization")
-        .first()
+        and _get_geiq_eligibility_diagnosis(job_application, only_prescriber=True)
     )
 
     # Refused applications information is providen to prescribers
@@ -682,7 +684,7 @@ def delete_prior_action(request, job_application_id, prior_action_id):
                 # GEIQ cannot require IAE eligibility diagnosis, but shared templates need this variable.
                 "eligibility_diagnosis_by_siae_required": False,
                 "geiq_eligibility_diagnosis": (
-                    _get_geiq_eligibility_diagnosis_for_company(job_application)
+                    _get_geiq_eligibility_diagnosis(job_application, only_prescriber=False)
                     if job_application.to_company.kind == CompanyKind.GEIQ
                     else None
                 ),
@@ -751,7 +753,7 @@ def add_or_modify_prior_action(request, job_application_id, prior_action_id=None
             form.save()
             geiq_eligibility_diagnosis = None
             if state_update and job_application.to_company.kind == CompanyKind.GEIQ:
-                geiq_eligibility_diagnosis = _get_geiq_eligibility_diagnosis_for_company(job_application)
+                geiq_eligibility_diagnosis = _get_geiq_eligibility_diagnosis(job_application, only_prescriber=False)
             return render(
                 request,
                 "apply/includes/job_application_prior_action.html",

tests/companies/factories.py

@@ -1,4 +1,3 @@
-import functools
 import string
 
 import factory.fuzzy
@@ -174,7 +173,9 @@ class CompanyWith4MembershipsFactory(CompanyFactory):
     membership4 = factory.RelatedFactory(CompanyMembershipFactory, "company", is_admin=False, user__is_active=False)
 
 
-CompanyWithMembershipAndJobsFactory = functools.partial(CompanyFactory, with_membership=True, with_jobs=True)
+class CompanyWithMembershipAndJobsFactory(CompanyFactory):
+    with_membership = True
+    with_jobs = True
 
 
 class SiaeConventionPendingGracePeriodFactory(SiaeConventionFactory):

tests/eligibility/factories.py

@@ -1,6 +1,7 @@
 import random
 
 import factory
+from dateutil.relativedelta import relativedelta
 from django.utils import timezone
 
 from itou.companies.enums import CompanyKind
@@ -23,7 +24,10 @@ class Params:
             ),
             author=factory.LazyAttribute(lambda obj: obj.author_prescriber_organization.members.first()),
         )
-        expired = factory.Trait(expires_at=factory.LazyFunction(timezone.now))
+        expired = factory.Trait(
+            expires_at=factory.LazyFunction(timezone.now),
+            created_at=factory.LazyAttribute(lambda obj: obj.expires_at - relativedelta(months=6)),
+        )
 
     created_at = factory.LazyFunction(timezone.now)
     job_seeker = factory.SubFactory(JobSeekerFactory)

tests/eligibility/test_geiq.py

@@ -3,7 +3,6 @@
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError, transaction
 from django.db.models import Max
-from django.utils import timezone
 
 from itou.companies.enums import CompanyKind
 from itou.eligibility.enums import AdministrativeCriteriaAnnex, AdministrativeCriteriaLevel
@@ -220,7 +219,7 @@ def test_geiq_administrative_criteria_validation(
 GEIQ_ALLOWANCE_AMOUNT_814 = 814
 
 
-def test_geiq_eligibility_diagnosis_allowance_and_eligibility(
+def test_geiq_eligibility_diagnosis_allowance(
     administrative_criteria_annex_1,
     administrative_criteria_annex_2_level_1,
     administrative_criteria_annex_2_level_2,
@@ -230,66 +229,46 @@ def test_geiq_eligibility_diagnosis_allowance_and_eligibility(
         annex=AdministrativeCriteriaAnnex.ANNEX_2,
         level=AdministrativeCriteriaLevel.LEVEL_2,
     )[:2]
-    diagnosis = GEIQEligibilityDiagnosisFactory(from_prescriber=True)
 
     # Prescriber author gets it all
-    assert diagnosis.eligibility_confirmed
+    diagnosis = GEIQEligibilityDiagnosisFactory(from_prescriber=True)
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_1400
 
     diagnosis = GEIQEligibilityDiagnosisFactory(from_geiq=True)
-
-    assert not diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == 0
 
-    diagnosis.administrative_criteria.add(a2l2_crits[0])
-
     # One A2L2 is not enough
-    assert not diagnosis.eligibility_confirmed
+    diagnosis.administrative_criteria.add(a2l2_crits[0])
     assert diagnosis.allowance_amount == 0
 
     # Two is ok
     diagnosis.administrative_criteria.add(a2l2_crits[1])
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_1400
 
     # One L1 is enough to get max allowance
     diagnosis = GEIQEligibilityDiagnosisFactory(from_geiq=True)
     diagnosis.administrative_criteria.add(administrative_criteria_annex_2_level_1)
-
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_1400
 
     diagnosis = GEIQEligibilityDiagnosisFactory(from_geiq=True)
     diagnosis.administrative_criteria.add(administrative_criteria_annex_1)
-
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_814
 
     # Adding another criteria will max allowance
     diagnosis.administrative_criteria.add(administrative_criteria_annex_2_level_1)
-
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_1400
 
     # Special case of dual-annex criteria:
 
     # Counts as Annex 1 criterion...
     diagnosis = GEIQEligibilityDiagnosisFactory(from_geiq=True)
     diagnosis.administrative_criteria.add(administrative_criteria_both_annexes)
-
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_814
 
     # ... and also as Annex 2 Level 2 criterion
     diagnosis.administrative_criteria.add(administrative_criteria_annex_2_level_2)
-
-    assert diagnosis.eligibility_confirmed
     assert diagnosis.allowance_amount == GEIQ_ALLOWANCE_AMOUNT_1400
 
-    # GEIQ eligibility is not confirmed with valid criteria and expired diagnosis
-    diagnosis = GEIQEligibilityDiagnosisFactory(from_prescriber=True, expires_at=timezone.now())
-    assert not diagnosis.eligibility_confirmed
-
 
 def test_create_duplicate_diagnosis_in_same_geiq():
     diagnosis = GEIQEligibilityDiagnosisFactory(from_geiq=True)

tests/job_applications/factories.py

@@ -9,6 +9,7 @@
 from itou.eligibility.enums import AuthorKind
 from itou.job_applications import models
 from itou.job_applications.enums import (
+    JobApplicationState,
     Prequalification,
     ProfessionalSituationExperience,
     SenderKind,
@@ -65,8 +66,8 @@ class Params:
             eligibility_diagnosis=None,
         )
         with_geiq_eligibility_diagnosis_from_prescriber = factory.Trait(
+            sent_by_authorized_prescriber_organisation=True,
             to_company=factory.SubFactory(CompanyFactory, with_membership=True, kind=CompanyKind.GEIQ),
-            sender=factory.LazyAttribute(lambda obj: obj.sender_prescriber_organization.members.first()),
             geiq_eligibility_diagnosis=factory.SubFactory(
                 GEIQEligibilityDiagnosisFactory,
                 job_seeker=factory.SelfAttribute("..job_seeker"),
@@ -91,7 +92,7 @@ class Params:
             sender=factory.LazyAttribute(lambda obj: obj.sender_company.members.first()),
         )
         was_hired = factory.Trait(
-            state="accepted",
+            state=JobApplicationState.ACCEPTED,
             to_company__with_jobs=True,
             hired_job=factory.SubFactory(JobDescriptionFactory, company=factory.SelfAttribute("..to_company")),
         )