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

Repository ED/UR : suppression méthode find() inutile et violant la mère ;...

Repository ED/UR : suppression méthode find() inutile et violant la mère ; suppression argument inutilisé.
parent 119ad29f
Loading
Loading
Loading
Loading
Loading
+2 −2
Changes for module/Application/src/Application/Controller/StatistiqueController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ class StatistiqueController extends AbstractController
        if ($type !== null && $id !== null) {
            switch($type) {
                case "ED" :
                    $ecole = $this->getEcoleDoctoraleService()->getRepository()->find($id);
                    $ecole = $this->getEcoleDoctoraleService()->getRepository()->findOneBy(['id'=>$id]);
                    return  $qb->andWhere("t.ecoleDoctorale = :ed")
                                ->setParameter(":ed", $ecole);
                case "UR" :
                    $unite = $this->getUniteRechercheService()->getRepository()->find($id);
                    $unite = $this->getUniteRechercheService()->getRepository()->findOneBy(['id'=>$id]);
                    return $qb->andWhere("t.uniteRecherche = :ur")
                                ->setParameter(":ur", $unite);
                case "Etab" :
+1 −23
Changes for module/Application/src/Application/Entity/Db/Repository/EcoleDoctoraleRepository.php: 1 added line, 23 removed lines.
Original line number Diff line number Diff line
@@ -2,20 +2,16 @@

namespace Application\Entity\Db\Repository;


use Application\Entity\Db\EcoleDoctorale;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\Query\Expr\Join;
use UnicaenApp\Exception\RuntimeException;
use UnicaenImport\Entity\Db\Source;

class EcoleDoctoraleRepository extends DefaultEntityRepository
{
    /**
     * @param Source|null $source
     * @return EcoleDoctorale[]
     */
    public function findAll(Source $source = null)
    public function findAll()
    {
        $qb = $this->createQueryBuilder("ed");
        $qb
@@ -25,29 +21,11 @@ class EcoleDoctoraleRepository extends DefaultEntityRepository
            ->addSelect("str, sub, typ")
            ->orderBy("str.libelle");

        if ($source !== null) {
            $qb
                ->join('ed.source', 'src', Join::WITH, 'src = :source')
                ->setParameter('source', $source);
        }

        $ecoles = $qb->getQuery()->getResult();

        return $ecoles;
    }

    /**
     * @param int $id
     * @return null|EcoleDoctorale
     */
    public function find($id)
    {
        /** @var EcoleDoctorale $ecole */
        $ecole = $this->findOneBy(["id" => $id]);

        return $ecole;
    }

    public function findByStructureId($id)
    {
        /** @var EcoleDoctorale $ecole */
+1 −25
Changes for module/Application/src/Application/Entity/Db/Repository/UniteRechercheRepository.php: 1 added line, 25 removed lines.
Original line number Diff line number Diff line
@@ -4,18 +4,15 @@ namespace Application\Entity\Db\Repository;

use Application\Entity\Db\UniteRecherche;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\Query\Expr\Join;
use UnicaenApp\Exception\RuntimeException;
use UnicaenImport\Entity\Db\Source;

class UniteRechercheRepository extends DefaultEntityRepository
{

    /**
     * @param Source|null $source
     * @return UniteRecherche[]
     */
    public function findAll(Source $source = null)
    public function findAll()
    {
        /** @var UniteRecherche[] $unites */
        $qb = $this->getEntityManager()->getRepository(UniteRecherche::class)->createQueryBuilder("ur");
@@ -26,32 +23,11 @@ class UniteRechercheRepository extends DefaultEntityRepository
            ->addSelect("str, sub, typ")
            ->orderBy("str.libelle");

        if ($source !== null) {
            $qb
                ->join('ur.source', 'src', Join::WITH, 'src = :source')
                ->setParameter('source', $source);
        }

        $unites = $qb->getQuery()->getResult();

        return $unites;
    }

    /**
     * @param int $id
     * @param null $lockMode
     * @param null $lockVersion
     * @return null|UniteRecherche
     */
    public function find($id, $lockMode = null, $lockVersion = null)
    {
        /** @var UniteRecherche $unite */
        $unite = $this->findOneBy(["id" => $id]);

        return $unite;
    }


    public function findByStructureId($id)
    {
        /** @var UniteRecherche $unite */
+1 −1
Changes for module/Application/src/Application/Service/EcoleDoctorale/EcoleDoctoraleService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class EcoleDoctoraleService extends BaseService implements RoleServiceAwareInter
     */
    public function getIndividuByEcoleDoctoraleId($id)
    {
        $ecole = $this->getRepository()->find($id);
        $ecole = $this->getRepository()->findOneBy(['id'=>$id]);
        $individus = $this->roleService->getIndividuByStructure($ecole->getStructure());

        return $individus;
+1 −1
Changes for module/Application/src/Application/Service/UniteRecherche/UniteRechercheService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class UniteRechercheService extends BaseService implements RoleServiceAwareInter
     */
    public function getIndividuByUniteRechercheId($id)
    {
        $unite = $this->getRepository()->find($id);
        $unite = $this->getRepository()->findOneBy(['id'=>$id]);
        $individus = $this->roleService->getIndividuByStructure($unite->getStructure());

        return $individus;