PASS IAE: La date de début du contrat doit être avant la date de fin du PASS [GEN-2225]

itou/approvals/models.py

@@ -208,15 +208,15 @@ class CommonApprovalQuerySet(models.QuerySet):
     A QuerySet shared by both `Approval` and `PoleEmploiApproval` models.
     """
 
-    @property
-    def valid_lookup(self):
-        return Q(end_at__gte=timezone.localdate())
+    def valid_lookup(self, on_date=None):
+        on_date = on_date or timezone.localdate()
+        return Q(end_at__gte=on_date)
 
-    def valid(self):
-        return self.filter(self.valid_lookup)
+    def valid(self, on_date=None):
+        return self.filter(self.valid_lookup(on_date))
 
-    def invalid(self):
-        return self.exclude(self.valid_lookup)
+    def invalid(self, on_date=None):
+        return self.exclude(self.valid_lookup(on_date))
 
     def starts_in_the_past(self):
         return self.filter(Q(start_at__lt=timezone.localdate()))

itou/eligibility/models/common.py

@@ -14,6 +14,7 @@
 )
 from itou.eligibility.tasks import async_certify_criteria, certify_criteria
 from itou.job_applications.enums import SenderKind
+from itou.utils.date import make_date_timezone_aware
 from itou.utils.models import InclusiveDateRangeField
 from itou.utils.types import InclusiveDateRange
 
@@ -22,8 +23,9 @@
 
 
 class CommonEligibilityDiagnosisQuerySet(models.QuerySet):
-    def valid(self):
-        return self.filter(expires_at__gt=timezone.now())
+    def valid(self, on_date=None):
+        on_date = on_date or timezone.now()
+        return self.filter(expires_at__gt=make_date_timezone_aware(on_date))
 
     def expired(self):
         return self.filter(expires_at__lte=timezone.now())

itou/eligibility/models/iae.py

@@ -8,6 +8,7 @@
 
 from itou.approvals.models import Approval
 from itou.eligibility.enums import AdministrativeCriteriaLevel, AuthorKind
+from itou.utils.date import make_date_timezone_aware
 
 from .common import (
     AbstractAdministrativeCriteria,
@@ -39,10 +40,10 @@ def has_approval(self):
 
 
 class EligibilityDiagnosisManager(models.Manager):
-    def has_considered_valid(self, job_seeker, for_siae=None):
+    def has_considered_valid(self, job_seeker, for_siae=None, on_date=None):
         """
         Returns True if the given job seeker has a considered valid diagnosis,
-        False otherwise.
+        False otherwise. If on_date is given, the validity is considered for this date.
 
         We consider the eligibility as valid when a PASS IAE is valid but
         the eligibility diagnosis is missing.
@@ -57,7 +58,11 @@ def has_considered_valid(self, job_seeker, for_siae=None):
         Hence the Trello #2604 decision: if a PASS IAE is valid, we do not
         check the presence of an eligibility diagnosis.
         """
-        return job_seeker.has_valid_approval or bool(self.last_considered_valid(job_seeker, for_siae=for_siae))
+        on_date = on_date or timezone.now()
+        last_valid_diagnosis = self.last_considered_valid(job_seeker, for_siae=for_siae)
+        return job_seeker.has_valid_approval_for_date(on_date) or (
+            last_valid_diagnosis and last_valid_diagnosis.expires_at > make_date_timezone_aware(on_date)
+        )
 
     def last_considered_valid(self, job_seeker, for_siae=None, prefetch=None):
         """

itou/job_applications/export.py

@@ -67,7 +67,7 @@ def _get_selected_jobs(job_application):
 def _get_eligibility_status(job_application):
     eligibility = "non"
     # Eligibility diagnoses made by SIAE are ignored.
-    if job_application.job_seeker.has_valid_diagnosis():
+    if job_application.job_seeker_has_valid_diagnosis():
         eligibility = "oui"
 
     return eligibility

itou/job_applications/models.py

