[OS-1729] Checklist > extract the personal data checklist status from the admission to the candidate

Author: jcougnaud

api/serializers/person.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2023 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -101,5 +101,7 @@ def validate(self, data):
 
 
 class IdentificationDTOSerializer(DTOSerializer):
+    statut_validation_donnees_personnelles = None
+
     class Meta:
         source = IdentificationDTO

auth/predicates/common.py

@@ -38,6 +38,7 @@
 from admission.constants import CONTEXT_CONTINUING, CONTEXT_DOCTORATE, CONTEXT_GENERAL
 from admission.models import DoctorateAdmission, GeneralEducationAdmission
 from admission.models.base import BaseAdmission
+from base.models.enums.personal_data import ChoixStatutValidationDonneesPersonnelles
 from osis_role.errors import predicate_failed_msg
 
 
@@ -231,7 +232,7 @@ def past_experiences_checklist_tab_is_not_sufficient(
     message=_("The \"Personal data\" checklist tab must be in the \"Cleaned\" status in order to do this action.")
 )
 def personal_data_checklist_status_is_cleaned(self, user: User, obj: BaseAdmission):
-    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') == 'GEST_EN_COURS'
+    return obj.candidate.personal_data_validation_status == ChoixStatutValidationDonneesPersonnelles.TOILETTEES.name
 
 
 @predicate(bind=True)
@@ -241,12 +242,12 @@ def personal_data_checklist_status_is_cleaned(self, user: User, obj: BaseAdmissi
     )
 )
 def personal_data_checklist_status_is_to_be_processed(self, user: User, obj: BaseAdmission):
-    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') == 'INITIAL_CANDIDAT'
+    return obj.candidate.personal_data_validation_status == ChoixStatutValidationDonneesPersonnelles.A_TRAITER.name
 
 
 @predicate(bind=True)
 @predicate_failed_msg(
     message=_("The \"Personal data\" checklist tab must not be in the \"Validated\" status in order to do this action.")
 )
 def personal_data_checklist_status_is_not_validated(self, user: User, obj: BaseAdmission):
-    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') != 'GEST_REUSSITE'
+    return obj.candidate.personal_data_validation_status != ChoixStatutValidationDonneesPersonnelles.VALIDEES.name

ddd/admission/doctorat/preparation/domain/model/proposition.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -111,11 +111,6 @@
 from admission.ddd.admission.shared_kernel.domain.model.complement_formation import (
     ComplementFormationIdentity,
 )
-from admission.ddd.admission.shared_kernel.domain.model.enums.equivalence import (
-    EtatEquivalenceTitreAcces,
-    StatutEquivalenceTitreAcces,
-    TypeEquivalenceTitreAcces,
-)
 from admission.ddd.admission.shared_kernel.domain.model.enums.type_gestionnaire import (
     TypeGestionnaire,
 )
@@ -143,6 +138,7 @@
 from admission.ddd.admission.shared_kernel.domain.validator.exceptions import (
     ExperienceNonTrouveeException,
 )
+from admission.ddd.admission.shared_kernel.dtos import IdentificationDTO
 from admission.ddd.admission.shared_kernel.dtos.emplacement_document import (
     EmplacementDocumentDTO,
 )
@@ -1026,13 +1022,15 @@ def approuver_par_sic(
         experience_parcours_interne_translator: IExperienceParcoursInterneTranslator,
         grade_academique_formation_proposition: str,
         annee_formation: AcademicYear,
+        identification_dto: IdentificationDTO,
     ):
         if self.type_demande == TypeDemande.INSCRIPTION:
             ApprouverInscriptionParSicValidatorList(
                 statut=self.statut,
                 checklist=self.checklist_actuelle,
                 besoin_de_derogation=self.besoin_de_derogation,
                 documents_dto=documents_dto,
+                statut_validation_donnees_personnelles=identification_dto.statut_validation_donnees_personnelles,
             ).validate()
 
         else:
@@ -1042,6 +1040,7 @@ def approuver_par_sic(
                 complements_formation=self.complements_formation,
                 checklist=self.checklist_actuelle,
                 documents_dto=documents_dto,
+                statut_validation_donnees_personnelles=identification_dto.statut_validation_donnees_personnelles,
             ).validate()
 
         try:

