Loading module/Application/config/others/substitution.config.php +0 −10 Changes for module/Application/config/others/substitution.config.php: 0 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -20,7 +20,6 @@ return [ 'detruire', 'generate-source-input', 'substitution-automatique', 'afficher-automatique', 'modifier-automatique', 'enregistrer-automatique', ], Loading Loading @@ -140,15 +139,6 @@ return [ ], ], ], 'afficher' => [ 'type' => Segment::class, 'options' => [ 'route' => '/afficher/:type/:identifiant', 'defaults' => [ 'action' => 'afficher-automatique', ], ], ], ], ], Loading module/Application/src/Application/Controller/SubstitutionController.php +29 −138 Changes for module/Application/src/Application/Controller/SubstitutionController.php: 29 added lines, 138 removed lines. Original line number Diff line number Diff line Loading @@ -143,7 +143,7 @@ class SubstitutionController extends AbstractController ]); } //TODO verifier le comportement /** Fonction de destruction */ public function detruireAction() { $idCible = $this->params()->fromRoute('cible'); $structure = $this->structureService->findStructureById($idCible); Loading @@ -167,9 +167,9 @@ class SubstitutionController extends AbstractController /** Fonction principale des substitutions (appelle checkStructure) */ public function substitutionAutomatiqueAction() { $substitutionsEcolesDoctorales = $this->checkStructure(TypeStructure::CODE_ECOLE_DOCTORALE); $substitutionsEtablissements = $this->checkStructure(TypeStructure::CODE_ETABLISSEMENT); $substitutionsUnitesRecherches = $this->checkStructure(TypeStructure::CODE_UNITE_RECHERCHE); $substitutionsEcolesDoctorales = $this->getStructureService()->checkStructure(TypeStructure::CODE_ECOLE_DOCTORALE); $substitutionsEtablissements = $this->getStructureService()->checkStructure(TypeStructure::CODE_ETABLISSEMENT); $substitutionsUnitesRecherches = $this->getStructureService()->checkStructure(TypeStructure::CODE_UNITE_RECHERCHE); return new ViewModel([ 'substitutionsEcolesDoctorales' => $substitutionsEcolesDoctorales, Loading @@ -178,73 +178,30 @@ class SubstitutionController extends AbstractController ]); } // TODO mettre dans le service ... /** Identifie les structures substituables en utilisant le sourceCode */ public function checkStructure($type) { $structures = []; switch($type) { case (TypeStructure::CODE_ECOLE_DOCTORALE): $structures = $this->getEcoleDoctoraleService()->getRepository()->findAll(); break; case (TypeStructure::CODE_ETABLISSEMENT): $structures = $this->getEtablissementService()->getRepository()->findAll(); break; case (TypeStructure::CODE_UNITE_RECHERCHE): $structures = $this->getUniteRechercheService()->getRepository()->findAll(); break; } $dictionnaire = []; foreach ($structures as $structure) { $identifiant = explode("::", $structure->getSourceCode())[1]; $dictionnaire[$identifiant][] = $structure; } $substitutions = []; foreach ($dictionnaire as $identifiant => $structures) { if (count($structures) >= 2) { $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $substitutions[$identifiant] = [$sources, $cible]; } } return $substitutions; } /** Enregistrer une substitution automatique (! créer une structure cible si aucune n'existe */ public function enregistrerAutomatiqueAction() { $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::", $structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; $dictionnary = $this->getStructureService()->getSubstitutionDictionnary($identifiant, $type); $sources = $dictionnary["sources"]; $cible = $dictionnary["cible"]; if ($cible != null) { $this->structureService->updateStructureSubstitutions($sources, $cible); } else { /** @var StructureConcreteInterface $cible */ $cible = $this->getStructureService()->createStructureConcrete($type); $cible->getStructure()->setLibelle($sources[0]->getLibelle()); $cible->getStructure()->setSigle($sources[0]->getSigle()); $cible->getStructure()->setCode($sources[0]->getCode()); $this->getStructureService()->createStructureSubstitutions($sources, $cible); } if ($cible != null) $this->structureService->updateStructureSubstitutions($sources, $cible->getStructure()); return new ViewModel(); } Loading @@ -253,40 +210,11 @@ class SubstitutionController extends AbstractController $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $structures = $this->structureService->getStructuresConcretes($type); /** Retrait des structures soient substituées soient substitutantes */ $toRemove = []; /** @var StructureConcreteInterface $structure */ foreach($structures as $structure) { if (count($structure->getStructure()->getStructuresSubstituees()) != 0) { $toRemove[] = $structure->getStructure(); foreach ($structure->getStructure()->getStructuresSubstituees() as $sub) { $toRemove[] = $sub; } $dictionnary = $this->getStructureService()->getSubstitutionDictionnary($identifiant, $type); $sources = $dictionnary["sources"]; $cible = $dictionnary["cible"]; } } /** @var Structure $remove */ foreach($toRemove as $remove) { $structures = array_filter($structures, function (StructureConcreteInterface $structure) use ($remove) { return $structure->getStructure()->getId() !== $remove->getId(); }); } $structures = $this->getStructureService()->getStructuresNonSubstitueesByType($type); $request = $this->getRequest(); if ($request->isPost()) { Loading @@ -295,32 +223,23 @@ class SubstitutionController extends AbstractController foreach ($data['sourceIds'] as $sourceId) { $structure = $this->structureService->findStructureById($sourceId); $structureConcrete = $this->structureService->findStructureConcreteFromStructure($structure); if ($structureConcrete === null) { throw new RuntimeException("Aucune structure concrète cible trouvée avec id=$sourceId."); } $sources[] = $structureConcrete; } if ($cible === null) { /** @var StructureConcreteInterface $cible */ $cible = $this->getStructureService()->createStructureConcrete($type); $this->structureService->updateFromPostData($cible,$data['cible']); $cible->setSourceCode("SyGAL" . "::" . $identifiant); $this->getEntityManager()->persist($cible); $this->getEntityManager()->flush($cible); $cible->getStructure()->setLibelle($sources[0]->getLibelle()); $cible->getStructure()->setSigle($sources[0]->getSigle()); $cible->getStructure()->setCode($sources[0]->getCode()); $this->getStructureService()->createStructureSubstitutions($sources, $cible); } else { $this->structureService->updateFromPostData($cible,$data['cible']); } $this->structureService->updateStructureSubstitutions($sources, $cible->getStructure()); } $message = "La substitution <strong>".$cible->getLibelle()."</strong> vient d'être mise à jour. Elle regroupe les structures : "; $first = true; foreach($sources as $source) { if (!$first) $message .= ", "; $message .= "<i>".$source->getLibelle()."</i>"; $first = false; } $message .= implode(", ", array_map(function(StructureConcreteInterface $s) { return "<i>".$s->getLibelle()."</i>";}, $sources)); $this->flashMessenger()->addSuccessMessage($message); return $this->redirect()->toRoute(null, [],[], true); Loading @@ -328,7 +247,6 @@ class SubstitutionController extends AbstractController if ($cible === null) { $cible = $this->getStructureService()->createStructureConcrete($type); $cible->setSourceCode("SyGAL" . "::" . $identifiant); } $vm = new ViewModel(); Loading @@ -344,31 +262,4 @@ class SubstitutionController extends AbstractController return $vm; } public function afficherAutomatiqueAction() { $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } return new ViewModel([ 'substituees' => $sources, 'substituante' => $cible, 'type' => $type, 'identifiant' => $identifiant, ]); } } No newline at end of file module/Application/src/Application/Service/Structure/StructureService.php +76 −0 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 76 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,8 +13,11 @@ use Application\Entity\Db\UniteRecherche; use Application\Entity\Db\Utilisateur; use Application\Filter\EtablissementPrefixFilter; use Application\Service\BaseService; use Application\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Source\SourceService; use Application\Service\Source\SourceServiceAwareTrait; use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\OptimisticLockException; Loading @@ -30,6 +33,9 @@ class StructureService extends BaseService { use SourceServiceAwareTrait; use SynchroServiceAwareTrait; use EcoleDoctoraleServiceAwareTrait; use EtablissementServiceAwareTrait; use UniteRechercheServiceAwareTrait; /** * @return EntityRepository Loading Loading @@ -526,12 +532,15 @@ class StructureService extends BaseService $repo = null; switch($type) { case TypeStructure::CODE_ECOLE_DOCTORALE: case 'ecole-doctorale': $repo = $this->getEntityManager()->getRepository(EcoleDoctorale::class); break; case TypeStructure::CODE_UNITE_RECHERCHE: case 'unite-recherche': $repo = $this->getEntityManager()->getRepository(UniteRecherche::class); break; case TypeStructure::CODE_ETABLISSEMENT: case 'etablissement': $repo = $this->getEntityManager()->getRepository(Etablissement::class); break; } Loading Loading @@ -640,4 +649,71 @@ class StructureService extends BaseService return $result; } // TODO mettre dans le service ... /** Identifie les structures substituables en utilisant le sourceCode */ public function checkStructure($type) { $structures = []; switch($type) { case (TypeStructure::CODE_ECOLE_DOCTORALE): $structures = $this->getEcoleDoctoraleService()->getRepository()->findAll(); break; case (TypeStructure::CODE_ETABLISSEMENT): $structures = $this->getEtablissementService()->getRepository()->findAll(); break; case (TypeStructure::CODE_UNITE_RECHERCHE): $structures = $this->getUniteRechercheService()->getRepository()->findAll(); break; } $dictionnaire = []; foreach ($structures as $structure) { $identifiant = explode("::", $structure->getSourceCode())[1]; $dictionnaire[$identifiant][] = $structure; } $substitutions = []; foreach ($dictionnaire as $identifiant => $structures) { if (count($structures) >= 2) { $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $substitutions[$identifiant] = [$sources, $cible]; } } return $substitutions; } public function getSubstitutionDictionnary($identifiant, $type) { $structures = $this->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } return [ "cible" => $cible, "sources" => $sources ]; } } No newline at end of file module/Application/src/Application/Service/Structure/StructureServiceFactory.php +12 −0 Changes for module/Application/src/Application/Service/Structure/StructureServiceFactory.php: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,7 +2,10 @@ namespace Application\Service\Structure; use Application\Service\EcoleDoctorale\EcoleDoctoraleService; use Application\Service\Etablissement\EtablissementService; use Application\Service\Source\SourceService; use Application\Service\UniteRecherche\UniteRechercheService; use Import\Service\SynchroService; use Zend\ServiceManager\ServiceLocatorInterface as ContainerInterface; Loading @@ -23,13 +26,22 @@ class StructureServiceFactory /** * @var SourceService $sourceService * @var SynchroService $synchroService * @var EcoleDoctoraleService $ecoleService * @var EtablissementService $etablissementService * @var UniteRechercheService $uniteRechercheService */ $sourceService = $container->get(SourceService::class); $synchroService = $container->get(SynchroService::class); $ecoleService = $container->get(EcoleDoctoraleService::class); $etablissementService = $container->get(EtablissementService::class); $uniteRechercheService = $container->get(UniteRechercheService::class); $service = new StructureService; $service->setSourceService($sourceService); $service->setSynchroService($synchroService); $service->setEcoleDoctoraleService($ecoleService); $service->setEtablissementService($etablissementService); $service->setUniteRechercheService($uniteRechercheService); return $service; } Loading Loading
module/Application/config/others/substitution.config.php +0 −10 Changes for module/Application/config/others/substitution.config.php: 0 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -20,7 +20,6 @@ return [ 'detruire', 'generate-source-input', 'substitution-automatique', 'afficher-automatique', 'modifier-automatique', 'enregistrer-automatique', ], Loading Loading @@ -140,15 +139,6 @@ return [ ], ], ], 'afficher' => [ 'type' => Segment::class, 'options' => [ 'route' => '/afficher/:type/:identifiant', 'defaults' => [ 'action' => 'afficher-automatique', ], ], ], ], ], Loading
module/Application/src/Application/Controller/SubstitutionController.php +29 −138 Changes for module/Application/src/Application/Controller/SubstitutionController.php: 29 added lines, 138 removed lines. Original line number Diff line number Diff line Loading @@ -143,7 +143,7 @@ class SubstitutionController extends AbstractController ]); } //TODO verifier le comportement /** Fonction de destruction */ public function detruireAction() { $idCible = $this->params()->fromRoute('cible'); $structure = $this->structureService->findStructureById($idCible); Loading @@ -167,9 +167,9 @@ class SubstitutionController extends AbstractController /** Fonction principale des substitutions (appelle checkStructure) */ public function substitutionAutomatiqueAction() { $substitutionsEcolesDoctorales = $this->checkStructure(TypeStructure::CODE_ECOLE_DOCTORALE); $substitutionsEtablissements = $this->checkStructure(TypeStructure::CODE_ETABLISSEMENT); $substitutionsUnitesRecherches = $this->checkStructure(TypeStructure::CODE_UNITE_RECHERCHE); $substitutionsEcolesDoctorales = $this->getStructureService()->checkStructure(TypeStructure::CODE_ECOLE_DOCTORALE); $substitutionsEtablissements = $this->getStructureService()->checkStructure(TypeStructure::CODE_ETABLISSEMENT); $substitutionsUnitesRecherches = $this->getStructureService()->checkStructure(TypeStructure::CODE_UNITE_RECHERCHE); return new ViewModel([ 'substitutionsEcolesDoctorales' => $substitutionsEcolesDoctorales, Loading @@ -178,73 +178,30 @@ class SubstitutionController extends AbstractController ]); } // TODO mettre dans le service ... /** Identifie les structures substituables en utilisant le sourceCode */ public function checkStructure($type) { $structures = []; switch($type) { case (TypeStructure::CODE_ECOLE_DOCTORALE): $structures = $this->getEcoleDoctoraleService()->getRepository()->findAll(); break; case (TypeStructure::CODE_ETABLISSEMENT): $structures = $this->getEtablissementService()->getRepository()->findAll(); break; case (TypeStructure::CODE_UNITE_RECHERCHE): $structures = $this->getUniteRechercheService()->getRepository()->findAll(); break; } $dictionnaire = []; foreach ($structures as $structure) { $identifiant = explode("::", $structure->getSourceCode())[1]; $dictionnaire[$identifiant][] = $structure; } $substitutions = []; foreach ($dictionnaire as $identifiant => $structures) { if (count($structures) >= 2) { $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $substitutions[$identifiant] = [$sources, $cible]; } } return $substitutions; } /** Enregistrer une substitution automatique (! créer une structure cible si aucune n'existe */ public function enregistrerAutomatiqueAction() { $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::", $structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; $dictionnary = $this->getStructureService()->getSubstitutionDictionnary($identifiant, $type); $sources = $dictionnary["sources"]; $cible = $dictionnary["cible"]; if ($cible != null) { $this->structureService->updateStructureSubstitutions($sources, $cible); } else { /** @var StructureConcreteInterface $cible */ $cible = $this->getStructureService()->createStructureConcrete($type); $cible->getStructure()->setLibelle($sources[0]->getLibelle()); $cible->getStructure()->setSigle($sources[0]->getSigle()); $cible->getStructure()->setCode($sources[0]->getCode()); $this->getStructureService()->createStructureSubstitutions($sources, $cible); } if ($cible != null) $this->structureService->updateStructureSubstitutions($sources, $cible->getStructure()); return new ViewModel(); } Loading @@ -253,40 +210,11 @@ class SubstitutionController extends AbstractController $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $structures = $this->structureService->getStructuresConcretes($type); /** Retrait des structures soient substituées soient substitutantes */ $toRemove = []; /** @var StructureConcreteInterface $structure */ foreach($structures as $structure) { if (count($structure->getStructure()->getStructuresSubstituees()) != 0) { $toRemove[] = $structure->getStructure(); foreach ($structure->getStructure()->getStructuresSubstituees() as $sub) { $toRemove[] = $sub; } $dictionnary = $this->getStructureService()->getSubstitutionDictionnary($identifiant, $type); $sources = $dictionnary["sources"]; $cible = $dictionnary["cible"]; } } /** @var Structure $remove */ foreach($toRemove as $remove) { $structures = array_filter($structures, function (StructureConcreteInterface $structure) use ($remove) { return $structure->getStructure()->getId() !== $remove->getId(); }); } $structures = $this->getStructureService()->getStructuresNonSubstitueesByType($type); $request = $this->getRequest(); if ($request->isPost()) { Loading @@ -295,32 +223,23 @@ class SubstitutionController extends AbstractController foreach ($data['sourceIds'] as $sourceId) { $structure = $this->structureService->findStructureById($sourceId); $structureConcrete = $this->structureService->findStructureConcreteFromStructure($structure); if ($structureConcrete === null) { throw new RuntimeException("Aucune structure concrète cible trouvée avec id=$sourceId."); } $sources[] = $structureConcrete; } if ($cible === null) { /** @var StructureConcreteInterface $cible */ $cible = $this->getStructureService()->createStructureConcrete($type); $this->structureService->updateFromPostData($cible,$data['cible']); $cible->setSourceCode("SyGAL" . "::" . $identifiant); $this->getEntityManager()->persist($cible); $this->getEntityManager()->flush($cible); $cible->getStructure()->setLibelle($sources[0]->getLibelle()); $cible->getStructure()->setSigle($sources[0]->getSigle()); $cible->getStructure()->setCode($sources[0]->getCode()); $this->getStructureService()->createStructureSubstitutions($sources, $cible); } else { $this->structureService->updateFromPostData($cible,$data['cible']); } $this->structureService->updateStructureSubstitutions($sources, $cible->getStructure()); } $message = "La substitution <strong>".$cible->getLibelle()."</strong> vient d'être mise à jour. Elle regroupe les structures : "; $first = true; foreach($sources as $source) { if (!$first) $message .= ", "; $message .= "<i>".$source->getLibelle()."</i>"; $first = false; } $message .= implode(", ", array_map(function(StructureConcreteInterface $s) { return "<i>".$s->getLibelle()."</i>";}, $sources)); $this->flashMessenger()->addSuccessMessage($message); return $this->redirect()->toRoute(null, [],[], true); Loading @@ -328,7 +247,6 @@ class SubstitutionController extends AbstractController if ($cible === null) { $cible = $this->getStructureService()->createStructureConcrete($type); $cible->setSourceCode("SyGAL" . "::" . $identifiant); } $vm = new ViewModel(); Loading @@ -344,31 +262,4 @@ class SubstitutionController extends AbstractController return $vm; } public function afficherAutomatiqueAction() { $type = $this->params()->fromRoute('type'); $identifiant = $this->params()->fromRoute('identifiant'); $structures = $this->getStructureService()->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } return new ViewModel([ 'substituees' => $sources, 'substituante' => $cible, 'type' => $type, 'identifiant' => $identifiant, ]); } } No newline at end of file
module/Application/src/Application/Service/Structure/StructureService.php +76 −0 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 76 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,8 +13,11 @@ use Application\Entity\Db\UniteRecherche; use Application\Entity\Db\Utilisateur; use Application\Filter\EtablissementPrefixFilter; use Application\Service\BaseService; use Application\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Source\SourceService; use Application\Service\Source\SourceServiceAwareTrait; use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\OptimisticLockException; Loading @@ -30,6 +33,9 @@ class StructureService extends BaseService { use SourceServiceAwareTrait; use SynchroServiceAwareTrait; use EcoleDoctoraleServiceAwareTrait; use EtablissementServiceAwareTrait; use UniteRechercheServiceAwareTrait; /** * @return EntityRepository Loading Loading @@ -526,12 +532,15 @@ class StructureService extends BaseService $repo = null; switch($type) { case TypeStructure::CODE_ECOLE_DOCTORALE: case 'ecole-doctorale': $repo = $this->getEntityManager()->getRepository(EcoleDoctorale::class); break; case TypeStructure::CODE_UNITE_RECHERCHE: case 'unite-recherche': $repo = $this->getEntityManager()->getRepository(UniteRecherche::class); break; case TypeStructure::CODE_ETABLISSEMENT: case 'etablissement': $repo = $this->getEntityManager()->getRepository(Etablissement::class); break; } Loading Loading @@ -640,4 +649,71 @@ class StructureService extends BaseService return $result; } // TODO mettre dans le service ... /** Identifie les structures substituables en utilisant le sourceCode */ public function checkStructure($type) { $structures = []; switch($type) { case (TypeStructure::CODE_ECOLE_DOCTORALE): $structures = $this->getEcoleDoctoraleService()->getRepository()->findAll(); break; case (TypeStructure::CODE_ETABLISSEMENT): $structures = $this->getEtablissementService()->getRepository()->findAll(); break; case (TypeStructure::CODE_UNITE_RECHERCHE): $structures = $this->getUniteRechercheService()->getRepository()->findAll(); break; } $dictionnaire = []; foreach ($structures as $structure) { $identifiant = explode("::", $structure->getSourceCode())[1]; $dictionnaire[$identifiant][] = $structure; } $substitutions = []; foreach ($dictionnaire as $identifiant => $structures) { if (count($structures) >= 2) { $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } $substitutions[$identifiant] = [$sources, $cible]; } } return $substitutions; } public function getSubstitutionDictionnary($identifiant, $type) { $structures = $this->getStructuresBySuffixe($identifiant, $type); $sources = []; $cible = null; /** @var StructureConcreteInterface $structure */ foreach ($structures as $structure) { $prefix = explode("::",$structure->getSourceCode())[0]; if ($prefix === "SyGAL" || $prefix === "COMUE") { $cible = $structure; } else { $sources[] = $structure; } } return [ "cible" => $cible, "sources" => $sources ]; } } No newline at end of file
module/Application/src/Application/Service/Structure/StructureServiceFactory.php +12 −0 Changes for module/Application/src/Application/Service/Structure/StructureServiceFactory.php: 12 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,7 +2,10 @@ namespace Application\Service\Structure; use Application\Service\EcoleDoctorale\EcoleDoctoraleService; use Application\Service\Etablissement\EtablissementService; use Application\Service\Source\SourceService; use Application\Service\UniteRecherche\UniteRechercheService; use Import\Service\SynchroService; use Zend\ServiceManager\ServiceLocatorInterface as ContainerInterface; Loading @@ -23,13 +26,22 @@ class StructureServiceFactory /** * @var SourceService $sourceService * @var SynchroService $synchroService * @var EcoleDoctoraleService $ecoleService * @var EtablissementService $etablissementService * @var UniteRechercheService $uniteRechercheService */ $sourceService = $container->get(SourceService::class); $synchroService = $container->get(SynchroService::class); $ecoleService = $container->get(EcoleDoctoraleService::class); $etablissementService = $container->get(EtablissementService::class); $uniteRechercheService = $container->get(UniteRechercheService::class); $service = new StructureService; $service->setSourceService($sourceService); $service->setSynchroService($synchroService); $service->setEcoleDoctoraleService($ecoleService); $service->setEtablissementService($etablissementService); $service->setUniteRechercheService($uniteRechercheService); return $service; } Loading