Ajout de la catégorie du périmètre dans la table reliant un utilisateur, un... (e533dd43) · Commits · Jean-Philippe Metivier / utilisateur

config/unicaen-utilisateur.global.php.dist

+1 −1

Changes for config/unicaen-utilisateur.global.php.dist: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ return [

		'unicaen-utilisateur' => [
		'recherche-individu' => [
		'app' => UserService::class,
		// 'app' => UserService::class,
		// 'ldap' => LdapService::class,
		// 'octopus' => IndividuService::class,
		],

+10 −1

Changes for src/UnicaenUtilisateur/Entity/Db/AbstractUser.php: 10 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace UnicaenUtilisateur\Entity\Db;

		use Application\Entity\Db\UtilisateurRoleLinker;
		use Application\Entity\Db\UtilisateurRolePerimetre;
		use BjyAuthorize\Provider\Role\ProviderInterface;
		use Doctrine\Common\Collections\ArrayCollection;
		@@ -259,6 +260,14 @@ abstract class AbstractUser implements UserInterface, ProviderInterface, Recherc
		return $this;
		}

		/**
		* @return Collection
		*/
		public function getFullRoles()
		{
		return $this->roles;
		}

		/**
		* Get roles of user
		*
		@@ -267,7 +276,7 @@ abstract class AbstractUser implements UserInterface, ProviderInterface, Recherc
		public function getRoles()
		{
		return $this->roles->map(function ($item) {
		/** @var UtilisateurRolePerimetre $item */
		/** @var UtilisateurRoleLinker $item */
		return $item->getRole();
		});
		}

+29 −0

Changes for src/UnicaenUtilisateur/Entity/Db/AbstractUserRole.php: 29 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace UnicaenUtilisateur\Entity\Db;

		use UnicaenPrivilege\Entity\Db\PerimetreCategorieInterface;
		use UnicaenPrivilege\Entity\Db\PerimetreInterface;

		abstract class AbstractUserRole implements UserRoleInterface
		@@ -21,6 +22,11 @@ abstract class AbstractUserRole implements UserRoleInterface
		*/
		protected $role;

		/**
		* @var PerimetreCategorieInterface
		*/
		protected $perimetreCategorie;

		/**
		* @var PerimetreInterface
		*/
		@@ -83,6 +89,29 @@ abstract class AbstractUserRole implements UserRoleInterface
		return $this->role;
		}

		/**
		* Set perimetreCategorie.
		*
		* @param PerimetreCategorieInterface\|null $perimetreCategorie
		* @return UserRoleInterface
		*/
		public function setPerimetreCategorie(PerimetreCategorieInterface $perimetreCategorie = null)
		{
		$this->perimetreCategorie = $perimetreCategorie;

		return $this;
		}

		/**
		* Get perimetreCategorie.
		*
		* @return PerimetreCategorieInterface\|null
		*/
		public function getPerimetreCategorie()
		{
		return $this->perimetreCategorie;
		}

		/**
		* Set perimetre.
		*

+5 −0

Changes for src/UnicaenUtilisateur/Entity/Db/Mapping/UnicaenUtilisateur.Entity.Db.UserRole.dcm.xml: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@
		<join-column name="ROLE_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<many-to-one field="perimetreCategorie" target-entity="UnicaenPrivilege\Entity\Db\PerimetreCategorie">
		<join-columns>
		<join-column name="PERIMETRE_CATEGORIE_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<many-to-one field="perimetre" target-entity="UnicaenPrivilege\Entity\Db\Perimetre">
		<join-columns>
		<join-column name="PERIMETRE_ID" referenced-column-name="ID"/>

+7 −0

Changes for src/UnicaenUtilisateur/Entity/Db/UserInterface.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -41,6 +41,13 @@ interface UserInterface extends \ZfcUser\Entity\UserInterface
		*/
		public function setLastRole(?RoleInterface $lastRole);

		/**
		* Get full roles of user
		*
		* @return Collection
		*/
		public function getFullRoles();

		/**
		* Get roles of user
		*