@@ -229,8 +229,11 @@ def with_jobseeker_valid_eligibility_diagnosis(self):
         """
         sub_query = Subquery(
             (
-                EligibilityDiagnosis.objects.valid()
-                .for_job_seeker_and_siae(job_seeker=OuterRef("job_seeker"), siae=OuterRef("to_company"))
+                EligibilityDiagnosis.objects.for_job_seeker_and_siae(
+                    job_seeker=OuterRef("job_seeker"), siae=OuterRef("to_company")
+                )
+                .filter(expires_at__gt=OuterRef("hiring_start_at"))
+                .valid()
                 .values("id")[:1]
             ),
             output_field=models.IntegerField(),
@@ -251,14 +254,14 @@ def with_jobseeker_eligibility_diagnosis(self):
     def eligibility_validated(self):
         return self.filter(
             Exists(
-                Approval.objects.filter(
-                    user=OuterRef("job_seeker"),
-                ).valid()
+                Approval.objects.filter(user=OuterRef("job_seeker"), end_at__gte=OuterRef("hiring_start_at")).valid()
             )
             | Exists(
                 EligibilityDiagnosis.objects.for_job_seeker_and_siae(
                     OuterRef("job_seeker"), siae=OuterRef("to_company")
-                ).valid()
+                )
+                .filter(expires_at__gt=OuterRef("hiring_start_at"))
+                .valid()
             )
         )
 
@@ -729,13 +732,18 @@ def is_sent_by_authorized_prescriber(self):
     def is_spontaneous(self):
         return not self.selected_jobs.exists()
 
+    def job_seeker_has_valid_diagnosis(self):
+        return self.job_seeker.has_valid_diagnosis(for_siae=self.to_company, on_date=self.hiring_start_at)
+
     def eligibility_diagnosis_by_siae_required(self):
         """
         Returns True if an eligibility diagnosis must be made by an SIAE
         when processing an application, False otherwise.
         """
-        return self.to_company.is_subject_to_eligibility_rules and not self.job_seeker.has_valid_diagnosis(
-            for_siae=self.to_company
+        return (
+            not self.hiring_without_approval
+            and self.to_company.is_subject_to_eligibility_rules
+            and not self.job_seeker_has_valid_diagnosis()
         )
 
     @property

itou/users/models.py

@@ -34,6 +34,7 @@
 from itou.common_apps.address.format import compute_hexa_address
 from itou.common_apps.address.models import AddressMixin
 from itou.companies.enums import CompanyKind
+from itou.utils.date import make_date_timezone_aware
 from itou.utils.db import or_queries
 from itou.utils.models import UniqueConstraintWithErrorCode
 from itou.utils.templatetags.str_filters import mask_unless
@@ -511,6 +512,10 @@ def latest_common_approval(self):
 
         return self.latest_approval or self.latest_pe_approval
 
+    def has_valid_approval_for_date(self, on_date):
+        on_date = make_date_timezone_aware(on_date)
+        return self.has_valid_approval and make_date_timezone_aware(self.latest_approval.end_at) > on_date
+
     @property
     def has_valid_approval(self):
         return self.latest_approval and self.latest_approval.is_valid()
@@ -533,11 +538,10 @@ def new_approval_blocked_by_waiting_period(self, siae, sender_prescriber_organiz
         )
 
         # Only diagnoses made by authorized prescribers are taken into account.
-        has_valid_diagnosis = self.has_valid_diagnosis()
         return (
             self.has_latest_common_approval_in_waiting_period
             and siae.is_subject_to_eligibility_rules
-            and not (is_sent_by_authorized_prescriber or has_valid_diagnosis)
+            and not (is_sent_by_authorized_prescriber or self.has_valid_diagnosis())
         )
 
     @property
@@ -563,8 +567,9 @@ def has_external_data(self):
     def has_jobseeker_profile(self):
         return self.is_job_seeker and hasattr(self, "jobseeker_profile")
 
-    def has_valid_diagnosis(self, for_siae=None):
-        return self.eligibility_diagnoses.has_considered_valid(job_seeker=self, for_siae=for_siae)
+    def has_valid_diagnosis(self, for_siae=None, on_date=None):
+        on_date = on_date or timezone.now()
+        return self.eligibility_diagnoses.has_considered_valid(job_seeker=self, for_siae=for_siae, on_date=on_date)
 
     def joined_recently(self):
         time_since_date_joined = timezone.now() - self.date_joined

itou/utils/date.py

@@ -6,3 +6,15 @@
 def monday_of_the_week(value=None):
     the_day = timezone.localdate(value)
     return the_day - datetime.timedelta(days=the_day.weekday())
+
+
+def make_date_timezone_aware(value, tz=None):
+    """
+    Makes datetime.date or datetime.datetime timezone aware.
+    Useful when providing a DateField to a query on the DateTimeField of another field/model.
+    """
+    if not hasattr(value, "hour"):
+        value = datetime.datetime.combine(value, datetime.datetime.min.time())
+    if timezone.is_aware(value):
+        return value
+    return timezone.make_aware(value, tz)

itou/www/apply/views/process_views.py

@@ -536,19 +536,27 @@ def accept(request, job_application_id, template_name="apply/process_accept.html
     Trigger the `accept` transition.
     """
     queryset = JobApplication.objects.is_active_company_member(request.user).select_related(
-        "job_seeker", "job_seeker__jobseeker_profile"
+        "job_seeker", "job_seeker__jobseeker_profile", "to_company"
     )
     job_application = get_object_or_404(queryset, id=job_application_id)