ddd/admission/doctorat/preparation/domain/model/statut_checklist.py

@@ -40,6 +40,7 @@
 from admission.ddd.admission.shared_kernel.domain.model.enums.authentification import (
     EtatAuthentificationParcours,
 )
+from base.models.enums.personal_data import ChoixStatutValidationDonneesPersonnelles
 from osis_common.ddd import interface
 
 
@@ -71,7 +72,6 @@ def _serialize(cls, inst, field, value):
 
 @attr.dataclass
 class StatutsChecklistDoctorale:
-    donnees_personnelles: StatutChecklist
     assimilation: StatutChecklist
     parcours_anterieur: StatutChecklist
     financabilite: StatutChecklist
@@ -140,6 +140,12 @@ def merge_statuses(self, other_status):
             identifiant_parent=self.identifiant_parent,
         )
 
+    def to_dict(self):
+        return {
+            'extra': self.extra,
+            'statut': self.statut.name,
+        }
+
 
 @attr.dataclass
 class ConfigurationOngletChecklist(interface.ValueObject):
@@ -156,30 +162,30 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
     identifiant=OngletsChecklist.donnees_personnelles,
     statuts=[
         ConfigurationStatutChecklist(
-            identifiant='A_TRAITER',
-            libelle=_('To be processed'),
+            identifiant=ChoixStatutValidationDonneesPersonnelles.A_TRAITER.name,
+            libelle=ChoixStatutValidationDonneesPersonnelles.A_TRAITER.value,
             statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
         ),
         ConfigurationStatutChecklist(
-            identifiant='TOILETTEES',
-            libelle=pgettext_lazy('plural', 'Cleaned'),
+            identifiant=ChoixStatutValidationDonneesPersonnelles.TOILETTEES.name,
+            libelle=ChoixStatutValidationDonneesPersonnelles.TOILETTEES.value,
             statut=ChoixStatutChecklist.GEST_EN_COURS,
         ),
         ConfigurationStatutChecklist(
-            identifiant='A_COMPLETER',
-            libelle=_('To be completed'),
+            identifiant=ChoixStatutValidationDonneesPersonnelles.A_COMPLETER.name,
+            libelle=ChoixStatutValidationDonneesPersonnelles.A_COMPLETER.value,
             statut=ChoixStatutChecklist.GEST_BLOCAGE,
             extra={'fraud': '0'},
         ),
         ConfigurationStatutChecklist(
-            identifiant='FRAUDEUR',
-            libelle=_('Fraudster'),
+            identifiant=ChoixStatutValidationDonneesPersonnelles.FRAUDEUR.name,
+            libelle=ChoixStatutValidationDonneesPersonnelles.FRAUDEUR.value,
             statut=ChoixStatutChecklist.GEST_BLOCAGE,
             extra={'fraud': '1'},
         ),
         ConfigurationStatutChecklist(
-            identifiant='VALIDEES',
-            libelle=pgettext_lazy('plural', 'Validated'),
+            identifiant=ChoixStatutValidationDonneesPersonnelles.VALIDEES.name,
+            libelle=ChoixStatutValidationDonneesPersonnelles.VALIDEES.value,
             statut=ChoixStatutChecklist.GEST_REUSSITE,
         ),
     ],

ddd/admission/doctorat/preparation/domain/service/checklist.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 from admission.ddd.admission.doctorat.preparation.domain.model.enums.checklist import ChoixStatutChecklist
 from admission.ddd.admission.doctorat.preparation.domain.model.proposition import Proposition
 from admission.ddd.admission.doctorat.preparation.domain.model.statut_checklist import (
-    StatutsChecklistDoctorale,
     StatutChecklist,
+    StatutsChecklistDoctorale,
 )
 from admission.ddd.admission.shared_kernel.domain.model.enums.authentification import EtatAuthentificationParcours
 from admission.ddd.admission.shared_kernel.domain.service.i_profil_candidat import IProfilCandidatTranslator
