[WIP] [hotfix/OS-1274 => DEV] Back-office > Finançabilité > Passage à l_état _Dérogation accordée_ : enregistrer une valeur pour financability_rule_established_by_id et financability_rule_established_on

admin.py

@@ -217,7 +217,7 @@ class DoctorateAdmissionAdmin(AdmissionAdminMixin):
         'financability_computed_rule',
         'financability_computed_rule_situation',
         'financability_computed_rule_on',
-        'financability_rule_established_by',
+        'financability_established_by',
         'financability_dispensation_first_notification_on',
         'financability_dispensation_first_notification_by',
         'financability_dispensation_last_notification_on',
@@ -259,7 +259,7 @@ class GeneralEducationAdmissionAdmin(AdmissionAdminMixin):
         'financability_computed_rule',
         'financability_computed_rule_situation',
         'financability_computed_rule_on',
-        'financability_rule_established_by',
+        'financability_established_by',
         'financability_dispensation_first_notification_on',
         'financability_dispensation_first_notification_by',
         'financability_dispensation_last_notification_on',
@@ -682,8 +682,8 @@ def queryset(self, request, queryset):
                 When(
                     ~Q(checklist__current__financabilite__status__in=['INITIAL_NON_CONCERNE', 'GEST_REUSSITE'])
                     | Q(generaleducationadmission__financability_rule='')
-                    | Q(generaleducationadmission__financability_rule_established_on__isnull=True)
-                    | Q(generaleducationadmission__financability_rule_established_by_id__isnull=True),
+                    | Q(generaleducationadmission__financability_established_on__isnull=True)
+                    | Q(generaleducationadmission__financability_established_by_id__isnull=True),
                     generaleducationadmission__isnull=False,
                     then=Value(False),
                 ),

contrib/models/doctorate.py

@@ -427,16 +427,16 @@ class DoctorateAdmission(BaseAdmission):
         default='',
         blank=True,
     )
