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

Nettoyage de service

parent 401ca129
Loading
Loading
Loading
Loading
+1
Changes for module/Application/src/Application/Entity/Db/NatureFichier.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ class NatureFichier
    const LABEL_DELEGUATION_SIGNATURE = "Formulaire de délégation de signature du rapport de soutenance (visioconférence)";
    const LABEL_LANGUE_ANGLAISE = "Formulaire d'utilisation de la langue anglaise";
    const LABEL_DEMANDE_LABEL = "Formulaire de demande de label européen";
    const LABEL_DEMANDE_CONFIDENT = "Formulaire de demande de confidentialité";

    /**
     * @var string
+6 −6
Changes for module/Soutenance/src/Soutenance/Controller/EngagementImpartialite/EngagementImpartialiteController.php: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ class EngagementImpartialiteController extends AbstractController
        $membre = $this->getMembreService()->getRequestedMembre($this);

        /** @var Validation $validation */
        $validation = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($membre);
        if ($validation === null) $validation = $this->getEngagementImpartialiteService()->getRefusEngagementImpartialiteByMembre($membre);
        $validation = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($these, $membre);
        if ($validation === null) $validation = $this->getEngagementImpartialiteService()->getRefusEngagementImpartialiteByMembre($these, $membre);

        return new ViewModel([
            'these' => $these,
@@ -64,7 +64,7 @@ class EngagementImpartialiteController extends AbstractController
        /** @var Membre $membre */
        foreach ($proposition->getMembres() as $membre) {
            if ($membre->getActeur() AND $membre->estRapporteur()) {
                $validation = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($membre);
                $validation = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($these, $membre);
                if (!$validation) $this->getNotifierSoutenanceService()->triggerDemandeSignatureEngagementImpartialite($these, $proposition, $membre);
            }
        }
@@ -91,7 +91,7 @@ class EngagementImpartialiteController extends AbstractController
        $proposition = $this->getPropositionService()->findByThese($these);
        $membre = $this->getMembreService()->getRequestedMembre($this);

        $this->getEngagementImpartialiteService()->createEngagementImpartialite($membre);
        $this->getEngagementImpartialiteService()->create($membre, $these);
        $this->getNotifierSoutenanceService()->triggerSignatureEngagementImpartialite($these, $proposition, $membre);
        $this->getNotifierSoutenanceService()->triggerDemandeAvisSoutenance($these, $proposition, $membre);

@@ -104,7 +104,7 @@ class EngagementImpartialiteController extends AbstractController
        $proposition = $this->getPropositionService()->findByThese($these);
        $membre = $this->getMembreService()->getRequestedMembre($this);

        $this->getEngagementImpartialiteService()->createRefusEngagementImpartialite($membre);
        $this->getEngagementImpartialiteService()->createRefus($membre, $these);
        $this->getPropositionService()->annulerValidations($proposition);
        $this->getNotifierSoutenanceService()->triggerRefusEngagementImpartialite($these, $proposition, $membre);

@@ -119,7 +119,7 @@ class EngagementImpartialiteController extends AbstractController
        $membre = $this->getMembreService()->getRequestedMembre($this);

        /** @var Validation[] $validations */
        $this->getEngagementImpartialiteService()->deleteEngagementImpartialite($membre);
        $this->getEngagementImpartialiteService()->delete($membre);
        $this->getNotifierSoutenanceService()->triggerAnnulationEngagementImpartialite($these, $proposition, $membre);

        $this->redirect()->toRoute('soutenance/presoutenance', ['these' => $these->getId()], [], true);
+1 −1
Changes for module/Soutenance/src/Soutenance/Controller/Index/IndexController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ class IndexController extends AbstractController {
                }
            }

            $engagement = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($membre);
            $engagement = $this->getEngagementImpartialiteService()->getEngagementImpartialiteByMembre($these, $membre);
            $avis = $this->getAvisService()->getAvisByMembre($membre);

            return new ViewModel([
+7 −7
Changes for module/Soutenance/src/Soutenance/Service/Avis/AvisService.php: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class AvisService {
     * @param Avis $avis
     * @return Avis
     */
    public function create($avis)
    public function create(Avis $avis)
    {
        /** @var Utilisateur $user */
        $user = $this->userContextService->getIdentityDb();
@@ -54,7 +54,7 @@ class AvisService {
     * @param Avis $avis
     * @return Avis
     */
    public function update($avis)
    public function update(Avis $avis)
    {
        /** @var Utilisateur $user */
        $user = $this->userContextService->getIdentityDb();
@@ -79,7 +79,7 @@ class AvisService {
    /**
     * @param Avis $avis
     */
    public function delete($avis)
    public function delete(Avis $avis)
    {
        $this->getEntityManager()->remove($avis);
        try {
@@ -93,7 +93,7 @@ class AvisService {
     * @param Avis $avis
     * @return Avis
     */
    public function historiser($avis)
    public function historiser(Avis $avis)
    {
        /** @var Utilisateur $user */
        $user = $this->userContextService->getIdentityDb();
@@ -158,10 +158,10 @@ class AvisService {
    }

    /**
     * @param These these
     * @param These $these
     * @return Avis[]
     */
    public function getAvisByThese($these)
    public function getAvisByThese(These $these)
    {
        $qb =$this->createQueryBuilder()
            ->andWhere('1 = pasHistorise(avis)')
@@ -182,7 +182,7 @@ class AvisService {
     * @param Membre $membre
     * @return Avis
     */
    public function getAvisByMembre($membre)
    public function getAvisByMembre(Membre $membre)
    {
        if ($membre === null OR $membre->getActeur() === null) return null;
        $qb = $this->createQueryBuilder()
+61 −57
Changes for module/Soutenance/src/Soutenance/Service/EngagementImpartialite/EngagementImpartialiteService.php: 61 added lines, 57 removed lines.
Original line number Diff line number Diff line
@@ -2,56 +2,40 @@

namespace Soutenance\Service\EngagementImpartialite;

use Application\Entity\Db\Individu;
use Application\Entity\Db\These;
use Application\Entity\Db\TypeValidation;
use Application\Entity\Db\Validation;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\QueryBuilder;
use Soutenance\Entity\Membre;
use Soutenance\Service\Validation\ValidatationServiceAwareTrait;
use UnicaenApp\Exception\RuntimeException;

class EngagementImpartialiteService {
    use ValidatationServiceAwareTrait;

    /** GESTION DES ENTITES *******************************************************************************************/

    /**
     * @param Membre $membre
     * @param These $these
     * @return Validation[] ==> clef: id de l'individu ayant fait la validation <==
     * @return Validation
     */
    public function getEngagmentsImpartialiteByThese($these)
    public function create(Membre $membre, These $these)
    {
        $validations = $this->getValidationService()->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $these);
        $engagements = [];
        foreach ($validations as $validation) {
            $engagements[$validation->getIndividu()->getId()] = $validation;
        }
        return $engagements;
        $validation = $this->getValidationService()->create(TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $these, $membre->getIndividu());
        return $validation;
    }

    /**
     * @param Membre $membre
     * @param These $these
     * @return Validation
     */
    public function getEngagementImpartialiteByMembre($membre)
    public function createRefus(Membre $membre, These $these)
    {
        if ($membre === null OR $membre->getActeur() === null) return null;
        $individu = $membre->getIndividu();
        $these = $membre->getActeur()->getThese();

        $qb = $this->getValidationService()->getEntityManager()->getRepository(Validation::class)->createQueryBuilder('validation')
            ->addSelect('type')->join('validation.typeValidation', 'type')
            ->andWhere('type.code = :codeEngagement')
            ->andWhere('validation.these = :these')
            ->andWhere('validation.individu = :individu')
            ->andWhere('1 = pasHistorise(validation)')
            ->setParameter('codeEngagement', TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE)
            ->setParameter('these', $these)
            ->setParameter('individu', $individu)
            ;

        try {
            $validation = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Plusieurs engagements d'impartialité ont été signé par le membre [".$individu->__toString()."].", $e);
        }
        $validation = $this->getValidationService()->create(TypeValidation::CODE_REFUS_ENGAGEMENT_IMPARTIALITE, $these, $membre->getIndividu());
        return $validation;
    }

@@ -59,68 +43,88 @@ class EngagementImpartialiteService {
     * @param Membre $membre
     * @return Validation
     */
    public function getRefusEngagementImpartialiteByMembre($membre)
    public function delete(Membre $membre)
    {
        $individu = $membre->getIndividu();
        $these = $membre->getActeur()->getThese();
        $these = $membre->getProposition()->getThese();
        $validation = $this->getEngagementImpartialiteByMembre($these, $membre);
        $validation = $this->getValidationService()->historiser($validation);
        return $validation;
    }

    /** REQUETE *******************************************************************************************************/

    /**
     * @param These $these
     * @param Individu $individu
     * @param $type
     * @return QueryBuilder
     */
    public function createQueryBuilder(These $these, Individu $individu, $type)
    {
        $qb = $this->getValidationService()->getEntityManager()->getRepository(Validation::class)->createQueryBuilder('validation')
            ->addSelect('type')->join('validation.typeValidation', 'type')
            ->andWhere('1 = pasHistorise(validation)')
            ->andWhere('type.code = :codeEngagement')
            ->andWhere('validation.these = :these')
            ->andWhere('validation.individu = :individu')
            ->andWhere('1 = pasHistorise(validation)')
            ->setParameter('codeEngagement', TypeValidation::CODE_REFUS_ENGAGEMENT_IMPARTIALITE)
            ->setParameter('codeEngagement', $type)
            ->setParameter('these', $these)
            ->setParameter('individu', $individu)
            ;

        try {
            $validation = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Plusieurs refus engagements d'impartialité ont été signé par le membre [".$individu->__toString()."].", $e);
        }
        return $validation;
        return $qb;
    }

    /**
     * @param Membre $membre
     * @return Validation
     * @param These $these
     * @return Validation[] ==> clef: id de l'individu ayant validé <==
     */
    public function createEngagementImpartialite($membre)
    public function getEngagmentsImpartialiteByThese(These $these)
    {
        $individu = $membre->getIndividu();
        $these = $membre->getActeur()->getThese();

        $validation = $this->getValidationService()->create(TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $these, $individu);

        return $validation;
        $validations = $this->getValidationService()->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE, $these);
        $engagements = [];
        foreach ($validations as $validation) {
            $engagements[$validation->getIndividu()->getId()] = $validation;
        }
        return $engagements;
    }

    /**
     * @param These $these
     * @param Membre $membre
     * @return Validation
     */
    public function createRefusEngagementImpartialite($membre)
    public function getEngagementImpartialiteByMembre(These $these, Membre $membre)
    {
        if ($membre === null OR $membre->getActeur() === null) return null;
        $individu = $membre->getIndividu();
        $these = $membre->getActeur()->getThese();

        $validation = $this->getValidationService()->create(TypeValidation::CODE_REFUS_ENGAGEMENT_IMPARTIALITE, $these, $individu);
        $qb = $this->createQueryBuilder($these, $individu, TypeValidation::CODE_ENGAGEMENT_IMPARTIALITE);

        try {
            $validation = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Plusieurs engagements d'impartialité ont été signé par le membre [".$individu->__toString()."].", $e);
        }
        return $validation;
    }

    /**
     * @param These $these
     * @param Membre $membre
     * @return Validation
     */
    public function deleteEngagementImpartialite($membre)
    public function getRefusEngagementImpartialiteByMembre(These $these, Membre $membre)
    {
        $validation = $this->getEngagementImpartialiteByMembre($membre);
        $validation = $this->getValidationService()->historiser($validation);
        $individu = $membre->getIndividu();
        $qb = $this->createQueryBuilder($these, $individu, TypeValidation::CODE_REFUS_ENGAGEMENT_IMPARTIALITE);

        try {
            $validation = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Plusieurs refus engagements d'impartialité ont été signé par le membre [".$individu->__toString()."].", $e);
        }
        return $validation;
    }



}
 No newline at end of file
Loading