+    job_seeker = job_application.job_seeker
     check_waiting_period(job_application)
     next_url = reverse("apply:details_for_company", kwargs={"job_application_id": job_application.pk})
-    if not job_application.hiring_without_approval and job_application.eligibility_diagnosis_by_siae_required():
-        messages.error(request, "Cette candidature requiert un diagnostic d'éligibilité pour être acceptée.")
+
+    # Verify PASS IAE approval.
+    if job_application.eligibility_diagnosis_by_siae_required():
+        # Either the candidate has a valid diagnosis that will be out of date...
+        if job_seeker.has_valid_diagnosis(for_siae=job_application.to_company, on_date=timezone.now()):
+            messages.error(request, "Le contrat doit débuter sur la période couverte par le PASS IAE.")
+        # Or they have no valid diagnosis.
+        else:
+            messages.error(request, "Cette candidature requiert un diagnostic d'éligibilité pour être acceptée.")
         return HttpResponseRedirect(next_url)
 
     return common_views._accept(
         request,
         job_application.to_company,
-        job_application.job_seeker,
+        job_seeker,
         error_url=next_url,
         back_url=next_url,
         template_name=template_name,

tests/eligibility/test_iae.py

@@ -120,6 +120,22 @@ def test_expired_itou_diagnosis(self):
         assert last_considered_valid is None
         assert last_expired is not None
 
+    def test_diagnosis_expiring(self):
+        expires_at = timezone.now() + datetime.timedelta(days=1)
+        diagnosis = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=self.job_seeker, expires_at=expires_at
+        )
+        has_considered_valid = EligibilityDiagnosis.objects.has_considered_valid(job_seeker=diagnosis.job_seeker)
+        last_considered_valid = EligibilityDiagnosis.objects.last_considered_valid(job_seeker=diagnosis.job_seeker)
+        last_expired = EligibilityDiagnosis.objects.last_expired(job_seeker=diagnosis.job_seeker)
+        assert last_considered_valid == diagnosis
+        assert last_expired is None
+        assert has_considered_valid
+
+        assert not EligibilityDiagnosis.objects.has_considered_valid(
+            job_seeker=diagnosis.job_seeker, on_date=(expires_at + datetime.timedelta(hours=1))
+        )
+
     def test_expired_itou_diagnosis_with_ongoing_approval(self):
         expired_diagnosis = IAEEligibilityDiagnosisFactory(
             from_prescriber=True, job_seeker=self.job_seeker, expired=True

tests/job_applications/tests.py

@@ -87,6 +87,19 @@ def test_eligibility_diagnosis_by_siae_required(self):
         assert not has_considered_valid_diagnoses
         assert job_application.eligibility_diagnosis_by_siae_required()
 
+    def test_eligibility_diagnosis_by_siae_required_hiring_without_approval(self):
+        job_application = JobApplicationFactory(
+            state=JobApplicationState.PROCESSING,
+            to_company__kind=CompanyKind.EI,
+            eligibility_diagnosis=None,
+            hiring_without_approval=True,
+        )
+        has_considered_valid_diagnoses = EligibilityDiagnosis.objects.has_considered_valid(
+            job_application.job_seeker, for_siae=job_application.to_company
+        )
+        assert not has_considered_valid_diagnoses
+        assert not job_application.eligibility_diagnosis_by_siae_required()
+
     def test_accepted_by(self):
         job_application = JobApplicationFactory(
             sent_by_authorized_prescriber_organisation=True,
@@ -383,6 +396,15 @@ def test_with_jobseeker_eligibility_diagnosis(self):
         qs = JobApplication.objects.with_jobseeker_eligibility_diagnosis().get(pk=job_app.pk)
         assert qs.jobseeker_eligibility_diagnosis == diagnosis.pk
 
+    def test_with_jobseeker_eligibility_diagnosis_expires_before_job_start(self):
+        tomorrow = timezone.localdate() + datetime.timedelta(days=1)
+        job_app = JobApplicationFactory(
+            with_approval=True, eligibility_diagnosis__expires_at=timezone.now(), hiring_start_at=tomorrow
+        )
+        qs = JobApplication.objects.with_jobseeker_eligibility_diagnosis().get(pk=job_app.pk)
+        # Not considered valid.
+        assert qs.jobseeker_valid_eligibility_diagnosis is None
+
     def test_with_jobseeker_eligibility_diagnosis_with_a_denormalized_diagnosis_from_prescriber(self):
         job_application = JobApplicationFactory(
             sent_by_authorized_prescriber_organisation=True,

tests/utils/test_date.py

@@ -1,8 +1,9 @@
 import datetime
 
 import freezegun
+from django.utils import timezone
 
-from itou.utils.date import monday_of_the_week
+from itou.utils.date import make_date_timezone_aware, monday_of_the_week
 
 
 def test_monday_of_the_week_with_arguments():
@@ -21,3 +22,14 @@ def test_monday_of_the_week_with_arguments():
 def test_monday_of_the_week_without_arguments():
     with freezegun.freeze_time(datetime.date(2024, 8, 1)):
         assert monday_of_the_week() == datetime.date(2024, 7, 29)
+
+
+@freezegun.freeze_time("2024-12-04 15:00:00")
+def test_make_date_timezone_aware():
+    assert timezone.is_aware(make_date_timezone_aware(datetime.date.today()))
+
+    assert make_date_timezone_aware(datetime.date.today()).strftime("%Y-%m-%d %H:%M") == "2024-12-04 00:00"
+    assert make_date_timezone_aware(timezone.localdate()).strftime("%Y-%m-%d %H:%M") == "2024-12-04 00:00"
+
+    assert make_date_timezone_aware(datetime.datetime.now()).strftime("%Y-%m-%d %H") == "2024-12-04 15"
+    assert make_date_timezone_aware(timezone.now()).strftime("%Y-%m-%d %H") == "2024-12-04 15"

tests/www/apply/__snapshots__/test_list_for_siae.ambr

@@ -716,19 +716,21 @@
                     COALESCE("job_applications_jobapplication"."eligibility_diagnosis_id",
                                (SELECT U0."id"
                                 FROM "eligibility_eligibilitydiagnosis" U0
-                                WHERE (U0."expires_at" > %s
-                                       AND (U0."author_kind" = %s
-                                            OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
-                                       AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id"))
+                                WHERE ((U0."author_kind" = %s
+                                        OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
+                                       AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id")
+                                       AND U0."expires_at" > ("job_applications_jobapplication"."hiring_start_at")
+                                       AND U0."expires_at" > %s)
                                 ORDER BY U0."created_at" DESC
                                 LIMIT 1)) AS "jobseeker_eligibility_diagnosis",
 
                (SELECT U0."id"
                 FROM "eligibility_eligibilitydiagnosis" U0
-                WHERE (U0."expires_at" > %s
-                       AND (U0."author_kind" = %s
-                            OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
-                       AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id"))
+                WHERE ((U0."author_kind" = %s
+                        OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
+                       AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id")
+                       AND U0."expires_at" > ("job_applications_jobapplication"."hiring_start_at")
+                       AND U0."expires_at" > %s)
                 ORDER BY U0."created_at" DESC
                 LIMIT 1) AS "jobseeker_valid_eligibility_diagnosis",
                     GREATEST("job_applications_jobapplication"."created_at", MAX("job_applications_jobapplicationtransitionlog"."timestamp")) AS "last_change",
@@ -809,19 +811,21 @@
 
             (SELECT U0."id"
              FROM "eligibility_eligibilitydiagnosis" U0
-             WHERE (U0."expires_at" > %s
-                    AND (U0."author_kind" = %s
-                         OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
-                    AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id"))
+             WHERE ((U0."author_kind" = %s
+                     OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
+                    AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id")
+                    AND U0."expires_at" > ("job_applications_jobapplication"."hiring_start_at")
+                    AND U0."expires_at" > %s)
              ORDER BY U0."created_at" DESC
              LIMIT 1) AS "jobseeker_valid_eligibility_diagnosis",
                  COALESCE("job_applications_jobapplication"."eligibility_diagnosis_id",
                             (SELECT U0."id"
                              FROM "eligibility_eligibilitydiagnosis" U0
-                             WHERE (U0."expires_at" > %s
-                                    AND (U0."author_kind" = %s
-                                         OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
-                                    AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id"))
+                             WHERE ((U0."author_kind" = %s
+                                     OR U0."author_siae_id" = ("job_applications_jobapplication"."to_company_id"))
+                                    AND U0."job_seeker_id" = ("job_applications_jobapplication"."job_seeker_id")
+                                    AND U0."expires_at" > ("job_applications_jobapplication"."hiring_start_at")
+                                    AND U0."expires_at" > %s)
                              ORDER BY U0."created_at" DESC
                              LIMIT 1)) AS "jobseeker_eligibility_diagnosis",
                  EXISTS