tests: Remove EligibilityDiagnosisFactory alias

tests/approvals/tests.py

@@ -42,7 +42,7 @@
     SuspensionFactory,
 )
 from tests.companies.factories import CompanyFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.employee_record.factories import EmployeeRecordFactory
 from tests.job_applications.factories import JobApplicationFactory, JobApplicationSentByJobSeekerFactory
 from tests.users.factories import ItouStaffFactory, JobSeekerFactory
@@ -838,7 +838,7 @@ def test_create_approval_with_a_wrong_number(self):
 
         url = reverse("admin:approvals_approval_add")
 
-        diagnosis = EligibilityDiagnosisFactory()
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
         post_data = {
             "start_at": "01/01/2100",
             "end_at": "31/12/2102",
@@ -931,7 +931,7 @@ def test_create_approval(self):
         user.user_permissions.add(permission)
         self.client.force_login(user)
 
-        diagnosis = EligibilityDiagnosisFactory()
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
         other_job_seeker = JobSeekerFactory()
         url = reverse("admin:approvals_approval_add")
 

tests/eligibility/factories.py

@@ -1,4 +1,3 @@
-import functools
 import random
 
 import factory
@@ -70,6 +69,3 @@ class Params:
             author=factory.LazyAttribute(lambda obj: obj.author_siae.members.first()),
         )
         with_criteria = factory.Trait(romes=factory.PostGeneration(_get_iae_administrative_criteria))
-
-
-EligibilityDiagnosisFactory = functools.partial(IAEEligibilityDiagnosisFactory, from_prescriber=True)

tests/eligibility/test_iae.py

@@ -9,7 +9,6 @@
 from tests.approvals.factories import ApprovalFactory, PoleEmploiApprovalFactory
 from tests.companies.factories import CompanyFactory
 from tests.eligibility.factories import (
-    EligibilityDiagnosisFactory,
     IAEEligibilityDiagnosisFactory,
 )
 from tests.job_applications.factories import JobApplicationFactory
@@ -52,7 +51,7 @@ def test_no_diagnosis(self):
         assert not has_considered_valid
 
     def test_itou_diagnosis(self):
-        diagnosis = EligibilityDiagnosisFactory(job_seeker=self.job_seeker)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=self.job_seeker)
         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)
@@ -88,7 +87,9 @@ def test_expired_pole_emploi_diagnosis(self):
         assert last_expired is None
 
     def test_expired_itou_diagnosis(self):
-        expired_diagnosis = EligibilityDiagnosisFactory(job_seeker=self.job_seeker, expired=True)
+        expired_diagnosis = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=self.job_seeker, expired=True
+        )
         has_considered_valid = EligibilityDiagnosis.objects.has_considered_valid(
             job_seeker=expired_diagnosis.job_seeker
         )
@@ -101,7 +102,9 @@ def test_expired_itou_diagnosis(self):
         assert last_expired is not None
 
     def test_expired_itou_diagnosis_with_ongoing_approval(self):
-        expired_diagnosis = EligibilityDiagnosisFactory(job_seeker=self.job_seeker, expired=True)
+        expired_diagnosis = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=self.job_seeker, expired=True
+        )
         ApprovalFactory(user=expired_diagnosis.job_seeker, eligibility_diagnosis=expired_diagnosis)
         has_considered_valid = EligibilityDiagnosis.objects.has_considered_valid(
             job_seeker=expired_diagnosis.job_seeker
@@ -145,7 +148,7 @@ def test_itou_diagnosis_by_siae(self):
 
     def test_itou_diagnosis_by_prescriber(self):
         company = CompanyFactory(with_membership=True)
-        prescriber_diagnosis = EligibilityDiagnosisFactory(job_seeker=self.job_seeker)
+        prescriber_diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=self.job_seeker)
         # From siae perspective.
         has_considered_valid = EligibilityDiagnosis.objects.has_considered_valid(
             job_seeker=prescriber_diagnosis.job_seeker, for_siae=company
@@ -162,7 +165,7 @@ def test_itou_diagnosis_by_prescriber(self):
 
     def test_itou_diagnosis_both_siae_and_prescriber(self):
         company = CompanyFactory(with_membership=True)
-        prescriber_diagnosis = EligibilityDiagnosisFactory(job_seeker=self.job_seeker)
+        prescriber_diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=self.job_seeker)
         # From `siae` perspective.
         has_considered_valid = EligibilityDiagnosis.objects.has_considered_valid(
             job_seeker=self.job_seeker, for_siae=company
@@ -192,8 +195,8 @@ def test_expired_itou_diagnosis_by_another_siae(self):
         assert last_expired is None
 
     def test_itou_diagnosis_one_valid_other_expired(self):
-        EligibilityDiagnosisFactory(job_seeker=self.job_seeker, expired=True)
-        EligibilityDiagnosisFactory(job_seeker=self.job_seeker)
+        IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=self.job_seeker, expired=True)
+        IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=self.job_seeker)
         last_expired = EligibilityDiagnosis.objects.last_expired(job_seeker=self.job_seeker)
         last_considered_valid = EligibilityDiagnosis.objects.last_considered_valid(job_seeker=self.job_seeker)
         # When has a valid diagnosis, `last_expired` return None