-    financability_rule_established_by = models.ForeignKey(
+    financability_established_by = models.ForeignKey(
         'base.Person',
-        verbose_name=_('Financability rule established by'),
+        verbose_name=_('Financability established by'),
         on_delete=models.PROTECT,
         related_name='+',
         null=True,
         editable=False,
     )
-    financability_rule_established_on = models.DateTimeField(
-        verbose_name=_('Financability rule established on'),
+    financability_established_on = models.DateTimeField(
+        verbose_name=_('Financability established on'),
         null=True,
         editable=False,
     )
@@ -891,7 +891,7 @@ def get_queryset(self):
                 "accounting",
                 "international_scholarship",
                 "last_update_author",
-                "financability_rule_established_by",
+                "financability_established_by",
                 "financability_dispensation_first_notification_by",
                 "financability_dispensation_last_notification_by",
             )
@@ -932,7 +932,7 @@ def for_manager_dto(self):
         return (
             self.for_dto()
             .select_related(
-                "financability_rule_established_by",
+                "financability_established_by",
                 "financability_dispensation_first_notification_by",
                 "financability_dispensation_last_notification_by",
                 "other_training_accepted_by_fac__academic_year",

contrib/models/general_education.py

@@ -172,16 +172,16 @@ class GeneralEducationAdmission(BaseAdmission):
         default='',
         blank=True,
     )
-    financability_rule_established_by = models.ForeignKey(
+    financability_established_by = models.ForeignKey(
         'base.Person',
-        verbose_name=_('Financability rule established by'),
+        verbose_name=_('Financability established by'),
         on_delete=models.PROTECT,
         related_name='+',
         null=True,
         editable=False,
     )
-    financability_rule_established_on = models.DateTimeField(
-        verbose_name=_('Financability rule established on'),
+    financability_established_on = models.DateTimeField(
+        verbose_name=_('Financability established on'),
         null=True,
         editable=False,
     )
@@ -560,7 +560,7 @@ def get_queryset(self):
                 "international_scholarship",
                 "erasmus_mundus_scholarship",
                 "diplomatic_post",
-                "financability_rule_established_by",
+                "financability_established_by",
                 "financability_dispensation_first_notification_by",
                 "financability_dispensation_last_notification_by",
                 "accounting",

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

@@ -195,8 +195,8 @@ class Proposition(interface.RootEntity):
     financabilite_regle_calcule_situation: Optional[SituationFinancabilite] = None
     financabilite_regle_calcule_le: Optional[datetime.datetime] = None
     financabilite_regle: Optional[SituationFinancabilite] = None
-    financabilite_regle_etabli_par: str = ''
-    financabilite_regle_etabli_le: Optional[datetime.datetime] = None
+    financabilite_etabli_par: str = ''
+    financabilite_etabli_le: Optional[datetime.datetime] = None
 
     financabilite_derogation_statut: Optional[DerogationFinancement] = None
     financabilite_derogation_premiere_notification_le: Optional[datetime.datetime] = None
@@ -823,12 +823,11 @@ def specifier_financabilite_resultat_calcul(
     def specifier_financabilite_regle(
         self,
         financabilite_regle: SituationFinancabilite,
-        etabli_par: str,
         auteur_modification: str,
     ):
         self.financabilite_regle = financabilite_regle
-        self.financabilite_regle_etabli_par = etabli_par
-        self.financabilite_regle_etabli_le = datetime.datetime.now()
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = datetime.datetime.now()
         self.auteur_derniere_modification = auteur_modification
 
         if financabilite_regle in SITUATION_FINANCABILITE_PAR_ETAT[EtatFinancabilite.FINANCABLE]:
@@ -846,12 +845,11 @@ def specifier_financabilite_regle(
 
     def specifier_financabilite_non_concernee(
         self,
-        etabli_par: str,
         auteur_modification: str,
     ):
         self.financabilite_regle = None
-        self.financabilite_regle_etabli_par = etabli_par
-        self.financabilite_regle_etabli_le = datetime.datetime.now()
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = datetime.datetime.now()
         self.auteur_derniere_modification = auteur_modification
         self.checklist_actuelle.financabilite = StatutChecklist(
             statut=ChoixStatutChecklist.INITIAL_NON_CONCERNE,
@@ -865,6 +863,8 @@ def specifier_derogation_financabilite(
         refus_autres_motifs: Optional[List[str]],
         auteur_modification: str,
     ):
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = datetime.datetime.now()
         self.auteur_derniere_modification = auteur_modification
         self.financabilite_derogation_statut = statut
         if statut == DerogationFinancement.REFUS_DE_DEROGATION_FACULTAIRE:

ddd/admission/doctorat/preparation/dtos/proposition.py

@@ -115,8 +115,8 @@ class PropositionDTO(interface.DTO):
     financabilite_regle_calcule_situation: str
     financabilite_regle_calcule_le: Optional[datetime.datetime]
     financabilite_regle: str
-    financabilite_regle_etabli_par: str
-    financabilite_regle_etabli_le: Optional[datetime.datetime]
+    financabilite_etabli_par: str
+    financabilite_etabli_le: Optional[datetime.datetime]
 
     financabilite_derogation_statut: str
     financabilite_derogation_premiere_notification_le: Optional[datetime.datetime]

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

@@ -70,5 +70,5 @@ def test_should_specifier_etre_non_specifie(self):
 
         # Proposition mise à jour
         self.assertIsNone(proposition.financabilite_regle)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.INITIAL_NON_CONCERNE)

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

@@ -87,7 +87,7 @@ def test_should_specifier_regle_etre_ok(self):
 
         # Proposition mise à jour
         self.assertEqual(proposition.financabilite_regle, SituationFinancabilite.REPRISE_APRES_5_ANS)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.GEST_REUSSITE)
 
     def test_should_specifier_regle_non_financable_etre_ok(self):
@@ -107,5 +107,5 @@ def test_should_specifier_regle_non_financable_etre_ok(self):
 
         # Proposition mise à jour
         self.assertEqual(proposition.financabilite_regle, SituationFinancabilite.N_A_PAS_VALIDE_60_CREDITS_BLOC_1)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.GEST_BLOCAGE)

ddd/admission/doctorat/preparation/use_case/write/specifier_financabilite_non_concernee_service.py

@@ -43,7 +43,6 @@ def specifier_financabilite_non_concernee(
 
     # THEN
     proposition.specifier_financabilite_non_concernee(
-        cmd.etabli_par,
         cmd.gestionnaire,
     )
     proposition_repository.save(proposition)

ddd/admission/doctorat/preparation/use_case/write/specifier_financabilite_regle_service.py

@@ -41,7 +41,6 @@ def specifier_financabilite_regle(
     # THEN
     proposition.specifier_financabilite_regle(
         SituationFinancabilite[cmd.financabilite_regle],
-        cmd.etabli_par,
         cmd.gestionnaire,
     )
     proposition_repository.save(proposition)

ddd/admission/formation_generale/commands.py

@@ -523,14 +523,12 @@ class SpecifierFinancabiliteResultatCalculCommand(interface.CommandRequest):
 class SpecifierFinancabiliteRegleCommand(interface.CommandRequest):
     uuid_proposition: str
     financabilite_regle: str
-    etabli_par: str
     gestionnaire: str
 
 
 @attr.dataclass(frozen=True, slots=True)
 class SpecifierFinancabiliteNonConcerneeCommand(interface.CommandRequest):
     uuid_proposition: str
-    etabli_par: str
     gestionnaire: str
 
 

ddd/admission/formation_generale/domain/model/proposition.py

@@ -166,8 +166,8 @@ class Proposition(interface.RootEntity):
     financabilite_regle_calcule_situation: SituationFinancabilite = ''
     financabilite_regle_calcule_le: Optional[datetime.datetime] = None
     financabilite_regle: SituationFinancabilite = ''
-    financabilite_regle_etabli_par: str = ''
-    financabilite_regle_etabli_le: Optional[datetime.datetime] = None
+    financabilite_etabli_par: str = ''
+    financabilite_etabli_le: Optional[datetime.datetime] = None
 
     financabilite_derogation_statut: DerogationFinancement = ''
     financabilite_derogation_premiere_notification_le: Optional[datetime.datetime] = None
@@ -818,12 +818,11 @@ def specifier_financabilite_resultat_calcul(
     def specifier_financabilite_regle(
         self,
         financabilite_regle: SituationFinancabilite,
-        etabli_par: str,
         auteur_modification: str,
     ):
         self.financabilite_regle = financabilite_regle
-        self.financabilite_regle_etabli_par = etabli_par
-        self.financabilite_regle_etabli_le = now()
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = now()
         self.auteur_derniere_modification = auteur_modification
 
         if financabilite_regle in SITUATION_FINANCABILITE_PAR_ETAT[EtatFinancabilite.FINANCABLE]:
@@ -841,12 +840,11 @@ def specifier_financabilite_regle(
 
     def specifier_financabilite_non_concernee(
         self,
-        etabli_par: str,
         auteur_modification: str,
     ):
         self.financabilite_regle = None
-        self.financabilite_regle_etabli_par = etabli_par
-        self.financabilite_regle_etabli_le = now()
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = now()
         self.auteur_derniere_modification = auteur_modification
         self.checklist_actuelle.financabilite = StatutChecklist(
             statut=ChoixStatutChecklist.INITIAL_NON_CONCERNE,
@@ -860,6 +858,8 @@ def specifier_derogation_financabilite(
         refus_autres_motifs: Optional[List[str]],
         auteur_modification: str,
     ):
+        self.financabilite_etabli_par = auteur_modification
+        self.financabilite_etabli_le = now()
         self.auteur_derniere_modification = auteur_modification
         self.financabilite_derogation_statut = statut
         if statut == DerogationFinancement.REFUS_DE_DEROGATION_FACULTAIRE:

ddd/admission/formation_generale/dtos/proposition.py

@@ -92,8 +92,8 @@ class PropositionDTO(interface.DTO):
     financabilite_regle_calcule_situation: str
     financabilite_regle_calcule_le: Optional[datetime.datetime]
     financabilite_regle: str
-    financabilite_regle_etabli_par: str
-    financabilite_regle_etabli_le: Optional[datetime.datetime]
+    financabilite_etabli_par: str
+    financabilite_etabli_le: Optional[datetime.datetime]
 
     financabilite_derogation_statut: str
     financabilite_derogation_premiere_notification_le: Optional[datetime.datetime]

ddd/admission/formation_generale/test/use_case/write/test_specifier_financabilite_non_concernee_service.py

@@ -56,7 +56,6 @@ def setUp(self) -> None:
 
         self.command = SpecifierFinancabiliteNonConcerneeCommand(
             uuid_proposition='uuid-CERTIFICATE-CONFIRMED',
-            etabli_par='uuid-GESTIONNAIRE',
             gestionnaire='0123456789',
         )
 
@@ -70,5 +69,5 @@ def test_should_specifier_etre_non_specifie(self):
 
         # Proposition mise à jour
         self.assertIsNone(proposition.financabilite_regle)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.INITIAL_NON_CONCERNE)

ddd/admission/formation_generale/test/use_case/write/test_specifier_financabilite_regle_service.py

@@ -73,7 +73,6 @@ def setUp(self) -> None:
         self.command = SpecifierFinancabiliteRegleCommand(
             uuid_proposition='uuid-MASTER-SCI-CONFIRMED',
             financabilite_regle=SituationFinancabilite.REPRISE_APRES_5_ANS.name,
-            etabli_par='uuid-GESTIONNAIRE',
             gestionnaire='0123456789',
         )
 
@@ -87,14 +86,13 @@ def test_should_specifier_regle_etre_ok(self):
 
         # Proposition mise à jour
         self.assertEqual(proposition.financabilite_regle, SituationFinancabilite.REPRISE_APRES_5_ANS)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.GEST_REUSSITE)
 
     def test_should_specifier_regle_non_financable_etre_ok(self):
         command = SpecifierFinancabiliteRegleCommand(
             uuid_proposition='uuid-MASTER-SCI-CONFIRMED',
             financabilite_regle=SituationFinancabilite.N_A_PAS_VALIDE_60_CREDITS_BLOC_1.name,
-            etabli_par='uuid-GESTIONNAIRE',
             gestionnaire='0123456789',
         )
 
@@ -107,5 +105,5 @@ def test_should_specifier_regle_non_financable_etre_ok(self):
 
         # Proposition mise à jour
         self.assertEqual(proposition.financabilite_regle, SituationFinancabilite.N_A_PAS_VALIDE_60_CREDITS_BLOC_1)
-        self.assertEqual(proposition.financabilite_regle_etabli_par, 'uuid-GESTIONNAIRE')
+        self.assertEqual(proposition.financabilite_etabli_par, '0123456789')
         self.assertEqual(proposition.checklist_actuelle.financabilite.statut, ChoixStatutChecklist.GEST_BLOCAGE)

ddd/admission/formation_generale/use_case/write/specifier_financabilite_non_concernee_service.py

@@ -43,7 +43,6 @@ def specifier_financabilite_non_concernee(
 
     # THEN
     proposition.specifier_financabilite_non_concernee(
-        cmd.etabli_par,
         cmd.gestionnaire,
     )
     proposition_repository.save(proposition)

ddd/admission/formation_generale/use_case/write/specifier_financabilite_regle_service.py

@@ -43,7 +43,6 @@ def specifier_financabilite_regle(
     # THEN
     proposition.specifier_financabilite_regle(
         SituationFinancabilite[cmd.financabilite_regle],
-        cmd.etabli_par,
         cmd.gestionnaire,
     )
     proposition_repository.save(proposition)

infrastructure/admission/doctorat/preparation/repository/in_memory/proposition.py

@@ -303,8 +303,8 @@ def _load_dto(cls, proposition: 'Proposition'):
             else '',
             financabilite_regle_calcule_le=proposition.financabilite_regle_calcule_le,
             financabilite_regle=proposition.financabilite_regle.name if proposition.financabilite_regle else '',
-            financabilite_regle_etabli_par=proposition.financabilite_regle_etabli_par,
-            financabilite_regle_etabli_le=proposition.financabilite_regle_etabli_le,
+            financabilite_etabli_par=proposition.financabilite_etabli_par,
+            financabilite_etabli_le=proposition.financabilite_etabli_le,
             financabilite_derogation_statut=proposition.financabilite_derogation_statut.name
             if proposition.financabilite_derogation_statut
             else '',