[OS-1499] Updates related to the quarantine criteria

Author: jcougnaud

admin.py

@@ -690,6 +690,7 @@ def queryset(self, request, queryset):
             quarantaine=Case(
                 When(
                     Q(candidate__personmergeproposal__status__in=PersonMergeStatus.quarantine_statuses())
+                    | ~Q(candidate__personmergeproposal__validation__has_key='valid')
                     | ~Q(candidate__personmergeproposal__validation__valid=True),
                     then=Value(True),
                 ),

ddd/admission/domain/validator/_should_ne_pas_etre_en_quarantaine.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-2025 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
@@ -38,6 +38,6 @@ class ShouldNePasEtreEnQuarantaine(BusinessValidator):
     def validate(self, *args, **kwargs):
         if self.merge_proposal and (
             self.merge_proposal.status in PersonMergeStatus.quarantine_statuses()
-            or not self.merge_proposal.validation.get('valid', True)
+            or not self.merge_proposal.validation.get('valid', False)
         ):
             raise EnQuarantaineException

models/base.py

@@ -394,9 +394,9 @@ def filter_in_quarantine(self):
             Q(candidate__personmergeproposal__isnull=False)
             & Q(
                 Q(candidate__personmergeproposal__status__in=PersonMergeStatus.quarantine_statuses())
-                |
                 # Cas validation ticket Digit en erreur
-                ~Q(candidate__personmergeproposal__validation__valid=True)
+                | ~Q(candidate__personmergeproposal__validation__valid=True)
+                | ~Q(candidate__personmergeproposal__validation__has_key='valid')
             )
         )
 

templates/admission/details/person.html

@@ -8,7 +8,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-2025 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

tests/contrib/models/test_base.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-2025 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
@@ -29,29 +29,42 @@
 from django.db import IntegrityError
 from django.test import TestCase
 
-from admission.constants import CONTEXT_GENERAL, CONTEXT_CONTINUING, CONTEXT_DOCTORATE
-from admission.models import AdmissionViewer, ContinuingEducationAdmissionProxy
-from admission.models.base import admission_directory_path, BaseAdmission
-from admission.ddd.admission.doctorat.preparation.domain.model.enums import ChoixStatutPropositionDoctorale
-from admission.ddd.admission.formation_continue.domain.model.enums import ChoixStatutPropositionContinue
-from admission.ddd.admission.formation_generale.domain.model.enums import ChoixStatutPropositionGenerale
+from admission.constants import CONTEXT_CONTINUING, CONTEXT_DOCTORATE, CONTEXT_GENERAL
+from admission.ddd.admission.doctorat.preparation.domain.model.enums import (
+    ChoixStatutPropositionDoctorale,
+)
+from admission.ddd.admission.formation_continue.domain.model.enums import (
+    ChoixStatutPropositionContinue,
+)
+from admission.ddd.admission.formation_generale.domain.model.enums import (
+    ChoixStatutPropositionGenerale,
+)
 from admission.infrastructure.admission.domain.service.annee_inscription_formation import (
     continuing_education_types_as_set,
     doctorate_types_as_set,
 )
+from admission.models import AdmissionViewer, ContinuingEducationAdmissionProxy
+from admission.models.base import BaseAdmission, admission_directory_path
 from admission.tests.factories import DoctorateAdmissionFactory
 from admission.tests.factories.admission_viewer import AdmissionViewerFactory
-from admission.tests.factories.continuing_education import ContinuingEducationAdmissionFactory
+from admission.tests.factories.continuing_education import (
+    ContinuingEducationAdmissionFactory,
+)
 from admission.tests.factories.general_education import GeneralEducationAdmissionFactory
 from base.models.entity_version import EntityVersion
-from base.models.enums.education_group_types import TrainingType, AllTypes
+from base.models.enums.education_group_types import AllTypes, TrainingType
 from base.models.enums.entity_type import EntityType
 from base.models.person_merge_proposal import PersonMergeProposal, PersonMergeStatus
 from base.tests.factories.academic_year import AcademicYearFactory
 from base.tests.factories.education_group_type import EducationGroupTypeFactory
-from base.tests.factories.entity_version import MainEntityVersionFactory, EntityVersionFactory
+from base.tests.factories.entity_version import (
+    EntityVersionFactory,
+    MainEntityVersionFactory,
+)
 from base.tests.factories.person import PersonFactory
-from epc.tests.factories.inscription_programme_annuel import InscriptionProgrammeAnnuelFactory
+from epc.tests.factories.inscription_programme_annuel import (
+    InscriptionProgrammeAnnuelFactory,
+)
 
 
 class BaseTestCase(TestCase):
@@ -171,7 +184,7 @@ def test_admission_in_quarantine(self):
 
         for status in PersonMergeStatus:
             proposal.status = status.name
