wip

docker-compose.yml

@@ -44,6 +44,7 @@ services:
      - .:/app
      - /tmp:/tmp
      - /tmp/upload:/tmp/upload
+     - $HOME/.gitconfig:/root/.gitconfig
      - $HOME/.ssh:/root/.ssh
      - $HOME/.cache/composer:/root/.cache/composer
      - $HOME/.config/composer/auth.json:/root/.config/composer/auth.json

module/Admission/src/Admission/Service/Admission/AdmissionService.php

@@ -51,11 +51,6 @@ class AdmissionService extends BaseService
 
     private const DEFAULT_SOURCE_CODE = "SYG";
 
-
-    /**
-     * @return AdmissionRepository
-     * @throws NotSupported
-     */
     public function getRepository(): AdmissionRepository
     {
         /** @var AdmissionRepository $repo */

module/Application/tests/ApplicationFunctionalTest/Command/CheckWSValidationFichierCinesCommandTest.php

@@ -5,7 +5,7 @@ namespace ApplicationFunctionalTest\Command;
 use Application\Command\CheckWSValidationFichierCinesCommand;
 use Application\Command\ShellCommandRunner;
 
-class CheckWSValidationFichierCinesCommandTest extends \PHPUnit_Framework_TestCase
+class CheckWSValidationFichierCinesCommandTest extends \PHPUnit\Framework\TestCase
 {
     public function test_throws_exception_if_sample_file_not_found()
     {
@@ -124,7 +124,7 @@ class CheckWSValidationFichierCinesCommandTest extends \PHPUnit_Framework_TestCa
         return $filePath;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (file_exists($path = sys_get_temp_dir() . '/fake_script.sh')) {
             unlink($path);

module/Application/tests/ApplicationFunctionalTest/Command/ValidationFichierCinesCommandTest.php

@@ -2,7 +2,7 @@
 
 namespace ApplicationFunctionalTest\Command;
 
-//class ValidationFichierCinesCommandTest extends \PHPUnit_Framework_TestCase
+//class ValidationFichierCinesCommandTest extends \PHPUnit\Framework\TestCase
 //{
 //    public function test_real_web_service_call_max_time()
 //    {

module/Application/tests/ApplicationFunctionalTest/Service/Workflow/WorkflowServiceAbstractTest.php

@@ -37,7 +37,7 @@ abstract class WorkflowServiceAbstractTest extends AbstractControllerTestCase
         $this->em()->flush($this->these);
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $this->ep()->removeNewEntities();
     }

module/Application/tests/ApplicationUnitTest/Rule/NotificationDepotVersionCorrigeeAttenduRuleTest.php

@@ -8,7 +8,7 @@ use DateTime;
 use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophet;
 
-class NotificationDepotVersionCorrigeeAttenduRuleTest extends \PHPUnit_Framework_TestCase
+class NotificationDepotVersionCorrigeeAttenduRuleTest extends \PHPUnit\Framework\TestCase
 {
     public function test_retourne_date_null_si_date_butoire_null()
     {

module/Application/tests/ApplicationUnitTest/Service/File/FileServiceFactoryTest.php

@@ -7,7 +7,7 @@ use Fichier\Service\Fichier\FichierStorageServiceFactory;
 use UnicaenApp\Exception\RuntimeException;
 use Interop\Container\ContainerInterface;
 
-class FileServiceFactoryTest extends \PHPUnit_Framework_TestCase
+class FileServiceFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $container;
@@ -15,7 +15,7 @@ class FileServiceFactoryTest extends \PHPUnit_Framework_TestCase
     /** @var string */
     private $rootDirPath;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = $this->createMock(ContainerInterface::class);
         $this->rootDirPath = '/tmp/' . uniqid('sygal_test_');

module/Application/tests/ApplicationUnitTest/Service/File/FileServiceTest.php

@@ -9,14 +9,14 @@ use Structure\Entity\Db\UniteRecherche;
 use Fichier\Service\Fichier\FichierStorageService;
 use UnicaenApp\Exception\RuntimeException;
 
-class FileServiceTest extends \PHPUnit_Framework_TestCase
+class FileServiceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Fichier\Service\Fichier\FichierStorageService
      */
     private $fileService;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fileService = new \Fichier\Service\Fichier\FichierStorageService();
 //        $this->fileService->setRootDirectoryPathForUploadedFiles('/root/directory/path');

module/Application/tests/ApplicationUnitTest/Service/ImportObservResultService/NotifCorrectionAttendueTest.php

@@ -14,7 +14,7 @@ use ApplicationUnitTest\Test\Provider\MockProviderAwareTrait;
 use DateTime;
 use PHPUnit_Framework_MockObject_MockObject;
 
-class NotifCorrectionAttendueTest extends \PHPUnit_Framework_TestCase
+class NotifCorrectionAttendueTest extends \PHPUnit\Framework\TestCase
 {
     use MockProviderAwareTrait;
 

module/Application/tests/ApplicationUnitTest/Test/Provider/MockProvider.php

@@ -7,21 +7,21 @@ use These\Service\These\TheseService;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use PHPUnit_Framework_MockObject_MockObject;
-use PHPUnit_Framework_TestCase;
+use \PHPUnit\Framework\TestCase;
 
 class MockProvider
 {
     /**
-     * @var PHPUnit_Framework_TestCase
+     * @var \PHPUnit\Framework\TestCase
      */
     private $testCase;
 
     /**
      * MockProvider constructor.
      *
-     * @param PHPUnit_Framework_TestCase $testCase
+     * @param \PHPUnit\Framework\TestCase $testCase
      */
-    public function __construct(PHPUnit_Framework_TestCase $testCase)
+    public function __construct(\PHPUnit\Framework\TestCase $testCase)
     {
         $this->testCase = $testCase;
     }

module/Application/tests/ApplicationUnitTest/Test/Provider/MockProviderAwareTrait.php

@@ -2,7 +2,7 @@
 
 namespace ApplicationUnitTest\Test\Provider;
 
-use PHPUnit_Framework_TestCase;
+use \PHPUnit\Framework\TestCase;
 
 trait MockProviderAwareTrait
 {
@@ -17,10 +17,10 @@ trait MockProviderAwareTrait
     public function mp()
     {
         if (null === $this->mockProvider) {
-            if (! $this instanceof PHPUnit_Framework_TestCase) {
-                throw new \RuntimeException("La classe utilisant ce trait doit être du type " . PHPUnit_Framework_TestCase::class);
+            if (! $this instanceof \PHPUnit\Framework\TestCase) {
+                throw new \RuntimeException("La classe utilisant ce trait doit être du type " . \PHPUnit\Framework\TestCase::class);
             }
-            /** @var PHPUnit_Framework_TestCase $this */
+            /** @var \PHPUnit\Framework\TestCase $this */
             $this->mockProvider = new MockProvider($this);
         }
 

module/Depot/tests/ApplicationUnitTest/Assertion/TheseEntityAssertion/DepotVersionCorrigeeTest.php

@@ -7,7 +7,7 @@ use ApplicationUnitTest\TheseProphetTrait;
 use ApplicationUnitTest\UserContextServiceProphetTrait;
 use Prophecy\Prophet;
 
-class DepotVersionCorrigeeTest extends \PHPUnit_Framework_TestCase
+class DepotVersionCorrigeeTest extends \PHPUnit\Framework\TestCase
 {
     use TheseProphetTrait;
     use UserContextServiceProphetTrait;

module/Depot/tests/ApplicationUnitTest/Assertion/TheseEntityAssertion/DepotVersionInitialeTest.php

@@ -9,7 +9,7 @@ use ApplicationUnitTest\TheseProphetTrait;
 use ApplicationUnitTest\UserContextServiceProphetTrait;
 use Prophecy\Prophet;
 
-class DepotVersionInitialeTest extends \PHPUnit_Framework_TestCase
+class DepotVersionInitialeTest extends \PHPUnit\Framework\TestCase
 {
     use TheseProphetTrait;
     use UserContextServiceProphetTrait;

module/Depot/tests/ApplicationUnitTest/Assertion/TheseEntityAssertion/TheseEntityAssertionTest.php

@@ -9,7 +9,7 @@ use ApplicationUnitTest\TheseProphetTrait;
 use ApplicationUnitTest\UserContextServiceProphetTrait;
 use Prophecy\Prophet;
 
-class TheseEntityAssertionTest extends \PHPUnit_Framework_TestCase
+class TheseEntityAssertionTest extends \PHPUnit\Framework\TestCase
 {
     use TheseProphetTrait;
     use UserContextServiceProphetTrait;

module/Depot/tests/ApplicationUnitTest/Filter/MotsClesFilterTest.php

@@ -4,7 +4,7 @@ namespace DepotUnitTest\Filter;
 
 use Depot\Filter\MotsClesFilter;
 
-class MotsClesFilterTest extends \PHPUnit_Framework_TestCase
+class MotsClesFilterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var MotsClesFilter

module/Import/tests/Functional/DetectionResultatAdmisTest.php

@@ -145,7 +145,7 @@ create or replace view src_these as
 EOS;
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -157,7 +157,7 @@ EOS;
     /**
      * @throws \Exception
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->restoreSrcTheseView();
 

module/InscriptionAdministrative/config/others/inscription-admin.config.php

@@ -12,6 +12,11 @@ use InscriptionAdministrative\Process\Reception\ReceptionProcess;
 use InscriptionAdministrative\Process\Reception\ReceptionProcessFactory;
 use InscriptionAdministrative\Rule\Reception\ReceptionRule;
 use InscriptionAdministrative\Rule\Reception\ReceptionRuleFactory;
+use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManager;
+use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManagerFactory;
+use InscriptionAdministrative\Rule\Reception\StatutAnnulee\StatutAnnuleeRule;
+use InscriptionAdministrative\Rule\Reception\StatutValidee\StatutValideeRule;
+use InscriptionAdministrative\Rule\Reception\StatutValidee\StatutValideeRuleFactory;
 use InscriptionAdministrative\Service\InscriptionAdministrativeService;
 use InscriptionAdministrative\Service\InscriptionAdministrativeServiceFactory;
 use InscriptionAdministrative\Service\Search\InscriptionAdministrativeSearchService;
@@ -160,7 +165,7 @@ return [
             InscriptionAdministrativeSearchService::class => InscriptionAdministrativeSearchServiceFactory::class,
             ImportProcessListener::class => ImportProcessListenerFactory::class,
             ReceptionProcess::class => ReceptionProcessFactory::class,
-            ReceptionRule::class => ReceptionRuleFactory::class,
+            ReceptionRulePluginManager::class => ReceptionRulePluginManagerFactory::class,
         ]
     ]
 ];

module/InscriptionAdministrative/src/InscriptionAdministrative/Controller/InscriptionAdministrativeController.php

@@ -5,23 +5,23 @@ namespace InscriptionAdministrative\Controller;
 use Admission\Service\Admission\AdmissionServiceAwareTrait;
 use Application\Controller\AbstractController;
 use Application\Service\AnneeUniv\AnneeUnivServiceAwareTrait;
+use Doctorant\Service\DoctorantServiceAwareTrait;
 use InscriptionAdministrative\Entity\Db\InscriptionAdministrative;
 use InscriptionAdministrative\Process\Reception\ReceptionProcessAwareTrait;
-use InscriptionAdministrative\Process\Reception\ReceptionProcessResult;
-use InscriptionAdministrative\Rule\Reception\ReceptionRuleAwareTrait;
+use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManagerAwareTrait;
 use InscriptionAdministrative\Service\InscriptionAdministrativeServiceAwareTrait;
 use Laminas\Http\Response;
 use Laminas\View\Model\ViewModel;
-use RuntimeException;
 use UnicaenApp\Traits\MessageAwareInterface;
 
 class InscriptionAdministrativeController extends AbstractController
 {
-    use ReceptionRuleAwareTrait;
     use InscriptionAdministrativeServiceAwareTrait;
     use AdmissionServiceAwareTrait;
+    use DoctorantServiceAwareTrait;
     use AnneeUnivServiceAwareTrait;
 
+    use ReceptionRulePluginManagerAwareTrait;
     use ReceptionProcessAwareTrait;
 
     private InscriptionAdministrative $inscriptionAdministrative;
@@ -35,16 +35,19 @@ class InscriptionAdministrativeController extends AbstractController
     {
         $id = $this->params('id');
 
-        /** @var \InscriptionAdministrative\Entity\Db\InscriptionAdministrative $inscriptionAdministrative */
         $this->inscriptionAdministrative = $this->inscriptionAdministrativeService->getRepository()->findOneById($id);
+        $inscriptionAdministrativeApprenant = $this->inscriptionAdministrative->getInscriptionAdministrativeApprenant();
 
-        $admission = $this->admissionService->getRepository()->findOneByNumeroCandidature(
-            $this->inscriptionAdministrative->getNoCandidat()
-        );
+        $admission = $this->admissionService->getRepository()->findOneByNumeroCandidature($this->inscriptionAdministrative->getNoCandidat());
+        $doctorantTrouveAvecCode = $this->doctorantService->getRepository()->findOneByCodeApprenant($inscriptionAdministrativeApprenant->getCode());
+        $doctorantTrouveAvecINE = $this->doctorantService->getRepository()->findOneByIne($inscriptionAdministrativeApprenant->getINE());
 
         $vm = new ViewModel([
             'inscriptionAdministrative' => $this->inscriptionAdministrative,
+            'inscriptionAdministrativeApprenant' => $inscriptionAdministrativeApprenant,
             'admission' => $admission,
+            'doctorantTrouveAvecCode' => $doctorantTrouveAvecCode,
+            'doctorantTrouveAvecINE' => $doctorantTrouveAvecINE,
             'anneeUnivService' => $this->anneeUnivService,
         ]);
 
@@ -57,13 +60,13 @@ class InscriptionAdministrativeController extends AbstractController
     private function createReceptionProcessChildModel(): ViewModel
     {
         // Lancement de la Rule pour savoir si les conditions pour créer la thèse et le doctorant sont rassemblées.
-        $this->receptionRule->setInscriptionAdministrative($this->inscriptionAdministrative);
-        $this->receptionRule->execute();
+        $receptionRule = $this->receptionRulePluginManager->getRuleForInscriptionAdministrative($this->inscriptionAdministrative);
+        $receptionRule->execute();
 
         $childModel = new ViewModel();
         $childModel->setVariables([
             'inscriptionAdministrative' => $this->inscriptionAdministrative,
-            'receptionRule' => $this->receptionRule,
+            'receptionRule' => $receptionRule,
         ]);
         $childModel->setTemplate('inscription-administrative/inscription-administrative/partial/reception-process');
 
@@ -96,15 +99,6 @@ class InscriptionAdministrativeController extends AbstractController
         return $this->redirect()->toRoute('inscription-administrative/voir', ['id' => $this->inscriptionAdministrative->getId()]);
     }
 
-    private function runReceptionProcess(bool $dryRun = false): ReceptionProcessResult
-    {
-        $this->receptionProcess->setInscriptionAdministrative($this->inscriptionAdministrative);
-        $this->receptionProcess->setDryRun($dryRun);
-        $this->receptionProcess->run();
-
-        return $this->receptionProcess->getResult();
-    }
-
     private function getRequestedInscriptionAdministrative(): ?InscriptionAdministrative
     {
         /** @var InscriptionAdministrative $inscriptionAdministrative */

module/InscriptionAdministrative/src/InscriptionAdministrative/Controller/InscriptionAdministrativeControllerFactory.php

@@ -4,8 +4,9 @@ namespace InscriptionAdministrative\Controller;
 
 use Admission\Service\Admission\AdmissionService;
 use Application\Service\AnneeUniv\AnneeUnivService;
+use Doctorant\Service\DoctorantService;
 use InscriptionAdministrative\Process\Reception\ReceptionProcess;
-use InscriptionAdministrative\Rule\Reception\ReceptionRule;
+use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManager;
 use InscriptionAdministrative\Service\InscriptionAdministrativeService;
 use Psr\Container\ContainerInterface;
 
@@ -23,9 +24,9 @@ class InscriptionAdministrativeControllerFactory
         $inscriptionAdministrativeService = $container->get(InscriptionAdministrativeService::class);
         $controller->setInscriptionAdministrativeService($inscriptionAdministrativeService);
 
-        /** @var ReceptionRule $receptionRule */
-        $receptionRule = $container->get(ReceptionRule::class);
-        $controller->setReceptionRule($receptionRule);
+        /** @var \InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManager $receptionRulePluginManager */
+        $receptionRulePluginManager = $container->get(ReceptionRulePluginManager::class);
+        $controller->setReceptionRulePluginManager($receptionRulePluginManager);
 
         /** @var \Application\Service\AnneeUniv\AnneeUnivService $anneeUnivService */
         $anneeUnivService = $container->get(AnneeUnivService::class);
@@ -35,6 +36,10 @@ class InscriptionAdministrativeControllerFactory
         $admissionService = $container->get(AdmissionService::class);
         $controller->setAdmissionService($admissionService);
 
+        /** @var DoctorantService $doctorantService */
+        $doctorantService = $container->get(DoctorantService::class);
+        $controller->setDoctorantService($doctorantService);
+
         /** @var ReceptionProcess $receptionProcess */
         $receptionProcess = $container->get(ReceptionProcess::class);
         $controller->setReceptionProcess($receptionProcess);

module/InscriptionAdministrative/src/InscriptionAdministrative/Process/Reception/ReceptionProcess.php

@@ -8,13 +8,15 @@ use Doctorant\Entity\Db\Doctorant;
 use Doctorant\Service\DoctorantServiceAwareTrait;
 use Exception;
 use Individu\Service\IndividuServiceAwareTrait;
+use InscriptionAdministrative\Entity\Db\InscriptionAdministrative;
 use InscriptionAdministrative\Entity\Db\InscriptionAdministrativeApprenant;
 use InscriptionAdministrative\Entity\Db\InscriptionAdministrativeDoctorant;
 use InscriptionAdministrative\Entity\Db\Traits\InscriptionAdministrativeAwareTrait;
 use InscriptionAdministrative\Process\AbstractProcess;
-use InscriptionAdministrative\Rule\Reception\ReceptionRuleAwareTrait;
+use InscriptionAdministrative\Rule\Reception\ReceptionRuleInterface;
+use InscriptionAdministrative\Rule\Reception\ReceptionRulePluginManagerAwareTrait;
 use InscriptionAdministrative\Service\InscriptionAdministrativeServiceAwareTrait;
-use RuntimeException;
+use InvalidArgumentException;
 use These\Entity\Db\These;
 use These\Entity\Db\TheseAnneeUniv;
 use These\Service\These\TheseServiceAwareTrait;
@@ -24,7 +26,8 @@ use Webmozart\Assert\Assert;
 
 class ReceptionProcess extends AbstractProcess
 {
-    use ReceptionRuleAwareTrait;
+    use ReceptionRulePluginManagerAwareTrait;
+
     use InscriptionAdministrativeServiceAwareTrait;
     use IndividuServiceAwareTrait;
     use DoctorantServiceAwareTrait;
@@ -42,25 +45,31 @@ class ReceptionProcess extends AbstractProcess
     private ?These $these = null;
     private ?TheseAnneeUniv $theseAnneeUniv = null;
 
+    private ReceptionRuleInterface $receptionRule;
+
     private ReceptionProcessResult $result;
 
-    /**
-     * Point d'entrée.
-     */
-    public function run(): void
+    public function setInscriptionAdministrative(InscriptionAdministrative $inscriptionAdministrative): void
     {
-        $this->receptionRule->setInscriptionAdministrative($this->inscriptionAdministrative);
-        $this->receptionRule->execute();
-
-        $this->result = new ReceptionProcessResult();
+        $this->inscriptionAdministrative = $inscriptionAdministrative;
 
         /** @var InscriptionAdministrativeApprenant $iaApprenant */
         $iaApprenant = $this->inscriptionAdministrative->getInscriptionAdministrativeApprenant();
         if ($iaApprenant === null) {
-            throw new RuntimeException("Anomalie : l'IA n'est liée à aucun apprenant");
+            throw new InvalidArgumentException("Anomalie : l'IA n'est liée à aucun apprenant");
         }
 
         $this->inscriptionAdministrativeApprenant = $iaApprenant;
+    }
+
+    /**
+     * Point d'entrée.
+     */
+    public function run(): void
+    {
+        $this->receptionRule = $this->receptionRulePluginManager->getRuleForInscriptionAdministrative($this->inscriptionAdministrative);
+
+        $this->result = new ReceptionProcessResult();
 
         $this->beginTransaction();
         try {
@@ -90,18 +99,20 @@ class ReceptionProcess extends AbstractProcess
      */
     private function process(): void
     {
+        $this->receptionRule->execute();
+
         if ($this->receptionRule->canCreateDoctorant()) {
-            $this->createDoctorantFromApprenant();
+            $this->createDoctorant();
         } else {
-            $this->doctorant = $this->receptionRule->getDoctorant();
+            $this->doctorant = $this->receptionRule->getFoundDoctorant();
         }
 
         if ($this->receptionRule->canUpdateDoctorant()) {
-            $this->updateDoctorantFromApprenant();
+            $this->updateDoctorant();
             // NB : la mise à jour complète du doctorant inclue la màj du code apprenant
         } else {
-            if ($this->receptionRule->canUpdateCodeApprenantDoctorantFromApprenant()) {
-                $this->updateCodeApprenantDoctorantFromApprenant();
+            if ($this->receptionRule->canUpdateCodeApprenantDoctorant()) {
+                $this->updateCodeApprenantDoctorant();
             }
         }
 
@@ -110,14 +121,14 @@ class ReceptionProcess extends AbstractProcess
         }
 
         if ($this->receptionRule->canCreateThese()) {
-            $this->admission = $this->receptionRule->getAdmission();
-            $this->createTheseFromAdmission();
+            $this->admission = $this->receptionRule->getFoundAdmission();
+            $this->createThese();
         } else {
-            $this->these = $this->receptionRule->getThese(); // évite de fetcher à nouveau la thèse
+            $this->these = $this->receptionRule->getFoundThese(); // évite de fetcher à nouveau la thèse
         }
 
         if ($this->receptionRule->canCreateTheseAnneeUniv()) {
-            $this->createTheseAnneeUnivFromInscriptionAdministrative();
+            $this->createTheseAnneeUniv();
         }
         if ($this->receptionRule->canLinkTheseAnneeUnivToInscriptionAdministrative()) {
             $this->linkTheseAnneeUnivToInscriptionAdministrative();
@@ -128,7 +139,13 @@ class ReceptionProcess extends AbstractProcess
         }
     }
 
-    private function createDoctorantFromApprenant(): void
+    public function getResult(): ReceptionProcessResult
+    {
+        return $this->result;
+    }
+
+
+    private function createDoctorant(): void
     {
         $etablissement = $this->inscriptionAdministrativeApprenant->getSource()->getEtablissement();
 
@@ -147,7 +164,7 @@ class ReceptionProcess extends AbstractProcess
         $this->result->setDoctorant($this->doctorant);
     }
 
-    private function updateDoctorantFromApprenant(): void
+    private function updateDoctorant(): void
     {
         $individu = $this->doctorant->getIndividu();
         $this->individuService->updateIndividuFromApprenant($individu, $this->inscriptionAdministrativeApprenant);
@@ -165,7 +182,7 @@ class ReceptionProcess extends AbstractProcess
         $this->result->setDoctorant($this->doctorant);
     }
 
-    private function createTheseFromAdmission(): void
+    private function createThese(): void
     {
         $this->these = $this->theseService->newTheseFromAdmission($this->admission, $this->doctorant);
         $this->theseService->saveThese($this->these);
@@ -180,7 +197,7 @@ class ReceptionProcess extends AbstractProcess
         $this->result->setCreatedThese($this->these);
     }
 
-    private function createTheseAnneeUnivFromInscriptionAdministrative(): void
+    private function createTheseAnneeUniv(): void
     {
         Assert::notNull($this->these, "Incohérence dans l'algo : une thèse devrait être dispo !"); // todo : généraliser ce type de vérif ?
 
@@ -203,7 +220,7 @@ class ReceptionProcess extends AbstractProcess
 
     private function linkTheseAnneeUnivToInscriptionAdministrative(): void
     {
-        $this->theseAnneeUniv = $this->receptionRule->getTheseAnneeUniv();
+        $this->theseAnneeUniv = $this->receptionRule->getFoundTheseAnneeUniv();
         $this->theseAnneeUniv->setInscriptionAdministrative($this->inscriptionAdministrative);
         $this->theseAnneeUnivService->save($this->theseAnneeUniv);
 
@@ -214,7 +231,7 @@ class ReceptionProcess extends AbstractProcess
         $this->result->addMessage($message, MessageAwareInterface::INFO);
     }
 
-    private function updateCodeApprenantDoctorantFromApprenant(): void
+    private function updateCodeApprenantDoctorant(): void
     {
         $codeApprenant = $this->inscriptionAdministrativeApprenant->getCode();
         $this->doctorant->setCodeApprenantInSource($codeApprenant);
@@ -256,23 +273,4 @@ class ReceptionProcess extends AbstractProcess
         );
         $this->result->addMessage($message, MessageAwareInterface::INFO);
     }
-
-
-    /************************************************ IA annulée ****************************************************/
-
-    /**
-     * Cas d'une IA annulée.
-     */
-    private function processInscriptionAnnulee(): void
-    {
-        // ?
-    }
-
-
-    /************************************************ Communs ****************************************************/
-
-    public function getResult(): ReceptionProcessResult
-    {
-        return $this->result;
-    }
 }
\ No newline at end of file