@@ -202,16 +205,16 @@ def test_itou_diagnosis_one_valid_other_expired(self):
 
     def test_itou_diagnosis_one_valid_other_expired_same_siae(self):
         company = CompanyFactory(with_membership=True)
-        EligibilityDiagnosisFactory(
+        IAEEligibilityDiagnosisFactory(
             job_seeker=self.job_seeker,
             author_siae=company,
-            author_kind=AuthorKind.EMPLOYER,
+            from_employer=True,
             expired=True,
         )
-        new_diag = EligibilityDiagnosisFactory(
+        new_diag = IAEEligibilityDiagnosisFactory(
             job_seeker=self.job_seeker,
             author_siae=company,
-            author_kind=AuthorKind.EMPLOYER,
+            from_employer=True,
         )
         # An approval causes the system to ignore expires_at.
         ApprovalFactory(user=self.job_seeker, eligibility_diagnosis=new_diag)
@@ -225,10 +228,14 @@ def test_itou_diagnosis_expired_uses_the_most_recent(self):
             timezone.now() - relativedelta(months=EligibilityDiagnosis.EXPIRATION_DELAY_MONTHS) - relativedelta(day=1)
         )
         date_12m = date_6m - relativedelta(months=6)
-        expired_diagnosis_old = EligibilityDiagnosisFactory(job_seeker=self.job_seeker, created_at=date_12m)
+        expired_diagnosis_old = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=self.job_seeker, created_at=date_12m
+        )
         last_expired = EligibilityDiagnosis.objects.last_expired(job_seeker=self.job_seeker)
         assert last_expired == expired_diagnosis_old
-        expired_diagnosis_last = EligibilityDiagnosisFactory(job_seeker=self.job_seeker, created_at=date_6m)
+        expired_diagnosis_last = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=self.job_seeker, created_at=date_6m
+        )
         last_expired = EligibilityDiagnosis.objects.last_expired(job_seeker=self.job_seeker)
         assert last_expired == expired_diagnosis_last
 
@@ -281,7 +288,7 @@ def test_create_diagnosis_with_administrative_criteria(self):
     def test_update_diagnosis(self):
         company = CompanyFactory(with_membership=True)
 
-        current_diagnosis = EligibilityDiagnosisFactory()
+        current_diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
         new_diagnosis = EligibilityDiagnosis.update_diagnosis(
             current_diagnosis, author=company.members.first(), author_organization=company, administrative_criteria=[]
         )
@@ -302,7 +309,7 @@ def test_update_diagnosis(self):
         assert new_diagnosis.is_valid
 
     def test_update_diagnosis_extend_the_validity_only_when_we_have_the_same_author_and_the_same_criteria(self):
-        first_diagnosis = EligibilityDiagnosisFactory()
+        first_diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
 
         # Same author, same criteria
         previous_expires_at = first_diagnosis.expires_at
@@ -350,24 +357,24 @@ def test_update_diagnosis_extend_the_validity_only_when_we_have_the_same_author_
 
     def test_is_valid(self):
         # Valid diagnosis.
-        diagnosis = EligibilityDiagnosisFactory()
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
         assert diagnosis.is_valid
 
         # Expired diagnosis.
-        diagnosis = EligibilityDiagnosisFactory(expired=True)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, expired=True)
         assert not diagnosis.is_valid
 
     def test_is_considered_valid(self):
         # Valid diagnosis.
-        diagnosis = EligibilityDiagnosisFactory()
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True)
         assert diagnosis.is_considered_valid
 
         # Expired diagnosis.
-        diagnosis = EligibilityDiagnosisFactory(expired=True)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, expired=True)
         assert not diagnosis.is_considered_valid
 
         # Expired diagnosis but ongoing PASS IAE.
-        diagnosis = EligibilityDiagnosisFactory(expired=True)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, expired=True)
         ApprovalFactory(user=diagnosis.job_seeker)
         assert diagnosis.is_considered_valid
 

tests/job_applications/test_admin.py