@@ -73,10 +73,6 @@ def recuperer_checklist_initiale(
         )
 
         return StatutsChecklistDoctorale(
-            donnees_personnelles=StatutChecklist(
-                libelle=_("To be processed"),
-                statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
-            ),
             assimilation=StatutChecklist(
                 libelle=_("Not concerned")
                 if identification_dto.pays_nationalite_europeen

ddd/admission/doctorat/preparation/domain/validator/_should_informations_checklist_etre_completees.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@
 )
 from admission.ddd.admission.shared_kernel.enums.type_demande import TypeDemande
 from base.ddd.utils.business_validator import BusinessValidator
+from base.models.enums.personal_data import ChoixStatutValidationDonneesPersonnelles
 from epc.models.enums.condition_acces import ConditionAcces
 
 
@@ -309,10 +310,10 @@ def validate(self, *args, **kwargs):
 
 @attr.dataclass(frozen=True, slots=True)
 class ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande(BusinessValidator):
-    checklist_actuelle: StatutsChecklistDoctorale
+    statut_validation_donnees_personnelles: str
 
     def validate(self, *args, **kwargs):
-        if self.checklist_actuelle.donnees_personnelles.statut != ChoixStatutChecklist.GEST_REUSSITE:
+        if self.statut_validation_donnees_personnelles != ChoixStatutValidationDonneesPersonnelles.VALIDEES.name:
             raise EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande
 
 

ddd/admission/doctorat/preparation/domain/validator/validator_by_business_action.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -731,6 +731,8 @@ class ApprouverAdmissionParSicValidatorList(TwoStepsMultipleBusinessExceptionLis
     checklist: StatutsChecklistDoctorale
     documents_dto: List[EmplacementDocumentDTO]
 
+    statut_validation_donnees_personnelles: str
+
     def get_data_contract_validators(self) -> List[BusinessValidator]:
         return []
 
@@ -740,7 +742,7 @@ def get_invariants_validators(self) -> List[BusinessValidator]:
                 statut=self.statut,
             ),
             ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande(
-                checklist_actuelle=self.checklist,
+                statut_validation_donnees_personnelles=self.statut_validation_donnees_personnelles,
             ),
             ShouldDecisionCddEtreDansEtatCorrectPourApprouverDemande(
                 checklist_actuelle=self.checklist,
@@ -766,6 +768,8 @@ class ApprouverInscriptionParSicValidatorList(TwoStepsMultipleBusinessExceptionL
 
     documents_dto: List[EmplacementDocumentDTO]
 
+    statut_validation_donnees_personnelles: str
+
     def get_data_contract_validators(self) -> List[BusinessValidator]:
         return []
 
@@ -775,7 +779,7 @@ def get_invariants_validators(self) -> List[BusinessValidator]:
                 statut=self.statut,
             ),
             ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande(
-                checklist_actuelle=self.checklist,
+                statut_validation_donnees_personnelles=self.statut_validation_donnees_personnelles,
             ),
             ShouldDecisionCddEtreDansEtatCorrectPourApprouverDemande(
                 checklist_actuelle=self.checklist,

ddd/admission/doctorat/preparation/test/factory/proposition.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -213,7 +213,6 @@ class Meta:
         model = StatutsChecklistDoctorale
         abstract = False
 
-    donnees_personnelles = factory.SubFactory(StatutChecklistFactory)
     assimilation = factory.SubFactory(StatutChecklistFactory)
     choix_formation = factory.SubFactory(StatutChecklistFactory)
     parcours_anterieur = factory.SubFactory(StatutChecklistFactory)
@@ -341,7 +340,6 @@ class Params:
                 StatutsChecklistDoctoraleFactory,
                 financabilite__statut=ChoixStatutChecklist.GEST_REUSSITE,
                 financabilite__extra={'reussite': 'financable'},
-                donnees_personnelles__statut=ChoixStatutChecklist.GEST_REUSSITE,
                 decision_cdd__statut=ChoixStatutChecklist.GEST_REUSSITE,
             ),
         )

ddd/admission/doctorat/preparation/test/use_case/write/test_approuver_admission_par_sic_service.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -41,8 +41,9 @@
 )
 from admission.ddd.admission.doctorat.preparation.domain.validator.exceptions import (
     DocumentAReclamerImmediatException,
+    EtatChecklistDecisionCddNonValidePourApprouverDemande,
     EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande,
-    ParcoursAnterieurNonSuffisantException, EtatChecklistDecisionCddNonValidePourApprouverDemande,
+    ParcoursAnterieurNonSuffisantException,
 )
 from admission.ddd.admission.doctorat.preparation.test.factory.groupe_de_supervision import (
     GroupeDeSupervisionSC3DPFactory,
@@ -79,6 +80,7 @@
     message_bus_in_memory_instance,
 )
 from base.ddd.utils.business_validator import MultipleBusinessExceptions
