#1344

* Refactoring des entités liées à la gestion des rôles (renommages massifs par soucis de cohérence et de non-confusion)
* Mise en place du PrivilegeController en tant que Guard pour exploiter les privilèges au lieu des rôles

data/Sql/Rôles.sql

 -- liste des comptes utilisateurs
 select
-  tr.code type_role,
+  tr.code role,
   s.libelle_court structure,
   p.nom_usuel nom,
   p.prenom prenom,
@@ -8,16 +8,16 @@ select
   r.id,
   r.source_code
 from
-  role r
+  affectation r
   JOIN personnel p ON p.id = r.personnel_id AND p.histo_destruction IS NULL
-  JOIN type_role tr ON tr.id = r.type_id AND tr.histo_destruction IS NULL
+  JOIN role tr ON tr.id = r.role_id AND tr.histo_destruction IS NULL
   JOIN source src ON src.id = r.source_id
   LEFT JOIN structure s ON s.id = r.structure_id AND s.histo_destruction IS NULL
 WHERE
   r.histo_destruction IS NULL
   --AND r.source_id = OSE_IMPORT.GET_SOURCE_ID('OSE')
 ORDER BY
-  structure, nom, source, type_role;
+  structure, nom, source, role;
 
 -- pour créer un nouveau rôle
 
@@ -33,7 +33,7 @@ select id, libelle_court, libelle_long, source_code from structure where libelle
 
 select * from type_role where histo_destruction is null;
 
-INSERT INTO ROLE (
+INSERT INTO affectation (
     STRUCTURE_ID,
     PERSONNEL_ID,
     TYPE_ID,
@@ -43,9 +43,9 @@ INSERT INTO ROLE (
 )VALUES(
     null,--(SELECT ID FROM structure WHERE source_code = 'U01'),
     (SELECT ID FROM personnel WHERE source_code ='102416'),
-    (SELECT ID FROM TYPE_ROLE WHERE code = 'administrateur'),
+    (SELECT ID FROM ROLE WHERE code = 'administrateur'),
     'administrateur-102416',
-    ROLE_ID_SEQ.NEXTVAL, OSE_IMPORT.GET_SOURCE_ID('OSE'), 
+    affectation_ID_SEQ.NEXTVAL, OSE_IMPORT.GET_SOURCE_ID('OSE'), 
     (select id from utilisateur where username='lecluse'), (select id from utilisateur where username='lecluse') -- laurent
 );
 
@@ -103,37 +103,14 @@ select * from individu_fonct_struct@harpprod ifs where no_dossier_pers = 16956;
 
 select * from individu@harpprod where nom_usuel = 'DENOYES';
 
-/*
-INSERT
-INTO PERSONNEL
-  (
-    ID,
-    CIVILITE_ID,
-    NOM_USUEL,
-    PRENOM,
-    NOM_PATRONYMIQUE,
-    EMAIL,
-    STRUCTURE_ID,
-    SOURCE_ID,
-    SOURCE_CODE,
-    VALIDITE_DEBUT,
-    HISTO_CREATION,
-    HISTO_CREATEUR_ID,
-    HISTO_MODIFICATION,
-    HISTO_MODIFICATEUR_ID
-  )
-  VALUES
-  (
-    PERSONNEL_id_seq.nextval,
-    (select id from civilite where libelle_court = 'Mme'),
-    'DOLLEY',
-    'Coralie',
-    'DOLLEY',
-    'coralie.dolley@unicaen.fr',
-    (select id from structure where libelle_court like '%DRH%' AND niveau = 2),
-    (select id from source where code = 'Harpege'),
-    '102416',
-    sysdate,
-    sysdate,4,sysdate,4
-  );
-*/
\ No newline at end of file
+
+
+select
+r.code ressource,
+p.code privilege,
+p.id   p_id
+from
+  privilege p
+  join ressource r on r.id = p.ressource_id
+order by
+  ressource, privilege
\ No newline at end of file

module/Application/config/gestion.config.php

@@ -60,11 +60,13 @@ return [
                     'action'     => ['gestion'],
                     'roles'      => [R_COMPOSANTE, R_ADMINISTRATEUR],
                 ],
+            ],
+            'Application\Guard\PrivilegeController' => [
                 [
                     'controller' => 'Application\Controller\Gestion',
                     'action'     => ['droits'],
-                    'roles'      => [R_COMPOSANTE, R_ADMINISTRATEUR],
-                ],
+                    'privileges' => ['privilege-visualisation', 'privilege-edition']
+                ]
             ],
         ],
     ],

module/Application/config/module.config.php

@@ -179,9 +179,6 @@ $main =  [
                     'Application\\Acl\\IntervenantPermanentRole',
             ],
         ],
-        'guards' => [
-            'Application\Guard\ControllerGuard' => [],
-        ],
     ],
     'service_manager' => [
         'invokables' => [
@@ -194,8 +191,9 @@ $main =  [
             'ApplicationUtilisateur'                         => 'Application\\Service\\Utilisateur',
             'ApplicationTypeIntervention'                    => 'Application\\Service\\TypeIntervention',
             'ApplicationSource'                              => 'Application\\Service\\Source',
+            'ApplicationAffectation'                         => 'Application\\Service\\Affectation',
             'ApplicationRole'                                => 'Application\\Service\\Role',
-            'ApplicationTypeRole'                            => 'Application\\Service\\TypeRole',
+            'ApplicationPrivilege'                           => 'Application\\Service\\Privilege',
             'IntervenantNavigationPageVisibility'            => 'Application\\Service\\IntervenantNavigationPageVisibility',
             'ApplicationRuleProvider'                        => 'Application\Provider\Rule\RuleProvider',
         ],

module/Application/src/Application/Acl/Role.php

@@ -3,7 +3,7 @@
 namespace Application\Acl;
 
 use UnicaenAuth\Acl\NamedRole;
-use Application\Entity\Db\TypeRole;
+use Application\Entity\Db\Role as DbRole;
 use Zend\Permissions\Acl\Resource;
 use Application\Entity\Db\Privilege;
 
@@ -18,11 +18,11 @@ class Role extends NamedRole
     const ROLE_ID = 'role';
 
     /**
-     * Type de rôle
+     * Rôle en BDD
      *
-     * @var TypeRole
+     * @var DbRole
      */
-    protected $typeRole;
+    protected $dbRole;
 
 
 
@@ -33,16 +33,16 @@ class Role extends NamedRole
 
     /**
      *
-     * @return TypeRole
+     * @return RoleEntity
      */
-    function getTypeRole()
+    function getDbRole()
     {
-        return $this->typeRole;
+        return $this->role;
     }
 
-    function setTypeRole(TypeRole $typeRole)
+    function setDbRole(DbRole $dbRole)
     {
-        $this->typeRole = $typeRole;
+        $this->dbRole = $dbRole;
         return $this;
     }
 

module/Application/src/Application/Entity/Db/Affectation.php

+<?php
+
+namespace Application\Entity\Db;
+
+/**
+ * Affectation
+ */
+class Affectation implements HistoriqueAwareInterface
+{
+    /**
+     * @var \DateTime
+     */
+    protected $histoCreation;
+
+    /**
+     * @var \DateTime
+     */
+    protected $histoDestruction;
+
+    /**
+     * @var \DateTime
+     */
+    protected $histoModification;
+
+    /**
+     * @var string
+     */
+    protected $sourceCode;
+
+    /**
+     * @var integer
+     */
+    protected $id;
+
+    /**
+     * @var \Application\Entity\Db\Structure
+     */
+    protected $structure;
+
+    /**
+     * @var \Application\Entity\Db\Role
+     */
+    protected $role;
+
+    /**
+     * @var \Application\Entity\Db\Source
+     */
+    protected $source;
+
+    /**
+     * @var \Application\Entity\Db\Personnel
+     */
+    protected $personnel;
+
+    /**
+     * @var \Application\Entity\Db\Utilisateur
+     */
+    protected $histoDestructeur;
+
+    /**
+     * @var \Application\Entity\Db\Utilisateur
+     */
+    protected $histoModificateur;
+
+    /**
+     * @var \Application\Entity\Db\Utilisateur
+     */
+    protected $histoCreateur;
+
+
+    /**
+     * Set histoCreation
+     *
+     * @param \DateTime $histoCreation
+     * @return Affectation
+     */
+    public function setHistoCreation($histoCreation)
+    {
+        $this->histoCreation = $histoCreation;
+
+        return $this;
+    }
+
+    /**
+     * Get histoCreation
+     *
+     * @return \DateTime 
+     */
+    public function getHistoCreation()
+    {
+        return $this->histoCreation;
+    }
+
+    /**
+     * Set histoDestruction
+     *
+     * @param \DateTime $histoDestruction
+     * @return Affectation
+     */
+    public function setHistoDestruction($histoDestruction)
+    {
+        $this->histoDestruction = $histoDestruction;
+
+        return $this;
+    }
+
+    /**
+     * Get histoDestruction
+     *
+     * @return \DateTime 
+     */
+    public function getHistoDestruction()
+    {
+        return $this->histoDestruction;
+    }
+
+    /**
+     * Set histoModification
+     *
+     * @param \DateTime $histoModification
+     * @return Affectation
+     */
+    public function setHistoModification($histoModification)
+    {
+        $this->histoModification = $histoModification;
+
+        return $this;
+    }
+
+    /**
+     * Get histoModification
+     *
+     * @return \DateTime 
+     */
+    public function getHistoModification()
+    {
+        return $this->histoModification;
+    }
+
+    /**
+     * Set sourceCode
+     *
+     * @param string $sourceCode
+     * @return Affectation
+     */
+    public function setSourceCode($sourceCode)
+    {
+        $this->sourceCode = $sourceCode;
+
+        return $this;
+    }
+
+    /**
+     * Get sourceCode
+     *
+     * @return string 
+     */
+    public function getSourceCode()
+    {
+        return $this->sourceCode;
+    }
+
+    /**
+     * Get id
+     *
+     * @return integer 
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set structure
+     *
+     * @param \Application\Entity\Db\Structure $structure
+     * @return Affectation
+     */
+    public function setStructure(\Application\Entity\Db\Structure $structure = null)
+    {
+        $this->structure = $structure;
+
+        return $this;
+    }
+
+    /**
+     * Get structure
+     *
+     * @return \Application\Entity\Db\Structure 
+     */
+    public function getStructure()
+    {
+        return $this->structure;
+    }
+
+    /**
+     * Set role
+     *
+     * @param \Application\Entity\Db\Role $role
+     * @return Affectation
+     */
+    public function setRole(\Application\Entity\Db\Role $role = null)
+    {
+        $this->role = $role;
+
+        return $this;
+    }
+
+    /**
+     * Get role
+     *
+     * @return \Application\Entity\Db\Role 
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * Set source
+     *
+     * @param \Application\Entity\Db\Source $source
+     * @return Affectation
+     */
+    public function setSource(\Application\Entity\Db\Source $source = null)
+    {
+        $this->source = $source;
+
+        return $this;
+    }
+
+    /**
+     * Get source
+     *
+     * @return \Application\Entity\Db\Source 
+     */
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    /**
+     * Set personnel
+     *
+     * @param \Application\Entity\Db\Personnel $personnel
+     * @return Affectation
+     */
+    public function setPersonnel(\Application\Entity\Db\Personnel $personnel = null)
+    {
+        $this->personnel = $personnel;
+
+        return $this;
+    }
+
+    /**
+     * Get personnel
+     *
+     * @return \Application\Entity\Db\Personnel 
+     */
+    public function getPersonnel()
+    {
+        return $this->personnel;
+    }
+
+    /**
+     * Set histoDestructeur
+     *
+     * @param \Application\Entity\Db\Utilisateur $histoDestructeur
+     * @return Affectation
+     */
+    public function setHistoDestructeur(\Application\Entity\Db\Utilisateur $histoDestructeur = null)
+    {
+        $this->histoDestructeur = $histoDestructeur;
+
+        return $this;
+    }
+
+    /**
+     * Get histoDestructeur
+     *
+     * @return \Application\Entity\Db\Utilisateur 
+     */
+    public function getHistoDestructeur()
+    {
+        return $this->histoDestructeur;
+    }
+
+    /**
+     * Set histoModificateur
+     *
+     * @param \Application\Entity\Db\Utilisateur $histoModificateur
+     * @return Affectation
+     */
+    public function setHistoModificateur(\Application\Entity\Db\Utilisateur $histoModificateur = null)
+    {
+        $this->histoModificateur = $histoModificateur;
+
+        return $this;
+    }
+
+    /**
+     * Get histoModificateur
+     *
+     * @return \Application\Entity\Db\Utilisateur 
+     */
+    public function getHistoModificateur()
+    {
+        return $this->histoModificateur;
+    }
+
+    /**
+     * Set histoCreateur
+     *
+     * @param \Application\Entity\Db\Utilisateur $histoCreateur
+     * @return Affectation
+     */
+    public function setHistoCreateur(\Application\Entity\Db\Utilisateur $histoCreateur = null)
+    {
+        $this->histoCreateur = $histoCreateur;
+
+        return $this;
+    }
+
+    /**
+     * Get histoCreateur
+     *
+     * @return \Application\Entity\Db\Utilisateur 
+     */
+    public function getHistoCreateur()
+    {
+        return $this->histoCreateur;
+    }
+}

module/Application/src/Application/Entity/Db/Ressource.php → module/Application/src/Application/Entity/Db/CategoriePrivilege.php

@@ -7,7 +7,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Ressource
  */
-class Ressource
+class CategoriePrivilege
 {
     /**
      * @var string
@@ -29,7 +29,7 @@ class Ressource
      * Set code
      *
      * @param string $code
-     * @return Ressource
+     * @return CategoriePrivilege
      */
     public function setCode($code)
     {
@@ -52,7 +52,7 @@ class Ressource
      * Set libelle
      *
      * @param string $libelle
-     * @return Ressource
+     * @return CategoriePrivilege
      */
     public function setLibelle($libelle)
     {

module/Application/src/Application/Entity/Db/HistoriqueAwareTrait.php

@@ -43,7 +43,7 @@ trait HistoriqueAwareTrait
      * Set histoCreation
      *
      * @param \DateTime $histoCreation
-     * @return TypeRole
+     * @return self
      */
     public function setHistoCreation($histoCreation)
     {
@@ -66,7 +66,7 @@ trait HistoriqueAwareTrait
      * Set histoDestruction
      *
      * @param \DateTime $histoDestruction
-     * @return TypeRole
+     * @return self
      */
     public function setHistoDestruction($histoDestruction)
     {
@@ -89,7 +89,7 @@ trait HistoriqueAwareTrait
      * Set histoModification
      *
      * @param \DateTime $histoModification
-     * @return TypeRole
+     * @return self
      */
     public function setHistoModification($histoModification)
     {
@@ -112,7 +112,7 @@ trait HistoriqueAwareTrait
      * Set histoModificateur
      *
      * @param \Application\Entity\Db\Utilisateur $histoModificateur
-     * @return TypeRole
+     * @return self
      */
     public function setHistoModificateur(\Application\Entity\Db\Utilisateur $histoModificateur = null)
     {
@@ -135,7 +135,7 @@ trait HistoriqueAwareTrait
      * Set histoDestructeur
      *
      * @param \Application\Entity\Db\Utilisateur $histoDestructeur
-     * @return TypeRole
+     * @return self
      */
     public function setHistoDestructeur(\Application\Entity\Db\Utilisateur $histoDestructeur = null)
     {
@@ -158,7 +158,7 @@ trait HistoriqueAwareTrait
      * Set histoCreateur
      *
      * @param \Application\Entity\Db\Utilisateur $histoCreateur
-     * @return TypeRole
+     * @return self
      */
     public function setHistoCreateur(\Application\Entity\Db\Utilisateur $histoCreateur = null)
     {

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.TypeRole.dcm.xml → module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Affectation.dcm.xml

 <?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\TypeRole" table="TYPE_ROLE">
+  <entity name="Application\Entity\Db\Affectation" table="AFFECTATION">
     <indexes>
-      <index name="IDX_5657E8959860CDC" columns="HISTO_CREATEUR_ID"/>
-      <index name="IDX_5657E897E9E2204" columns="HISTO_DESTRUCTEUR_ID"/>
-      <index name="IDX_5657E8963F06898" columns="HISTO_MODIFICATEUR_ID"/>
+      <index name="IDX_61FC67DE59860CDC" columns="HISTO_CREATEUR_ID"/>
+      <index name="IDX_61FC67DE7E9E2204" columns="HISTO_DESTRUCTEUR_ID"/>
+      <index name="IDX_61FC67DE63F06898" columns="HISTO_MODIFICATEUR_ID"/>
+      <index name="IDX_61FC67DEB16F9F85" columns="PERSONNEL_ID"/>
+      <index name="IDX_61FC67DEE9B3446E" columns="SOURCE_ID"/>
+      <index name="IDX_61FC67DE884B0F7B" columns="STRUCTURE_ID"/>
+      <index name="IDX_61FC67DEC2443469" columns="ROLE_ID"/>
     </indexes>
     <unique-constraints>
-      <unique-constraint name="type_role_code_un" columns="CODE"/>
+      <unique-constraint name="affectation_source_un" columns="SOURCE_CODE"/>
+      <unique-constraint name="affectation_un" columns="STRUCTURE_ID,PERSONNEL_ID,ROLE_ID"/>
     </unique-constraints>
     <id name="id" type="integer" column="ID">
       <generator strategy="SEQUENCE"/>
     </id>
-    <field name="code" type="string" column="CODE" length="3" nullable="false"/>
     <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
     <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
     <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
-    <field name="libelle" type="string" column="LIBELLE" length="50" nullable="false"/>
-    <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
+    <field name="sourceCode" type="string" column="SOURCE_CODE" length="100" nullable="true"/>
+    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
       <join-columns>
-        <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
+        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+      </join-columns>
+    </many-to-one>
+    <many-to-one field="role" target-entity="Application\Entity\Db\Role">
+      <join-columns>
+        <join-column name="ROLE_ID" referenced-column-name="ID"/>
+      </join-columns>
+    </many-to-one>
+    <many-to-one field="source" target-entity="Application\Entity\Db\Source">
+      <join-columns>
+        <join-column name="SOURCE_ID" referenced-column-name="ID"/>
+      </join-columns>
+    </many-to-one>
+    <many-to-one field="personnel" target-entity="Application\Entity\Db\Personnel">
+      <join-columns>
+        <join-column name="PERSONNEL_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
     <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
@@ -27,12 +46,15 @@
         <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
+    <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
+      <join-columns>
+        <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
+      </join-columns>
+    </many-to-one>
     <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
       <join-columns>
         <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <one-to-many field="role" target-entity="Application\Entity\Db\Role" mapped-by="type" />
-    <many-to-many field="privilege" target-entity="Application\Entity\Db\Privilege" mapped-by="typeRole"/>
   </entity>
 </doctrine-mapping>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Ressource.dcm.xml → module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.CategoriePrivilege.dcm.xml

 <?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\Ressource" table="RESSOURCE">
+  <entity name="Application\Entity\Db\CategoriePrivilege" table="CATEGORIE_PRIVILEGE">
     <unique-constraints>
-      <unique-constraint name="ressource__un" columns="CODE"/>
+      <unique-constraint name="categorie_privilege__un" columns="CODE"/>
     </unique-constraints>
     <id name="id" type="integer" column="ID">
       <generator strategy="SEQUENCE"/>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Personnel.dcm.xml

@@ -53,6 +53,6 @@
         <join-column name="CIVILITE_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <one-to-many field="role" target-entity="Application\Entity\Db\Role" mapped-by="personnel" />
+    <one-to-many field="affectation" target-entity="Application\Entity\Db\Affectation" mapped-by="personnel" />
   </entity>
 </doctrine-mapping>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Privilege.dcm.xml

@@ -12,18 +12,18 @@
     </id>
     <field name="code" type="string" column="CODE" length="150" nullable="false"/>
     <field name="libelle" type="string" column="LIBELLE" length="200" nullable="false"/>
-    <many-to-one field="ressource" target-entity="Application\Entity\Db\Ressource">
+    <many-to-one field="categorie" target-entity="Application\Entity\Db\CategoriePrivilege">
       <join-columns>
-        <join-column name="RESSOURCE_ID" referenced-column-name="ID"/>
+        <join-column name="CATEGORIE_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <many-to-many field="typeRole" target-entity="Application\Entity\Db\TypeRole" inversed-by="privilege">
-      <join-table name="TYPE_ROLE_PRIVILEGE">
+    <many-to-many field="role" target-entity="Application\Entity\Db\Role" inversed-by="privilege">
+      <join-table name="ROLE_PRIVILEGE">
         <join-columns>
           <join-column name="PRIVILEGE_ID" referenced-column-name="ID"/>
         </join-columns>
         <inverse-join-columns>
-          <join-column name="TYPE_ROLE_ID" referenced-column-name="ID"/>
+          <join-column name="ROLE_ID" referenced-column-name="ID"/>
         </inverse-join-columns>
       </join-table>
     </many-to-many>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Role.dcm.xml

@@ -2,43 +2,24 @@
 <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\Role" table="ROLE">
     <indexes>
-      <index name="IDX_61FC67DE59860CDC" columns="HISTO_CREATEUR_ID"/>
-      <index name="IDX_61FC67DE7E9E2204" columns="HISTO_DESTRUCTEUR_ID"/>
-      <index name="IDX_61FC67DE63F06898" columns="HISTO_MODIFICATEUR_ID"/>
-      <index name="IDX_61FC67DEB16F9F85" columns="PERSONNEL_ID"/>
-      <index name="IDX_61FC67DEE9B3446E" columns="SOURCE_ID"/>
-      <index name="IDX_61FC67DE884B0F7B" columns="STRUCTURE_ID"/>
-      <index name="IDX_61FC67DEC2443469" columns="TYPE_ID"/>
+      <index name="IDX_5657E8959860CDC" columns="HISTO_CREATEUR_ID"/>
+      <index name="IDX_5657E897E9E2204" columns="HISTO_DESTRUCTEUR_ID"/>
+      <index name="IDX_5657E8963F06898" columns="HISTO_MODIFICATEUR_ID"/>
     </indexes>
     <unique-constraints>
-      <unique-constraint name="role_source_un" columns="SOURCE_CODE"/>
-      <unique-constraint name="role_un" columns="STRUCTURE_ID,PERSONNEL_ID,TYPE_ID"/>
+      <unique-constraint name="role_code_un" columns="CODE"/>
     </unique-constraints>
     <id name="id" type="integer" column="ID">
       <generator strategy="SEQUENCE"/>
     </id>
+    <field name="code" type="string" column="CODE" length="3" nullable="false"/>
     <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
     <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
     <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
-    <field name="sourceCode" type="string" column="SOURCE_CODE" length="100" nullable="true"/>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="type" target-entity="Application\Entity\Db\TypeRole">
-      <join-columns>
-        <join-column name="TYPE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="source" target-entity="Application\Entity\Db\Source">
-      <join-columns>
-        <join-column name="SOURCE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="personnel" target-entity="Application\Entity\Db\Personnel">
+    <field name="libelle" type="string" column="LIBELLE" length="50" nullable="false"/>
+    <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
       <join-columns>
-        <join-column name="PERSONNEL_ID" referenced-column-name="ID"/>
+        <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
     <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
@@ -46,15 +27,12 @@
         <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
-      <join-columns>
-        <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
     <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
       <join-columns>
         <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
+    <one-to-many field="affectation" target-entity="Application\Entity\Db\Affectation" mapped-by="role" />
+    <many-to-many field="privilege" target-entity="Application\Entity\Db\Privilege" mapped-by="role"/>
   </entity>
 </doctrine-mapping>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.RoleUtilisateur.dcm.xml

-<?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\RoleUtilisateur" table="ROLE_UTILISATEUR">
-    <indexes>
-      <index name="IDX_43A8DF1CEF5927F" columns="PARENT_ID"/>
-    </indexes>
-    <unique-constraints>
-      <unique-constraint name="role_utilisateur_id_un" columns="ROLE_ID"/>
-    </unique-constraints>
-    <id name="id" type="integer" column="ID">
-      <generator strategy="SEQUENCE"/>
-    </id>
-    <field name="isDefault" type="integer" column="IS_DEFAULT" nullable="false"/>
-    <field name="roleId" type="string" column="ROLE_ID" length="64" nullable="false"/>
-    <many-to-one field="parent" target-entity="Application\Entity\Db\RoleUtilisateur">
-      <join-columns>
-        <join-column name="PARENT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-many field="utilisateur" target-entity="Application\Entity\Db\Utilisateur" inversed-by="roleUtilisateur">
-      <join-table name="role_utilisateur_linker">
-        <join-columns>
-          <join-column name="ROLE_UTILISATEUR_ID" referenced-column-name="ID"/>
-        </join-columns>
-        <inverse-join-columns>
-          <join-column name="UTILISATEUR_ID" referenced-column-name="ID"/>
-        </inverse-join-columns>
-      </join-table>
-    </many-to-many>
-  </entity>
-</doctrine-mapping>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Utilisateur.dcm.xml

@@ -24,6 +24,5 @@
         <join-column name="PERSONNEL_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <many-to-many field="roleUtilisateur" target-entity="Application\Entity\Db\RoleUtilisateur" mapped-by="utilisateur"/>
   </entity>
 </doctrine-mapping>

module/Application/src/Application/Entity/Db/Personnel.php

@@ -57,14 +57,14 @@ class Personnel implements HistoriqueAwareInterface
     /**
      * @var \Doctrine\Common\Collections\Collection
      */
-    protected $role;
+    protected $affectation;
 
     /**
      * 
      */
     public function __construct()
     {
-        $this->role = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->affectation = new \Doctrine\Common\Collections\ArrayCollection();
     }
 
     /**
@@ -262,36 +262,36 @@ class Personnel implements HistoriqueAwareInterface
     }
 
     /**
-     * Add role
+     * Add affectation
      *
-     * @param \Application\Entity\Db\Role $role
-     * @return TypeRole
+     * @param \Application\Entity\Db\Affectation $affectation
+     * @return Personnel
      */
-    public function addRole(\Application\Entity\Db\Role $role)
+    public function addAffectation(\Application\Entity\Db\Affectation $affectation)
     {
-        $this->role[] = $role;
+        $this->affectation[] = $affectation;
 
         return $this;
     }
 
     /**
-     * Remove role
+     * Remove affectation
      *
-     * @param \Application\Entity\Db\Role $role
+     * @param \Application\Entity\Db\Affectation $affectation
      */
-    public function removeRole(\Application\Entity\Db\Role $role)
+    public function removeAffectation(\Application\Entity\Db\Affectation $affectation)
     {
-        $this->role->removeElement($role);
+        $this->affectation->removeElement($affectation);
     }
 
     /**
-     * Get role
+     * Get affectation
      *
      * @return \Doctrine\Common\Collections\Collection 
      */
-    public function getRole()
+    public function getAffectation()
     {
-        return $this->role;
+        return $this->affectation;
     }
     
     /**

module/Application/src/Application/Entity/Db/Privilege.php

@@ -2,8 +2,6 @@
 
 namespace Application\Entity\Db;
 
-use Doctrine\ORM\Mapping as ORM;
-
 /**
  * Privilege
  */
@@ -25,14 +23,14 @@ class Privilege
     private $id;
 
     /**
-     * @var \Application\Entity\Db\Ressource
+     * @var \Application\Entity\Db\CategoriePrivilege
      */
-    private $ressource;
+    private $categorie;
 
     /**
      * @var \Doctrine\Common\Collections\Collection
      */
-    private $typeRole;
+    private $role;
 
     /**
      * @var \Doctrine\Common\Collections\Collection
@@ -44,7 +42,7 @@ class Privilege
      */
     public function __construct()
     {
-        $this->typeRole = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->role = new \Doctrine\Common\Collections\ArrayCollection();
         $this->statut = new \Doctrine\Common\Collections\ArrayCollection();
     }
 
@@ -105,59 +103,69 @@ class Privilege
     }
 
     /**
-     * Set ressource
+     * Set categoriePrivilege
      *
-     * @param \Application\Entity\Db\Ressource $ressource
+     * @param \Application\Entity\Db\CategoriePrivilege $categoriePrivilege
      * @return Privilege
      */
-    public function setRessource(\Application\Entity\Db\Ressource $ressource = null)
+    public function setCategoriePrivilege(\Application\Entity\Db\CategoriePrivilege $categoriePrivilege = null)
     {
-        $this->ressource = $ressource;
+        $this->categoriePrivilege = $categoriePrivilege;
 
         return $this;
     }
 
     /**
-     * Get ressource
+     * Get categoriePrivilege
      *
-     * @return \Application\Entity\Db\Ressource 
+     * @return \Application\Entity\Db\CategoriePrivilege
      */
-    public function getRessource()
+    public function getCategoriePrivilege()
     {
-        return $this->ressource;
+        return $this->categoriePrivilege;
     }
 
     /**
-     * Add typeRole
+     * Add role
      *
-     * @param \Application\Entity\Db\TypeRole $typeRole
+     * @param \Application\Entity\Db\Role $role
      * @return Privilege
      */
-    public function addTypeRole(\Application\Entity\Db\TypeRole $typeRole)
+    public function addRole(\Application\Entity\Db\Role $role)
     {
-        $this->typeRole[] = $typeRole;
+        $this->Role[] = $role;
 
         return $this;
     }
 
     /**
-     * Remove typeRole
+     * Remove role
      *
-     * @param \Application\Entity\Db\TypeRole $typeRole
+     * @param \Application\Entity\Db\Role $role
      */
-    public function removeTypeRole(\Application\Entity\Db\TypeRole $typeRole)
+    public function removeRole(\Application\Entity\Db\Role $role)
     {
-        $this->typeRole->removeElement($typeRole);
+        $this->role->removeElement($role);
     }
 
     /**
-     * Get typeRole
+     * Get role
      *
      * @return \Doctrine\Common\Collections\Collection 
      */
-    public function getTypeRole()
+    public function getRole()
     {
-        return $this->typeRole;
+        return $this->role;
+    }
+
+    public function getRoleCodes()
+    {
+        $result = [];
+        foreach( $this->role as $role ){
+            /* @var $role Role */
+            $result[] = $role->getCode();
+        }
+        return $result;
     }
 
     /**

module/Application/src/Application/Entity/Db/Role.php

@@ -2,30 +2,28 @@
 
 namespace Application\Entity\Db;
 
+use Zend\Permissions\Acl\Role\RoleInterface;
+use Zend\Permissions\Acl\Resource\ResourceInterface;
+
 /**
  * Role
  */
-class Role implements HistoriqueAwareInterface
+class Role implements HistoriqueAwareInterface, RoleInterface
 {
-    /**
-     * @var \DateTime
-     */
-    protected $histoCreation;
+    use HistoriqueAwareTrait;
  
-    /**
-     * @var \DateTime
-     */
-    protected $histoDestruction;
+    const CODE_RESPONSABLE_COMPOSANTE  = 'responsable-composante';
+    const CODE_GESTIONNAIRE_COMPOSANTE = 'gestionnaire-composante';
 
     /**
-     * @var \DateTime
+     * @var string
      */
-    protected $histoModification;
+    protected $code;
 
     /**
      * @var string
      */
-    protected $sourceCode;
+    protected $libelle;
 
     /**
      * @var integer
@@ -33,131 +31,88 @@ class Role implements HistoriqueAwareInterface
     protected $id;
 
     /**
-     * @var \Application\Entity\Db\Structure
+     * @var \Doctrine\Common\Collections\Collection
      */
-    protected $structure;
+    protected $affectation;
 
     /**
-     * @var \Application\Entity\Db\TypeRole
+     * @var \Doctrine\Common\Collections\Collection
      */
-    protected $type;
+    private $privilege;
 
     /**
-     * @var \Application\Entity\Db\Source
-     */
-    protected $source;
-
-    /**
-     * @var \Application\Entity\Db\Personnel
-     */
-    protected $personnel;
-
-    /**
-     * @var \Application\Entity\Db\Utilisateur
-     */
-    protected $histoDestructeur;
-
-    /**
-     * @var \Application\Entity\Db\Utilisateur
-     */
-    protected $histoModificateur;
-
-    /**
-     * @var \Application\Entity\Db\Utilisateur
-     */
-    protected $histoCreateur;
-
-
-    /**
-     * Set histoCreation
-     *
-     * @param \DateTime $histoCreation
-     * @return Role
-     */
-    public function setHistoCreation($histoCreation)
-    {
-        $this->histoCreation = $histoCreation;
-
-        return $this;
-    }
-
-    /**
-     * Get histoCreation
      *
-     * @return \DateTime 
      */
-    public function getHistoCreation()
+    public function __construct()
     {
-        return $this->histoCreation;
+        $this->affectation = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->privilege = new \Doctrine\Common\Collections\ArrayCollection();
     }
     
     /**
-     * Set histoDestruction
+     * Returns the string identifier of the Role
      *
-     * @param \DateTime $histoDestruction
-     * @return Role
+     * @return string
      */
-    public function setHistoDestruction($histoDestruction)
+    public function getRoleId()
     {
-        $this->histoDestruction = $histoDestruction;
-
-        return $this;
+        return $this->getCode();
     }
     
     /**
-     * Get histoDestruction
+     * Retourne la représentation littérale de cet objet.
      * 
-     * @return \DateTime 
+     * @return string
      */
-    public function getHistoDestruction()
+    public function __toString()
     {
-        return $this->histoDestruction;
+        return $this->getLibelle();
     }
 
     /**
-     * Set histoModification
+     * Set code
      *
-     * @param \DateTime $histoModification
-     * @return Role
+     * @param string $code
+     * @return self
      */
-    public function setHistoModification($histoModification)
+    public function setCode($code)
     {
-        $this->histoModification = $histoModification;
+        $this->code = $code;
 
         return $this;
     }
 
     /**
-     * Get histoModification
+     * Get code
      *
-     * @return \DateTime 
+     * @return string 
      */
-    public function getHistoModification()
+    public function getCode()
     {
-        return $this->histoModification;
+        return $this->code;
     }
 
     /**
-     * Set sourceCode
+     * Set libelle
      *
-     * @param string $sourceCode
-     * @return Role
+     * @param string $libelle
+     * @return self
      */
-    public function setSourceCode($sourceCode)
+    public function setLibelle($libelle)
     {
-        $this->sourceCode = $sourceCode;
+        $this->libelle = $libelle;
 
         return $this;
     }
 
     /**
-     * Get sourceCode
+     * Get libelle
      *
      * @return string 
      */
-    public function getSourceCode()
+    public function getLibelle()
     {
-        return $this->sourceCode;
+        return $this->libelle;
     }
 
     /**
@@ -171,163 +126,102 @@ class Role implements HistoriqueAwareInterface
     }
 
     /**
-     * Set structure
+     * Add affectation
      *
-     * @param \Application\Entity\Db\Structure $structure
-     * @return Role
+     * @param \Application\Entity\Db\Affectation $affectation
+     * @return self
      */
-    public function setStructure(\Application\Entity\Db\Structure $structure = null)
+    public function addAffectation(\Application\Entity\Db\Affectation $affectation)
     {
-        $this->structure = $structure;
+        $this->affectation[] = $affectation;
 
         return $this;
     }
 
     /**
-     * Get structure
-     *
-     * @return \Application\Entity\Db\Structure 
-     */
-    public function getStructure()
-    {
-        return $this->structure;
-    }
-
-    /**
-     * Set type
+     * Remove affectation
      *
-     * @param \Application\Entity\Db\TypeRole $type
-     * @return Role
+     * @param \Application\Entity\Db\Affectation $affectation
      */
-    public function setType(\Application\Entity\Db\TypeRole $type = null)
+    public function removeAffectation(\Application\Entity\Db\Affectation $affectation)
     {
-        $this->type = $type;
-
-        return $this;
+        $this->affectation->removeElement($affectation);
     }
 
     /**
-     * Get type
+     * Get affectation
      *
-     * @return \Application\Entity\Db\TypeRole 
+     * @return \Doctrine\Common\Collections\Collection 
      */
-    public function getType()
+    public function getAffectation()
     {
-        return $this->type;
+        return $this->affectation;
     }
 
     /**
-     * Set source
+     * Add privilege
      *
-     * @param \Application\Entity\Db\Source $source
-     * @return Role
+     * @param \Application\Entity\Db\Privilege $privilege
+     * @return StatutIntervenant
      */
-    public function setSource(\Application\Entity\Db\Source $source = null)
+    public function addPrivilege(\Application\Entity\Db\Privilege $privilege)
     {
-        $this->source = $source;
+        $this->privilege[] = $privilege;
 
         return $this;
     }
 
     /**
-     * Get source
+     * Remove privilege
      *
-     * @return \Application\Entity\Db\Source 
+     * @param \Application\Entity\Db\Privilege $privilege
      */
-    public function getSource()
+    public function removePrivilege(\Application\Entity\Db\Privilege $privilege)
     {
-        return $this->source;
+        $this->privilege->removeElement($privilege);
     }
 
     /**
-     * Set personnel
+     * Get privilege
      *
-     * @param \Application\Entity\Db\Personnel $personnel
-     * @return Role
+     * @param ResourceInterface|string|null $resource
+     * @return \Doctrine\Common\Collections\Collection
      */
-    public function setPersonnel(\Application\Entity\Db\Personnel $personnel = null)
+    public function getPrivilege( $resource=null )
     {
-        $this->personnel = $personnel;
-
-        return $this;
+        return $this->privilege->filter( function(Privilege $privilege) use ($resource){
+            if (empty($resource)){
+                return true; // pas de filtre
             }
-
-    /**
-     * Get personnel
-     *
-     * @return \Application\Entity\Db\Personnel 
-     */
-    public function getPersonnel()
-    {
-        return $this->personnel;
+            if ($resource instanceof ResourceInterface){
+                $resource = $resource->getResourceId();
             }
-
-    /**
-     * Set histoDestructeur
-     *
-     * @param \Application\Entity\Db\Utilisateur $histoDestructeur
-     * @return Role
-     */
-    public function setHistoDestructeur(\Application\Entity\Db\Utilisateur $histoDestructeur = null)
-    {
-        $this->histoDestructeur = $histoDestructeur;
-
-        return $this;
+            return $privilege->getRessource()->getCode() === $resource;
+        });
     }
 
     /**
-     * Get histoDestructeur
+     * Détermine si le rôle possède un provilège ou non.
+     * Si le privilège transmis est un objet de classe Privilege, alors il est inutile de fournir la ressource, sinon il est obligatoire de la préciser
      *
-     * @return \Application\Entity\Db\Utilisateur 
+     * @param Privilege|string $privilege
+     * @param ResourceInterface|string|null $resource
+     * @return boolean
+     * @throws \Common\Exception\LogicException
      */
-    public function getHistoDestructeur()
+    public function hasPrivilege( $privilege, $resource=null )
     {
-        return $this->histoDestructeur;
+        if ($privilege instanceof Privilege){
+            $resource  = $privilege->getRessource();
+            $privilege = $privilege->getCode();
         }
-
-    /**
-     * Set histoModificateur
-     *
-     * @param \Application\Entity\Db\Utilisateur $histoModificateur
-     * @return Role
-     */
-    public function setHistoModificateur(\Application\Entity\Db\Utilisateur $histoModificateur = null)
-    {
-        $this->histoModificateur = $histoModificateur;
-
-        return $this;
-    }
-
-    /**
-     * Get histoModificateur
-     *
-     * @return \Application\Entity\Db\Utilisateur 
-     */
-    public function getHistoModificateur()
-    {
-        return $this->histoModificateur;
+        if (empty($resource)){
+            throw new \Common\Exception\LogicException('La ressource du privilège n\'est pas précisée');
         }
-
-    /**
-     * Set histoCreateur
-     *
-     * @param \Application\Entity\Db\Utilisateur $histoCreateur
-     * @return Role
-     */
-    public function setHistoCreateur(\Application\Entity\Db\Utilisateur $histoCreateur = null)
-    {
-        $this->histoCreateur = $histoCreateur;
-
-        return $this;
+        $privileges = $this->getPrivilege($resource);
+        foreach( $privileges as $priv ){
+            if ($priv->getCode() === $privilege) return true;
         }
-
-    /**
-     * Get histoCreateur
-     *
-     * @return \Application\Entity\Db\Utilisateur 
-     */
-    public function getHistoCreateur()
-    {
-        return $this->histoCreateur;
+        return false;
     }
 }
\ No newline at end of file

module/Application/src/Application/Entity/Db/RoleUtilisateur.php

-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * RoleUtilisateur
- */
-class RoleUtilisateur
-{
-
-    /**
-     * @var integer
-     */
-    protected $isDefault;
-
-    /**
-     * @var string
-     */
-    protected $roleId;
-
-    /**
-     * @var integer
-     */
-    protected $id;
-
-    /**
-     * @var \Application\Entity\Db\RoleUtilisateur
-     */
-    protected $parent;
-
-    /**
-     * @var \Doctrine\Common\Collections\Collection
-     */
-    protected $utilisateur;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->utilisateur = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Set isDefault
-     *
-     * @param integer $isDefault
-     * @return RoleUtilisateur
-     */
-    public function setIsDefault($isDefault)
-    {
-        $this->isDefault = $isDefault;
-
-        return $this;
-    }
-
-    /**
-     * Get isDefault
-     *
-     * @return integer 
-     */
-    public function getIsDefault()
-    {
-        return $this->isDefault;
-    }
-
-    /**
-     * Set roleId
-     *
-     * @param string $roleId
-     * @return RoleUtilisateur
-     */
-    public function setRoleId($roleId)
-    {
-        $this->roleId = $roleId;
-
-        return $this;
-    }
-
-    /**
-     * Get roleId
-     *
-     * @return string 
-     */
-    public function getRoleId()
-    {
-        return $this->roleId;
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer 
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set parent
-     *
-     * @param \Application\Entity\Db\RoleUtilisateur $parent
-     * @return RoleUtilisateur
-     */
-    public function setParent(\Application\Entity\Db\RoleUtilisateur $parent = null)
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * Get parent
-     *
-     * @return \Application\Entity\Db\RoleUtilisateur 
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Add utilisateur
-     *
-     * @param \Application\Entity\Db\Utilisateur $utilisateur
-     * @return RoleUtilisateur
-     */
-    public function addUtilisateur(\Application\Entity\Db\Utilisateur $utilisateur)
-    {
-        $this->utilisateur[] = $utilisateur;
-
-        return $this;
-    }
-
-    /**
-     * Remove utilisateur
-     *
-     * @param \Application\Entity\Db\Utilisateur $utilisateur
-     */
-    public function removeUtilisateur(\Application\Entity\Db\Utilisateur $utilisateur)
-    {
-        $this->utilisateur->removeElement($utilisateur);
-    }
-
-    /**
-     * Get utilisateur
-     *
-     * @return \Doctrine\Common\Collections\Collection 
-     */
-    public function getUtilisateur()
-    {
-        return $this->utilisateur;
-    }
-
-    public function __toString()
-    {
-        return $this->getRoleId();
-    }
-}
\ No newline at end of file

module/Application/src/Application/Entity/Db/TypeRole.php

-<?php
-
-namespace Application\Entity\Db;
-
-use Zend\Permissions\Acl\Role\RoleInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-
-/**
- * TypeRole
- */
-class TypeRole implements HistoriqueAwareInterface, RoleInterface
-{
-    use HistoriqueAwareTrait;
- 
-    const CODE_RESPONSABLE_COMPOSANTE  = 'responsable-composante';
-    const CODE_GESTIONNAIRE_COMPOSANTE = 'gestionnaire-composante';
-    
-    /**
-     * @var string
-     */
-    protected $code;
-
-    /**
-     * @var string
-     */
-    protected $libelle;
-
-    /**
-     * @var integer
-     */
-    protected $id;
-
-    /**
-     * @var \Doctrine\Common\Collections\Collection
-     */
-    protected $role;
-
-    /**
-     * @var \Doctrine\Common\Collections\Collection
-     */
-    private $privilege;
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->role = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->privilege = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-    
-    /**
-     * Returns the string identifier of the Role
-     *
-     * @return string
-     */
-    public function getRoleId()
-    {
-        return $this->getCode();
-    }
-    
-    /**
-     * Retourne la représentation littérale de cet objet.
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getLibelle();
-    }
-
-    /**
-     * Set code
-     *
-     * @param string $code
-     * @return TypeRole
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * Get code
-     *
-     * @return string 
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Set libelle
-     *
-     * @param string $libelle
-     * @return TypeRole
-     */
-    public function setLibelle($libelle)
-    {
-        $this->libelle = $libelle;
-
-        return $this;
-    }
-
-    /**
-     * Get libelle
-     *
-     * @return string 
-     */
-    public function getLibelle()
-    {
-        return $this->libelle;
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer 
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Add role
-     *
-     * @param \Application\Entity\Db\Role $role
-     * @return TypeRole
-     */
-    public function addRole(\Application\Entity\Db\Role $role)
-    {
-        $this->role[] = $role;
-
-        return $this;
-    }
-
-    /**
-     * Remove role
-     *
-     * @param \Application\Entity\Db\Role $role
-     */
-    public function removeRole(\Application\Entity\Db\Role $role)
-    {
-        $this->role->removeElement($role);
-    }
-
-    /**
-     * Get role
-     *
-     * @return \Doctrine\Common\Collections\Collection 
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
-
-    /**
-     * Add privilege
-     *
-     * @param \Application\Entity\Db\Privilege $privilege
-     * @return StatutIntervenant
-     */
-    public function addPrivilege(\Application\Entity\Db\Privilege $privilege)
-    {
-        $this->privilege[] = $privilege;
-
-        return $this;
-    }
-
-    /**
-     * Remove privilege
-     *
-     * @param \Application\Entity\Db\Privilege $privilege
-     */
-    public function removePrivilege(\Application\Entity\Db\Privilege $privilege)
-    {
-        $this->privilege->removeElement($privilege);
-    }
-
-    /**
-     * Get privilege
-     *
-     * @param ResourceInterface|string|null $resource
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getPrivilege( $resource=null )
-    {
-        return $this->privilege->filter( function(Privilege $privilege) use ($resource){
-            if (empty($resource)){
-                return true; // pas de filtre
-            }
-            if ($resource instanceof ResourceInterface){
-                $resource = $resource->getResourceId();
-            }
-            return $privilege->getRessource()->getCode() === $resource;
-        });
-    }
-
-    /**
-     * Détermine si le type de rôle possède un provilège ou non.
-     * Si le privilège transmis est un objet de classe Privilege, alors il est inutile de fournir la ressource, sinon il est obligatoire de la préciser
-     *
-     * @param Privilege|string $privilege
-     * @param ResourceInterface|string|null $resource
-     * @return boolean
-     * @throws \Common\Exception\LogicException
-     */
-    public function hasPrivilege( $privilege, $resource=null )
-    {
-        if ($privilege instanceof Privilege){
-            $resource  = $privilege->getRessource();
-            $privilege = $privilege->getCode();
-        }
-        if (empty($resource)){
-            throw new \Common\Exception\LogicException('La ressource du privilège n\'est pas précisée');
-        }
-        $privileges = $this->getPrivilege($resource);
-        foreach( $privileges as $priv ){
-            if ($priv->getCode() === $privilege) return true;
-        }
-        return false;
-    }
-}
\ No newline at end of file

module/Application/src/Application/Entity/Db/Utilisateur.php

@@ -52,19 +52,6 @@ class Utilisateur implements UserInterface, ProviderInterface
      */
     protected $personnel;
 
-    /**
-     * @var \Doctrine\Common\Collections\Collection
-     */
-    protected $roleUtilisateur;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->roleUtilisateur = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
     /**
      * Set displayName
      *
@@ -236,39 +223,6 @@ class Utilisateur implements UserInterface, ProviderInterface
         return $this->personnel;
     }
 
-    /**
-     * Add roleUtilisateur
-     *
-     * @param \Application\Entity\Db\RoleUtilisateur $roleUtilisateur
-     * @return Utilisateur
-     */
-    public function addRoleUtilisateur(\Application\Entity\Db\RoleUtilisateur $roleUtilisateur)
-    {
-        $this->roleUtilisateur[] = $roleUtilisateur;
-
-        return $this;
-    }
-
-    /**
-     * Remove roleUtilisateur
-     *
-     * @param \Application\Entity\Db\RoleUtilisateur $roleUtilisateur
-     */
-    public function removeRoleUtilisateur(\Application\Entity\Db\RoleUtilisateur $roleUtilisateur)
-    {
-        $this->roleUtilisateur->removeElement($roleUtilisateur);
-    }
-
-    /**
-     * Get roleUtilisateur
-     *
-     * @return \Doctrine\Common\Collections\Collection 
-     */
-    public function getRoleUtilisateur()
-    {
-        return $this->roleUtilisateur;
-    }
-
 
 	/**************************************************************************************************
 	 * 										Début ajout
@@ -303,6 +257,6 @@ class Utilisateur implements UserInterface, ProviderInterface
      */
     public function getRoles()
     {
-        return $this->getRoleUtilisateur();
+        return [];
     }
 }