Commit ebcf1314 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Correction Import: recherche de l'établissement par source code (ex:...

Correction Import: recherche de l'établissement par source code (ex: 'COMUE::UCN') car plusieurs établissements peuvent avoir le même code structure ('INSA' par exemple).
parent 9fd6d0d5
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Application/src/Application/Controller/TheseController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ class TheseController extends AbstractController
            'theseListUrl'   => $this->urlFichierThese()->listerFichiers($these, $nature, $version, false, ['inclureValidite' => $inclureValidite]),
            'nature'         => $nature,
            'versionFichier' => $version,
            'etabComue'      => $this->getEtablissementService()->getRepository()->libelle(Etablissement::CODE_COMUE),
            'etabComue'      => $this->getEtablissementService()->getRepository()->libelle(Etablissement::CODE_STRUCTURE_COMUE),
        ]);
        $view->setTemplate('application/these/depot/these');

+1 −1
Changes for module/Application/src/Application/Entity/Db/Etablissement.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf
    use HistoriqueAwareTrait;
    use SourceAwareTrait;

    const CODE_COMUE = 'COMUE';
    const CODE_STRUCTURE_COMUE = Structure::CODE_COMUE;

    protected $id;
    protected $domaine;
+6 −7
Changes for module/Application/src/Application/Entity/Db/Repository/EtablissementRepository.php: 6 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -112,23 +112,22 @@ class EtablissementRepository extends DefaultEntityRepository
    }

    /**
     * Recherche un établissement par son code.
     * Recherche un établissement par son source code.
     *
     * @param string $code Ex: 'UCN'
     * @param string $sourceCode Ex: 'COMUE::UCN'
     * @return Etablissement|null
     */
    public function findOneByCode($code)
    public function findOneBySourceCode($sourceCode)
    {
        $qb = $this->createQueryBuilder('e')
            ->join('e.structure', 's')
            ->where('s.code = :code')
            ->setParameter('code', $code);
            ->where('e.sourceCode = :sourceCode')
            ->setParameter('sourceCode', $sourceCode);

        try {
            /** @var Etablissement $etab */
            $etab = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Plusieurs établissements trouvés avec ce code: " . $code);
            throw new RuntimeException("Plusieurs établissements trouvés avec ce source code: " . $sourceCode);
        }

        return $etab;
+2 −1
Changes for module/Application/src/Application/Entity/Db/Structure.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@

namespace Application\Entity\Db;

use Application\Filter\EtablissementPrefixFilterAwareInterface;
use Application\Filter\EtablissementPrefixFilterAwareTrait;
use Doctrine\Common\Collections\Collection;
use UnicaenApp\Entity\HistoriqueAwareInterface;
@@ -24,6 +23,8 @@ class Structure implements HistoriqueAwareInterface, SourceAwareInterface

    const PATH = "/var/www/sygal/upload";

    const CODE_COMUE = 'COMUE';

    /**
     * @var string $id
     * @var string $sigle
+1 −1
Changes for module/Application/src/Application/Filter/EtablissementPrefixFilter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class EtablissementPrefixFilter implements FilterInterface
    public function addPrefixTo($value, $prefix = null)
    {
        if ($prefix === null) {
            $prefix = Etablissement::CODE_COMUE;
            $prefix = Etablissement::CODE_STRUCTURE_COMUE;
        }

        return $prefix . self::ETAB_PREFIX_SEP . $value;
Loading