+from base.models.enums.personal_data import ChoixStatutValidationDonneesPersonnelles
 from base.models.person_merge_proposal import PersonMergeStatus
 from ddd.logic.shared_kernel.academic_year.domain.model.academic_year import (
     AcademicYear,
@@ -214,9 +216,15 @@ def test_should_lever_exception_si_parcours_anterieur_non_suffisant(self):
         self.assertIsInstance(context.exception.exceptions.pop(), ParcoursAnterieurNonSuffisantException)
 
     def test_should_lever_exception_si_donnees_personnelles_non_validees(self):
-        self.proposition.checklist_actuelle.donnees_personnelles.statut = ChoixStatutChecklist.INITIAL_CANDIDAT
-        with self.assertRaises(MultipleBusinessExceptions) as context:
-            self.message_bus.invoke(self.command(**self.parametres_commande_par_defaut))
+        index = next(
+            i for i, c in enumerate(ProfilCandidatInMemoryTranslator.profil_candidats) if c.matricule == '0123456789'
+        )
+        with patch.multiple(
+            ProfilCandidatInMemoryTranslator.profil_candidats[index],
+            statut_validation_donnees_personnelles=ChoixStatutValidationDonneesPersonnelles.A_COMPLETER.name,
+        ):
+            with self.assertRaises(MultipleBusinessExceptions) as context:
+                self.message_bus.invoke(self.command(**self.parametres_commande_par_defaut))
         self.assertIsInstance(
             context.exception.exceptions.pop(),
             EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande,

ddd/admission/doctorat/preparation/test/use_case/write/test_approuver_inscription_par_sic_service.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -46,9 +46,10 @@
 )
 from admission.ddd.admission.doctorat.preparation.domain.validator.exceptions import (
     DocumentAReclamerImmediatException,
+    EtatChecklistDecisionCddNonValidePourApprouverDemande,
     EtatChecklistDecisionSicNonValidePourApprouverUneInscription,
     EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande,
-    ParcoursAnterieurNonSuffisantException, EtatChecklistDecisionCddNonValidePourApprouverDemande,
+    ParcoursAnterieurNonSuffisantException,
 )
 from admission.ddd.admission.doctorat.preparation.test.factory.groupe_de_supervision import (
     GroupeDeSupervisionSC3DPFactory,
@@ -78,6 +79,7 @@
     message_bus_in_memory_instance,
 )
 from base.ddd.utils.business_validator import MultipleBusinessExceptions
+from base.models.enums.personal_data import ChoixStatutValidationDonneesPersonnelles
 from base.models.person_merge_proposal import PersonMergeStatus
 from ddd.logic.shared_kernel.academic_year.domain.model.academic_year import (
     AcademicYear,
@@ -211,9 +213,15 @@ def test_should_lever_exception_si_parcours_anterieur_non_suffisant(self):
         self.assertIsInstance(context.exception.exceptions.pop(), ParcoursAnterieurNonSuffisantException)
 
     def test_should_lever_exception_si_donnees_personnelles_non_validees(self):
-        self.proposition.checklist_actuelle.donnees_personnelles.statut = ChoixStatutChecklist.INITIAL_CANDIDAT
-        with self.assertRaises(MultipleBusinessExceptions) as context:
-            self.message_bus.invoke(self.command(**self.parametres_commande_par_defaut))
+        index = next(
+            i for i, c in enumerate(ProfilCandidatInMemoryTranslator.profil_candidats) if c.matricule == '0123456789'
+        )
+        with patch.multiple(
+            ProfilCandidatInMemoryTranslator.profil_candidats[index],
+            statut_validation_donnees_personnelles=ChoixStatutValidationDonneesPersonnelles.A_COMPLETER.name,
+        ):
+            with self.assertRaises(MultipleBusinessExceptions) as context:
+                self.message_bus.invoke(self.command(**self.parametres_commande_par_defaut))
         self.assertIsInstance(
             context.exception.exceptions.pop(),
             EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande,