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

Suppression de l'entity RolePrivilegeModele remplacée par un mapping many-to-many

parent 22167f4f
Loading
Loading
Loading
Loading
+0 −20
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.RolePrivilegeModele.dcm.xml: 0 added lines, 20 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Application\Entity\Db\RolePrivilegeModele" table="ROLE_PRIVILEGE_MODELE">
            <!--repository-class="Application\Entity\Db\Repository\RoleRepository">-->
        <id name="roleCode"  association-key="true"/>
        <id name="privilege" association-key="true" />


        <field  name="roleCode" type="string" column="ROLE_CODE" length="100"/>

        <many-to-one field="privilege" target-entity="Application\Entity\Db\Privilege">
            <join-columns>
                <join-column name="PRIVILEGE_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>

    </entity>
</doctrine-mapping>
+0 −28
Changes for module/Application/src/Application/Entity/Db/RolePrivilegeModele.php: 0 added lines, 28 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

class RolePrivilegeModele
{
    /** @var string $role */
    protected $roleCode;
    /** @var Privilege $privilege */
    protected $privilege;

    /**
     * @return string
     */
    public function getRoleCode()
    {
        return $this->roleCode;
    }

    /**
     * @return Privilege
     */
    public function getPrivilege()
    {
        return $this->privilege;
    }

}
 No newline at end of file
+38 −11
Changes for module/Application/src/Application/Service/Role/RoleService.php: 38 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ use Application\Entity\Db\EcoleDoctorale;
use Application\Entity\Db\Etablissement;
use Application\Entity\Db\Individu;
use Application\Entity\Db\IndividuRole;
use Application\Entity\Db\Privilege;
use Application\Entity\Db\Repository\RoleRepository;
use Application\Entity\Db\Role;
use Application\Entity\Db\RoleModele;
use Application\Entity\Db\RolePrivilegeModele;
use Application\Entity\Db\Source;
use Application\Entity\Db\Structure;
use Application\Entity\Db\TypeStructure;
@@ -18,7 +18,10 @@ use Application\Entity\Db\Utilisateur;
use Application\Filter\EtablissementPrefixFilter;
use Application\Filter\EtablissementPrefixFilterAwareTrait;
use Application\Service\BaseService;
use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\Query\Expr\Join;
use UnicaenLeocarte\Exception\RuntimeException;

/**
 * Class RoleService
@@ -110,7 +113,11 @@ class RoleService extends BaseService
        $ur->setIndividu($individu);
        $ur->setRole($role);
        $this->getEntityManager()->persist($ur);
        try {
            $this->getEntityManager()->flush($ur);
        } catch (OptimisticLockException $e) {
            throw new RuntimeException("Un problème est survenu.",$e);
        }
        return $ur;
    }

@@ -178,7 +185,7 @@ class RoleService extends BaseService
                $roleId = $roleModele->getLibelle()." ". $structure->getSourceCode();
            }

            //creation du role
            /** @var Role $role */
            $role = $this->createRole();
            $role->setCode($roleModele->getRoleCode());
            $role->setLibelle($roleModele->getLibelle());
@@ -188,13 +195,8 @@ class RoleService extends BaseService
            $role->setStructure($structure->getStructure());
            $this->entityManager->flush($role);

            //affectation du modèle de privilège
            /** @var RolePrivilegeModele[] $privileges */
            $qbs = $this->entityManager->getRepository(RolePrivilegeModele::class)->createQueryBuilder("rpm")
                ->andWhere("rpm.roleCode = :roleCode")->setParameter("roleCode", $roleModele->getRoleCode());
            $privileges = $qbs->getQuery()->execute();
            foreach ($privileges as $privilegeModele) {
                $privilege = $privilegeModele->getPrivilege();
            /** @var Privilege $privilege */
            foreach ($roleModele->getPrivileges() as $privilege) {
                $privilege->addRole($role);
                $this->entityManager->flush($privilege);
            }
@@ -219,13 +221,22 @@ class RoleService extends BaseService
        $role->setAttributionAutomatique(false);
        $role->setTheseDependant(false);
        $role->setHistoCreateur($userSygal);
        $role->setHistoCreation(new \DateTime());
        try {
            $date = new \DateTime();
        } catch (\Exception $e) {
            throw new RuntimeException("Un problème est survenu.",$e);
        }
        $role->setHistoCreation($date);
        $role->setHistoModificateur($userSygal);
        $role->setHistoModification(new \DateTime());
        $role->setHistoModification($date);
        $role->setOrdreAffichage("zzz");

        $this->getEntityManager()->persist($role);
        try {
            $this->getEntityManager()->flush($role);
        } catch (OptimisticLockException $e) {
            throw new RuntimeException("Un problème est survenu.",$e);
        }
        return $role;
    }

@@ -238,15 +249,27 @@ class RoleService extends BaseService
            ->andWhere("r.id = :roleId")
            ->setParameter("individuId", $individuId)
            ->setParameter("roleId", $roleId);
        try {
            $result = $qb->getQuery()->getOneOrNullResult();
        } catch (NonUniqueResultException $e) {
            throw new RuntimeException("Un problème est survenu.",$e);
        }
        if ($result !== null) {
            $this->getEntityManager()->remove($result);
            try {
                $this->getEntityManager()->flush($result);
            } catch (OptimisticLockException $e) {
                throw new RuntimeException("Un problème est survenu.",$e);
            }
        }
    }

    public function addRole($individuId, $roleId)
    {
        /**
         * @var Individu $individu
         * @var Role $role
         */
        $individu = $this->getEntityManager()->getRepository(Individu::class)->findOneBy(["id"=>$individuId]);
        $role = $this->getEntityManager()->getRepository(Role::class)->findOneBy(["id"=>$roleId]);

@@ -255,7 +278,11 @@ class RoleService extends BaseService
        $ir->setRole($role);

        $this->getEntityManager()->persist($ir);
        try {
            $this->getEntityManager()->flush($ir);
        } catch (OptimisticLockException $e) {
            throw new RuntimeException("Un problème est survenu.",$e);
        }
    }

    public function getRoles()