Commit 3eedcfd9 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Retrait de code mort et changement du code attraper par les substitutions automatiques

parent 68a048ed
Loading
Loading
Loading
Loading
+8 −125
Changes for module/Application/src/Application/Controller/SubstitutionController.php: 8 added lines, 125 removed lines.
Original line number Diff line number Diff line
@@ -25,35 +25,13 @@ class SubstitutionController extends AbstractController
    use UniteRechercheServiceAwareTrait;
    use StructureServiceAwareTrait;

    public function indexAction()
    {
        $structuresSubstituees = $this->structureService->getStructuresSubstituantes();
        $etablissementsSubstitues = [];
        $ecolesSubstituees = [];
        $unitesSubstituees = [];
        foreach($structuresSubstituees as $structureSubstituee) {
            /** @var StructureConcreteInterface $structureConcrete */
            $structureConcrete = $this->structureService->findStructureConcreteFromStructure($structureSubstituee);
            switch(true) {
                case $structureConcrete->getStructure()->getTypeStructure()->isEtablissement() :
                    $etablissementsSubstitues[] = $structureConcrete;
                break;
                case $structureConcrete->getStructure()->getTypeStructure()->isEcoleDoctorale() :
                    $ecolesSubstituees[] = $structureConcrete;
                break;
                case $structureConcrete->getStructure()->getTypeStructure()->isUniteRecherche() :
                    $unitesSubstituees[] = $structureConcrete;
                break;
            }
        }

        return new ViewModel([
              'etablissementsSubstitues' => $etablissementsSubstitues,
              'ecolesSubstituees' => $ecolesSubstituees,
              'unitesSubstituees' => $unitesSubstituees,
        ]);
    /** Affiche l'index générale */
    public function indexAction() {
        /**  l'ajax charge la page */
        return new ViewModel();
    }

    /** Affiche l'index d'un type de structure donnée */
    public function indexStructureAction() {
        $type = $this->params()->fromRoute("type");
        $structures = $this->getStructureService()->getStructuresSubstituantes($type);
@@ -64,8 +42,7 @@ class SubstitutionController extends AbstractController
        ]);
    }

    public function creerAction()
    {
    public function creerAction() {
        $type = $this->params()->fromRoute('type');
        $structures = $this->getStructureService()->getStructuresSubstituableByType($type);

@@ -175,16 +152,12 @@ class SubstitutionController extends AbstractController
        ]);
    }

    public function detruireAction()
    {
    public function detruireAction() {
        $idCible = $this->params()->fromRoute('cible');
        $structure = $this->structureService->findStructureById($idCible);
        $cible = $this->structureService->findStructureConcreteFromStructure($structure);
        $this->structureService->removeSubstitution($cible);

        $message = "La substitution <strong>".$cible->getLibelle()."</strong> vient d'être détruite.";
        $this->flashMessenger()->addSuccessMessage($message);

        return $this->redirect()->toRoute('substitution-index', [],[], true);
    }

@@ -209,96 +182,6 @@ class SubstitutionController extends AbstractController
            'substitutionsEtablissements' => $substitutionsEtablissements,
            'substitutionsUnitesRecherches' => $substitutionsUnitesRecherches,
        ]);

        $substitutions = $this->structureService->getSubstitutions(null);

        foreach($substitutions as $substitution) {
//            var_dump("This subsitution has " . count($substitution) . " elements.");
            $idsSubsitutantes = [];
            /** @var StructureConcreteInterface $element */
            foreach ($substitution as $element) {
//                $id = $element->getId();
//                $type = $element->getStructure()->getTypeStructure();
                $subs = $this->structureService->findStructureSubstituante($element);
                $sid = ($subs) ? $subs->getId() : -1;
                $idsSubsitutantes[$sid][] = $element;
            }
            $keys = array_keys($idsSubsitutantes);
            $first_key = $keys[0];
            $first_elements = $idsSubsitutantes[$first_key];

            /**  ------- CREATION D'UN SUBSTITUTION -------
             * Une seule clé de présente et celle-ci est -1
             */
            if (count($keys) == 1 && $first_key === -1) {
                $elements = $first_elements;
                $data["sigle"] = $elements[0]->getSigle();
                $data["libelle"] = $elements[0]->getLibelle();
                $data["cheminLogo"] = $elements[0]->getCheminLogo();
                if ($elements[0]->getStructure()->getTypeStructure()->isUniteRecherche()) {
                    $data["etablissementsSupport"] = $elements[0]->getEtablissementsSupport();
                    $data["autresEtablissements"] = $elements[0]->getAutresEtablissements();
                }
                if ($elements[0]->getStructure()->getTypeStructure()->isEtablissement()) {
                    $data["code"] = $substitution[0]->getCode() . uniqid();
                    $data["domaine"] = $substitution[0]->getDomaine();
                }

                $structureCibleDataObject = $this->structureService->createStructureConcrete($elements[0]->getStructure()->getTypeStructure()->getCode());
                $this->structureService->updateFromPostData($structureCibleDataObject, $data);
                $this->structureService->createStructureSubstitutions($elements, $structureCibleDataObject);

                $message = "Création de la substitution <strong>".$data["libelle"]."</strong> regroupant les <strong>".count($first_elements)."</strong> structures suivantes&nbsp;: ";
                $first = true;
                foreach ($first_elements as $element) {
                    if (!$first) $message .= ", ";
                    $first = false;
                    $message .= "<i>".$element->getLibelle()."</i>";
                }
                $message .= ".";
                $this->flashMessenger()->addSuccessMessage($message);

            } elseif(count($keys) == 1 || count($keys) == 2 && array_search(-1, $keys) !== false) {
                /** --------- UPDATE D'UNE SUBSTITUTION -------
                 * Deux clefs avec une à -1 ou une clef différente de -1
                 */
                $key = -1;
                foreach ($keys as $key_tmp) {
                    if ($key_tmp !== -1) {
                        $key = $key_tmp;
                        break;
                    }
                }
                $first_element = $idsSubsitutantes[$key][0];

                $elements = [];
                foreach ($idsSubsitutantes as $key => $element) {
                    $elements = array_merge($elements, $element);
                }
                $cible = $this->structureService->findStructureSubstituante($first_element);

                if (count($elements) != count($cible->getStructure()->getStructuresSubstituees())) {

                    $this->structureService->updateStructureSubstitutions($elements, $cible->getStructure());

                    $message = "Mise à jour de la substitution <strong>" . $cible->getLibelle() . "</strong> regroupant maintenant les <strong>" . count($elements) . "</strong> structures suivantes&nbsp;: ";
                    $first = true;
                    foreach ($elements as $element) {
                        if (!$first) $message .= ", ";
                        $first = false;
                        $message .= "<i>" . $element->getLibelle() . "</i>";
                    }
                    $message .= ".";
                    $this->flashMessenger()->addSuccessMessage($message);
                }

            } else {
                return new RuntimeException("Erreur cas de substitution imprévue");
            }
        }

        $this->flashMessenger()->addInfoMessage("Substitution automatique effectuée.");
        $this->redirect()->toRoute("substitution-index");
    }


@@ -331,7 +214,7 @@ class SubstitutionController extends AbstractController

                foreach ($structures as $structure) {
                    $prefix = explode("::",$structure->getSourceCode())[0];
                    if ($prefix === "SyGAL") {
                    if ($prefix === "SyGAL" || $prefix === "COMUE") {
                        $cible = $structure;
                    } else {
                        $sources[] = $structure;
+8 −4
Changes for module/Application/src/Application/Service/Structure/StructureService.php: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ use Application\Service\Source\SourceService;
use Application\Service\Source\SourceServiceAwareTrait;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\OptimisticLockException;
use UnicaenApp\Exception\RuntimeException;
use Webmozart\Assert\Assert;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
@@ -349,7 +350,7 @@ class StructureService extends BaseService
    /**
     * Détruit les substitutions associées à une structure cible dans la table STRUCTURE_SUBSTIT et détruit cette structure cible
     * @param StructureConcreteInterface $cibleConcrete
     * @throws \Doctrine\ORM\OptimisticLockException

     */
    public function removeSubstitution(StructureConcreteInterface $cibleConcrete)
    {
@@ -361,10 +362,13 @@ class StructureService extends BaseService
        foreach($result as $entry) {
            $this->getEntityManager()->remove($entry);
        }
        $this->getEntityManager()->flush($result);

        $this->getEntityManager()->remove($cibleConcrete);
        $this->getEntityManager()->flush($cibleConcrete);

        try {
            $this->getEntityManager()->flush();
        } catch (OptimisticLockException $e) {
            throw new RuntimeException("Problème lors de l'effacement des structures");
        }
    }

    /**