-            proposal.validation = {}
+            proposal.validation = {'valid': True}
             proposal.save()
 
             admission = BaseAdmission.objects.get(pk=admission.pk)
@@ -187,6 +200,14 @@ def test_admission_in_quarantine(self):
 
             self.assertTrue(admission.is_in_quarantine)
 
+            # The admission is always in quarantine if the valid property is not specified
+            proposal.validation = {}
+            proposal.save()
+
+            admission = BaseAdmission.objects.get(pk=admission.pk)
+
+            self.assertTrue(admission.is_in_quarantine)
+
 
 @freezegun.freeze_time('2023-01-01')
 class AdmissionFormattedReferenceTestCase(TestCase):

utils.py

@@ -27,7 +27,7 @@
 import uuid
 from collections import defaultdict
 from contextlib import suppress
-from typing import Dict, Iterable, List, Union, Optional
+from typing import Dict, Iterable, List, Optional, Union
 
 import weasyprint
 from django.conf import settings
@@ -98,7 +98,7 @@
 def get_cached_admission_perm_obj(admission_uuid):
     qs = DoctorateAdmission.objects.select_related(
         'supervision_group',
-        'candidate__personmergeproposal',
+        'candidate',
         'training__academic_year',
         'training__education_group_type',
         'determined_academic_year',
@@ -111,7 +111,7 @@ def get_cached_admission_perm_obj(admission_uuid):
 
 def get_cached_general_education_admission_perm_obj(admission_uuid):
     qs = GeneralEducationAdmission.objects.select_related(
-        'candidate__personmergeproposal',
+        'candidate',
         'training__academic_year',
         'training__education_group_type',
         'determined_academic_year',
@@ -124,7 +124,7 @@ def get_cached_general_education_admission_perm_obj(admission_uuid):
 
 def get_cached_continuing_education_admission_perm_obj(admission_uuid):
     qs = ContinuingEducationAdmission.objects.select_related(
-        'candidate__personmergeproposal',
+        'candidate',
         'training__academic_year',
         'training__specificiufcinformations',
     )

views/common/mixins.py

@@ -117,7 +117,7 @@
     person_is_sic,
 )
 from admission.views.list import BaseAdmissionList
-from base.models.person_merge_proposal import PersonMergeStatus
+from base.models.person_merge_proposal import PersonMergeProposal, PersonMergeStatus
 from ddd.logic.financabilite.domain.model.enums.etat import EtatFinancabilite
 from ddd.logic.gestion_des_comptes.queries import GetPropositionFusionQuery
 from infrastructure.messages_bus import message_bus_instance
@@ -296,7 +296,7 @@ def injection_possible(self):
         elif contexte == CONTEXT_CONTINUING:
             if not self.admission.training.specificiufcinformations.registration_required:
                 return False, "La formation doit avoir l'inscription au rôle requise"
-        personmergeproposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+        personmergeproposal = self.current_merge_proposal
         if not (personmergeproposal and personmergeproposal.registration_id_sent_to_digit):
             return False, "Il manque le noma"
         if not self.admission.candidate.global_id.startswith('00'):
@@ -309,12 +309,23 @@ def injection_possible(self):
             return False, "La demande est en quarantaine"
         return True, ''
 
+    @cached_property
+    def current_merge_proposal(self):
+        return PersonMergeProposal.objects.filter(original_person=self.admission.candidate).first()
+
     @cached_property
     def demande_est_en_quarantaine(self) -> bool:
+        person_merge_proposal = self.current_merge_proposal
+        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
         person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
+
         if person_merge_proposal and (
             person_merge_proposal.status in PersonMergeStatus.quarantine_statuses()
-            or not person_merge_proposal.validation.get('valid', True)
+            or not person_merge_proposal.validation.get('valid', False)
         ):
             # Cas display warning when quarantaine
             # (cf. admission/infrastructure/admission/domain/service/lister_toutes_demandes.py)

views/doctorate/details/checklist/mixins.py

@@ -164,13 +164,7 @@ def get_context_data(self, **kwargs):
             if has_comment:
                 checklist_additional_icons['decision_cdd'] = 'fa-regular fa-comment'
 
-        person_merge_proposal = getattr(self.admission.candidate, 'personmergeproposal', None)
-        if person_merge_proposal and (
-            person_merge_proposal.status in PersonMergeStatus.quarantine_statuses()
-            or not person_merge_proposal.validation.get('valid', True)
-        ):
-            # Cas display warning when quarantaine
-            # (cf. admission/infrastructure/admission/domain/service/lister_toutes_demandes.py)
+        if self.demande_est_en_quarantaine:
             checklist_additional_icons['donnees_personnelles'] = 'fas fa-warning text-warning'
 
         candidate_admissions: List[DemandeRechercheDTO] = message_bus_instance.invoke(