@@ -10,7 +10,7 @@
 from itou.job_applications.enums import JobApplicationState
 from tests.approvals.factories import ApprovalFactory
 from tests.companies.factories import CompanyFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory, IAEEligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.employee_record import factories as employee_record_factories
 from tests.job_applications import factories
 from tests.users.factories import JobSeekerFactory
@@ -238,7 +238,7 @@ def test_create_then_accept_job_application(admin_client):
     )
 
     # and make sure a diagnosis exists
-    EligibilityDiagnosisFactory(job_seeker=job_seeker)
+    IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker)
 
     response = admin_client.post(url, {**post_data, "transition_accept": True})
     assertRedirects(response, url)

tests/job_applications/test_transfer.py

@@ -10,7 +10,7 @@
 from itou.job_applications.models import JobApplicationWorkflow
 from itou.users.enums import UserKind
 from tests.companies.factories import CompanyFactory, CompanyWith2MembershipsFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory, IAEEligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.job_applications.factories import (
     JobApplicationFactory,
     JobApplicationSentByCompanyFactory,
@@ -255,7 +255,7 @@ def test_transfer_must_notify_prescriber(self):
         job_application = JobApplicationSentByPrescriberFactory(
             state=JobApplicationState.PROCESSING,
             to_company=origin_company,
-            eligibility_diagnosis=EligibilityDiagnosisFactory(),
+            eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True),
         )
         job_seeker = job_application.job_seeker
 

tests/job_applications/tests.py

@@ -45,7 +45,7 @@
     SuspensionFactory,
 )
 from tests.companies.factories import CompanyFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory, IAEEligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.employee_record.factories import BareEmployeeRecordFactory, EmployeeRecordFactory
 from tests.job_applications.factories import (
     JobApplicationFactory,
@@ -225,7 +225,8 @@ def test_geiq_fields_validation(self):
             ValidationError, "Une candidature ne peut avoir les deux types de diagnostics \\(IAE et GEIQ\\)"
         ):
             JobApplicationFactory(
-                with_geiq_eligibility_diagnosis=True, eligibility_diagnosis=EligibilityDiagnosisFactory()
+                with_geiq_eligibility_diagnosis=True,
+                eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True),
             )
 
         # Validators
@@ -474,7 +475,7 @@ def test_with_jobseeker_eligibility_diagnosis_with_a_denormalized_diagnosis_from
         assert qs.first().jobseeker_eligibility_diagnosis is None
 
     def test_with_eligibility_diagnosis_criterion(self):
-        diagnosis = EligibilityDiagnosisFactory(created_at=timezone.now())
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, created_at=timezone.now())
         job_app = JobApplicationFactory(
             with_approval=True, job_seeker=diagnosis.job_seeker, eligibility_diagnosis=diagnosis
         )
@@ -488,8 +489,8 @@ def test_with_eligibility_diagnosis_criterion(self):
         diagnosis.administrative_criteria.add(level1_criterion)
         diagnosis.administrative_criteria.add(level2_criterion)
 
-        older_diagnosis = EligibilityDiagnosisFactory(
-            job_seeker=job_app.job_seeker, created_at=timezone.now() - relativedelta(months=1)
+        older_diagnosis = IAEEligibilityDiagnosisFactory(
+            from_prescriber=True, job_seeker=job_app.job_seeker, created_at=timezone.now() - relativedelta(months=1)
         )
         older_diagnosis.administrative_criteria.add(level1_other_criterion)
 
@@ -522,7 +523,7 @@ def test_with_eligibility_diagnosis_criterion(self):
 
     def test_with_list_related_data(self):
         job_app = JobApplicationFactory(with_approval=True)
-        diagnosis = EligibilityDiagnosisFactory(job_seeker=job_app.job_seeker)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_app.job_seeker)
 
         level1_criterion = AdministrativeCriteria.objects.filter(level=AdministrativeCriteriaLevel.LEVEL_1).first()
         level2_criterion = AdministrativeCriteria.objects.filter(level=AdministrativeCriteriaLevel.LEVEL_2).first()
@@ -1351,7 +1352,7 @@ def test_accept_job_application_sent_by_job_seeker_with_a_nir_no_pe_approval(sel
         job_application = JobApplicationSentByJobSeekerFactory(
             job_seeker=job_seeker,
             state=JobApplicationState.PROCESSING,
-            eligibility_diagnosis=EligibilityDiagnosisFactory(job_seeker=job_seeker),
+            eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker),
         )
         with self.captureOnCommitCallbacks(execute=True):
             job_application.accept(user=job_application.to_company.members.first())
@@ -1375,7 +1376,7 @@ def test_accept_job_application_sent_by_job_seeker_with_a_pole_emploi_id_no_pe_a
         job_application = JobApplicationSentByJobSeekerFactory(
             job_seeker=job_seeker,
             state=JobApplicationState.PROCESSING,
-            eligibility_diagnosis=EligibilityDiagnosisFactory(job_seeker=job_seeker),
+            eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker),
         )
         with self.captureOnCommitCallbacks(execute=True):
             job_application.accept(user=job_application.to_company.members.first())
@@ -1396,7 +1397,7 @@ def test_accept_job_application_sent_by_job_seeker_unregistered_no_pe_approval(s
         job_application = JobApplicationSentByJobSeekerFactory(
             job_seeker=job_seeker,
             state=JobApplicationState.PROCESSING,
-            eligibility_diagnosis=EligibilityDiagnosisFactory(job_seeker=job_seeker),
+            eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker),
         )
         with self.captureOnCommitCallbacks(execute=True):
             job_application.accept(user=job_application.to_company.members.first())
@@ -1559,7 +1560,7 @@ def test_accept_job_application_sent_by_job_seeker_in_waiting_period_valid_diagn
         )
         assert approval.is_in_waiting_period
 
-        diagnosis = EligibilityDiagnosisFactory(job_seeker=user)
+        diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=user)
         assert diagnosis.is_valid
 
         job_application = JobApplicationSentByJobSeekerFactory(job_seeker=user, state=JobApplicationState.PROCESSING)
@@ -1755,7 +1756,7 @@ def test_xlsx_export_contains_the_necessary_info(self, *args, **kwargs):
             job_seeker=job_seeker,
             state=JobApplicationState.PROCESSING,
             selected_jobs=Appellation.objects.all(),
-            eligibility_diagnosis=EligibilityDiagnosisFactory(job_seeker=job_seeker),
+            eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker),
         )
         job_application.accept(user=job_application.to_company.members.first())
 
@@ -1802,7 +1803,7 @@ def test_display_expired_approvals_info(self):
                 job_seeker=job_seeker,
                 state=JobApplicationState.PROCESSING,
                 selected_jobs=Appellation.objects.all(),
-                eligibility_diagnosis=EligibilityDiagnosisFactory(job_seeker=job_seeker),
+                eligibility_diagnosis=IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker),
             )
             job_application.accept(user=job_application.to_company.members.first())
 

tests/metabase/management/test_populate_metabase_emplois.py

@@ -24,7 +24,7 @@
     ProlongationWithRequestFactory,
 )
 from tests.companies.factories import CompanyFactory, CompanyMembershipFactory, JobDescriptionFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.geo.factories import QPVFactory
 from tests.institutions.factories import InstitutionFactory, InstitutionMembershipFactory
 from tests.job_applications.factories import JobApplicationFactory
@@ -194,7 +194,8 @@ def test_populate_job_seekers():
         created_at=datetime.datetime(2022, 1, 1, tzinfo=datetime.UTC),
     )
 
-    EligibilityDiagnosisFactory(
+    IAEEligibilityDiagnosisFactory(
+        from_prescriber=True,
         job_seeker=user_3,
         created_at=datetime.datetime(2020, 1, 1, tzinfo=datetime.UTC),
     )

tests/siae_evaluations/test_models.py

@@ -32,7 +32,7 @@
 from itou.utils.models import InclusiveDateRange
 from tests.approvals.factories import ApprovalFactory
 from tests.companies.factories import CompanyFactory, CompanyWith2MembershipsFactory
-from tests.eligibility.factories import EligibilityDiagnosisFactory
+from tests.eligibility.factories import IAEEligibilityDiagnosisFactory
 from tests.files.factories import FileFactory
 from tests.institutions.factories import InstitutionFactory, InstitutionWith2MembershipFactory
 from tests.job_applications.factories import JobApplicationFactory
@@ -63,7 +63,7 @@ def test_select_min_max_job_applications(self):
         company = CompanyFactory()
         job_seeker = JobSeekerFactory()
         sender = PrescriberFactory()
-        eligibility_diagnosis = EligibilityDiagnosisFactory(job_seeker=job_seeker)
+        eligibility_diagnosis = IAEEligibilityDiagnosisFactory(from_prescriber=True, job_seeker=job_seeker)
 
         def create_job_apps(count):
             return JobApplicationFactory.create_batch(
@@ -152,7 +152,7 @@ def campaign_eligible_job_app_objects():
     company = CompanyWith2MembershipsFactory(department="14")
     job_seeker = JobSeekerFactory()
     approval = ApprovalFactory(user=job_seeker)
-    diag = EligibilityDiagnosisFactory(
+    diag = IAEEligibilityDiagnosisFactory(
         job_seeker=job_seeker,
         author_kind=AuthorKind.EMPLOYER,
         author_siae=company,