Loading module/Admission/Sql/admission.sql +62 −35 Changes for module/Admission/Sql/admission.sql: 62 added lines, 35 removed lines. Original line number Diff line number Diff line Loading @@ -12,12 +12,17 @@ create table admission_admission histo_destruction timestamp ); -- Ajoutez la colonne 'individu_id' de type bigint qui fait référence à la table 'individu' ALTER TABLE admission_etudiant ADD COLUMN individu_id bigint REFERENCES individu (id); create table admission_etudiant ( id bigserial not null primary key, admission_id bigint REFERENCES admission_admission (id), civilite varchar(5), individu_id bigint REFERENCES individu (id), nom_usuel varchar(60), nom_famille varchar(60), prenom varchar(60), Loading Loading @@ -171,7 +176,7 @@ create table admission_verification ); -- -- Nouvelle catégorie. -- Nouvelle catégorie de privilèges : Admission. -- insert into CATEGORIE_PRIVILEGE(ID, CODE, LIBELLE, ORDRE) select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000; Loading @@ -180,15 +185,33 @@ select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000; -- Nouveaux privilèges. -- insert into PRIVILEGE(ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) with d(ordre, code, lib) as ( select 1, 'admission-lister', 'Lister le(s) dossier(s) d''admission en cours' union select 2, 'admission-afficher', 'Consulter un dossier d''admission' union select 3, 'admission-ajouter', 'Ajouter un dossier d''admission' union select 4, 'admission-modifier', 'Modifier un dossier d''admission' union select 5, 'admission-historiser', 'Historiser un dossier d''admission' union select 6, 'admission-supprimer', 'Supprimer un dossier d''admission' union select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission' ) with d(ordre, code, lib) as (select 1, 'admission-lister-tous-dossiers-admission', 'Lister les dossiers d''admission en cours' union select 1, 'admission-lister-son-dossier-admission', 'Lister son dossier d''admission en cours' union select 2, 'admission-afficher-tous-dossiers-admission', 'Consulter un dossier d''admission' union select 2, 'admission-afficher-son-dossier-admission', 'Consulter son dossier d''admission' union select 4, 'admission-modifier-tous-dossiers-admission', 'Modifier un dossier d''admission' union select 4, 'admission-modifier-modifier-son-dossier-admission', 'Modifier son dossier d''admission' union select 5, 'admission-historiser', 'Historiser un dossier d''admission' union select 6, 'admission-supprimer-tous-dossiers-admission', 'Supprimer un dossier d''admission' union select 6, 'admission-supprimer-son-dossier-admission', 'Supprimer son dossier d''admission' union select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission') select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre from d join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission' Loading @@ -198,15 +221,25 @@ from d -- Accord de privilèges à des profils. -- INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID) with data(categ, priv) as ( select 'admission', 'admission-lister' union select 'admission', 'admission-afficher' union select 'admission', 'admission-ajouter' union select 'admission', 'admission-modifier' union select 'admission', 'admission-historiser' union select 'admission', 'admission-supprimer' union select 'admission', 'admission-verifier' ) with data(categ, priv) as (select 'admission', 'admission-lister-tous-dossiers-admission' union select 'admission', 'admission-lister-son-dossier-admission' union select 'admission', 'admission-afficher-tous-dossiers-admission' union select 'admission', 'admission-afficher-son-dossier-admission' union select 'admission', 'admission-modifier-tous-dossiers-admission' union select 'admission', 'admission-modifier-modifier-son-dossier-admission' union select 'admission', 'admission-historiser' union select 'admission', 'admission-supprimer-tous-dossiers-admission' union select 'admission', 'admission-supprimer-son-dossier-admission' union select 'admission', 'admission-verifier') select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID from data join PROFIL on profil.ROLE_ID in ( Loading @@ -215,18 +248,16 @@ from data ) join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv where not exists ( select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id ) ; where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id); INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID) with data(categ, priv) as ( select 'admission', 'admission-lister' union select 'admission', 'admission-afficher' union select 'admission', 'admission-ajouter' union select 'admission', 'admission-modifier' union select 'admission', 'admission-supprimer' ) with data(categ, priv) as (select 'admission', 'admission-lister-son-dossier-admission' union select 'admission', 'admission-afficher-son-dossier-admission' union select 'admission', 'admission-modifier-modifier-son-dossier-admission' union select 'admission', 'admission-supprimer-son-dossier-admission') select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID from data join PROFIL on profil.ROLE_ID in ( Loading @@ -234,16 +265,12 @@ from data ) join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv where not exists ( select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id ) ; where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id); insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID) select p2r.ROLE_ID, pp.PRIVILEGE_ID from PROFIL_TO_ROLE p2r join profil pr on pr.id = p2r.PROFIL_ID join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id where not exists ( select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id ) where not exists (select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id) ; No newline at end of file module/Admission/config/module.config.php +60 −27 Changes for module/Admission/config/module.config.php: 60 added lines, 27 removed lines. Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ namespace Admission; use Admission\Assertion\AdmissionAssertion; use Admission\Assertion\AdmissionAssertionFactory; use Admission\Controller\AdmissionController; use Admission\Controller\AdmissionControllerFactory; use Admission\Entity\Db\Repository\EtudiantRepository; use Admission\Entity\Db\Repository\IndividuRepositoryFactory; use Admission\Form\Admission\AdmissionForm; use Admission\Form\Admission\AdmissionFormFactory; Loading @@ -19,27 +20,27 @@ use Admission\Form\Fieldset\Validation\ValidationFieldset; use Admission\Form\Fieldset\Validation\ValidationFieldsetFactory; use Admission\Form\Fieldset\Verification\VerificationFieldset; use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory; use Admission\Hydrator\AdmissionHydrator; use Admission\Hydrator\AdmissionHydratorFactory; use Admission\Hydrator\FinancementHydrator; use Admission\Hydrator\FinancementHydratorFactory; use Admission\Hydrator\EtudiantHydrator; use Admission\Hydrator\EtudiantHydratorFactory; use Admission\Hydrator\InscriptionHydrator; use Admission\Hydrator\InscriptionHydratorFactory; use Admission\Hydrator\ValidationHydrator; use Admission\Hydrator\ValidationHydratorFactory; use Admission\Hydrator\VerificationHydrator; use Admission\Hydrator\VerificationHydratorFactory; use Admission\Hydrator\Admission\AdmissionHydrator; use Admission\Hydrator\Admission\AdmissionHydratorFactory; use Admission\Hydrator\Etudiant\EtudiantHydrator; use Admission\Hydrator\Etudiant\EtudiantHydratorFactory; use Admission\Hydrator\Financement\FinancementHydrator; use Admission\Hydrator\Financement\FinancementHydratorFactory; use Admission\Hydrator\Inscription\InscriptionHydrator; use Admission\Hydrator\Inscription\InscriptionHydratorFactory; use Admission\Hydrator\Validation\ValidationHydrator; use Admission\Hydrator\Validation\ValidationHydratorFactory; use Admission\Hydrator\Verification\VerificationHydrator; use Admission\Hydrator\Verification\VerificationHydratorFactory; use Admission\Provider\Privilege\AdmissionPrivileges; use Admission\Service\Admission\AdmissionService; use Admission\Service\Admission\AdmissionServiceFactory; use Admission\Service\Document\DocumentService; use Admission\Service\Document\DocumentServiceFactory; use Admission\Service\Financement\FinancementService; use Admission\Service\Financement\FinancementServiceFactory; use Admission\Service\Etudiant\EtudiantService; use Admission\Service\Etudiant\EtudiantServiceFactory; use Admission\Service\Financement\FinancementService; use Admission\Service\Financement\FinancementServiceFactory; use Admission\Service\Inscription\InscriptionService; use Admission\Service\Inscription\InscriptionServiceFactory; use Admission\Service\Validation\ValidationService; Loading @@ -49,7 +50,6 @@ use Admission\Service\Verification\VerificationServiceFactory; use Doctrine\ORM\Mapping\Driver\XmlDriver; use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Laminas\Router\Http\Segment; use Laminas\ServiceManager\Factory\InvokableFactory; use UnicaenAuth\Guard\PrivilegeController; use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider; Loading @@ -72,19 +72,48 @@ return array( ], ], 'bjyauthorize' => [ 'resource_providers' => [ 'BjyAuthorize\Provider\Resource\Config' => [ 'Admission' => [], ], ], 'rule_providers' => [ PrivilegeRuleProvider::class => [ 'allow' => [ [ 'privileges' => [ AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_HISTORISER, AdmissionPrivileges::ADMISSION_VERIFIER, ], 'resources' => ['Admission'], 'assertion' => AdmissionAssertion::class, ], ], ], ], 'guards' => [ PrivilegeController::class => [ [ 'controller' => AdmissionController::class, 'action' => [ 'index', // 'confirmer', // 'enregistrer', 'confirmer', 'enregistrer', 'rechercher-individu' ], 'privileges' => [ AdmissionPrivileges::ADMISSION_LISTER, AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, ], 'assertion' => AdmissionAssertion::class, ], [ 'controller' => AdmissionController::class, Loading @@ -92,7 +121,7 @@ return array( 'ajouter', ], 'privileges' => [ AdmissionPrivileges::ADMISSION_AJOUTER, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, ], ], [ Loading @@ -103,9 +132,11 @@ return array( 'financement', 'validation', ], // 'privileges' => [ // AdmissionPrivileges::ADMISSION_AFFICHER, // ], 'privileges' => [ AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION, ], 'assertion' => AdmissionAssertion::class, ], [ 'controller' => AdmissionController::class, Loading @@ -113,7 +144,8 @@ return array( 'annuler', ], 'privileges' => [ AdmissionPrivileges::ADMISSION_SUPPRIMER, AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION, ], ], ] Loading @@ -138,13 +170,13 @@ return array( 'route' => '/:action/:individu', 'constraints' => [ /** * @see AdmissionController::individuAction() * @see AdmissionController::etudiantAction() * @see AdmissionController::inscriptionAction() * @see AdmissionController::financementAction() * @see AdmissionController::validationAction() */ 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', 'individu' => '[0-9]*' 'admission' => '[0-9]*' ], ], ], Loading Loading @@ -199,7 +231,8 @@ return array( InscriptionService::class => InscriptionServiceFactory::class, ValidationService::class => ValidationServiceFactory::class, DocumentService::class => DocumentServiceFactory::class, VerificationService::class => VerificationServiceFactory::class VerificationService::class => VerificationServiceFactory::class, AdmissionAssertion::class => AdmissionAssertionFactory::class ], ], Loading module/Admission/src/Admission/Assertion/AdmissionAssertion.php 0 → 100644 +217 −0 Changes for module/Admission/src/Admission/Assertion/AdmissionAssertion.php: 217 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Admission\Assertion; use Admission\Entity\Db\Admission; use Admission\Provider\Privilege\AdmissionPrivileges; use Admission\Service\Admission\AdmissionServiceAwareTrait; use Application\Assertion\AbstractAssertion; use Application\Assertion\Exception\FailedAssertionException; use Application\Assertion\ThrowsFailedAssertionExceptionTrait; use Application\RouteMatch; use Application\Service\UserContextServiceAwareInterface; use Application\Service\UserContextServiceAwareTrait; use Laminas\Permissions\Acl\Resource\ResourceInterface; use RapportActivite\Entity\Db\RapportActivite; use These\Entity\Db\These; use UnicaenApp\Service\MessageCollectorAwareInterface; use UnicaenApp\Service\MessageCollectorAwareTrait; class AdmissionAssertion extends AbstractAssertion implements UserContextServiceAwareInterface, MessageCollectorAwareInterface { private ?Admission $admission = null; private ?RapportActivite $rapportActivite = null; use ThrowsFailedAssertionExceptionTrait; use MessageCollectorAwareTrait; use AdmissionServiceAwareTrait; use UserContextServiceAwareTrait; /** * @param array $page * @return bool */ public function __invoke(array $page): bool { return $this->assertPage($page); } /** * @param array $page * @return bool */ private function assertPage(array $page): bool { return true; } /** * @param string $controller * @param string $action * @param string $privilege * @return boolean */ protected function assertController($controller, $action = null, $privilege = null): bool { if (! parent::assertController($controller, $action, $privilege)) { return false; } // $these = $this->getRequestedThese(); // if ($these === null) { // return true; // } // if (!$this->initForControllerAction($action)) { // return false; // } // try { // switch ($action) { // case 'lister': // // je ne comprends pas pourquoi : on peut arriver ici sans thèse spécifiée dans l'URL ! // if ($this->these !== null) { // $this->assertAppartenanceThese($this->these); // } // break; // // case 'ajouter': // case 'financement': // if ($this->admission !== null) { // $this->assertAppartenanceAdmission($this->admission); // } // break; // case 'modifier': // case 'supprimer': // case 'consulter': // case 'telecharger': // case 'generer': // $this->assertAppartenanceThese($this->rapportActivite->getThese()); // break; // } // } catch (FailedAssertionException $e) { // if ($e->getMessage()) { // $this->getServiceMessageCollector()->addMessage($e->getMessage(), __CLASS__); // } // return false; // } return true; } private function initForControllerAction(string $action): bool { switch ($action) { case 'lister': // $this->admission = $this->getRequestedThese(); // break; case 'financement': $this->admission = $this->getRequestedAdmission(); break; // case 'consulter': // case 'modifier': // case 'supprimer': // case 'ajouter': // $this->rapportActivite = $this->rapportActiviteService->newRapportActivite($this->getRequestedThese()); // break; default: throw new \InvalidArgumentException(__METHOD__ . " : Action inattendue : " . $action); } return true; } /** * @param Admission $entity * @param string $privilege * @return boolean */ protected function assertEntity(ResourceInterface $entity, $privilege = null): bool { if (! parent::assertEntity($entity, $privilege)) { return false; } $this->admission = $entity; try { // switch ($privilege) { // case RapportActivitePrivileges::RAPPORT_ACTIVITE_AJOUTER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_AJOUTER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_MODIFIER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_MODIFIER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_TELEVERSER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_TELEVERSER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_SUPPRIMER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_SUPPRIMER_SIEN: // $this->assertEtatThese($this->rapportActivite->getThese()); // } switch ($privilege) { case AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION: $this->assertAppartenanceAdmission($this->admission->getIndividu()); } } catch (FailedAssertionException $e) { if ($e->getMessage()) { $this->getServiceMessageCollector()->addMessage($e->getMessage(), __CLASS__); } return false; } return true; } // private function assertEtatThese(These $these) // { // $this->assertTrue( // in_array($these->getEtatThese(), [These::ETAT_EN_COURS, These::ETAT_SOUTENUE]), // "La thèse doit être en cours ou soutenue" // ); // } private function assertAppartenanceAdmission(Admission $admission) { $role = $this->userContextService->getSelectedIdentityRole(); if (!$role) { return; } if ($role->isDoctorant()) { $doctorant = $this->userContextService->getIdentityDoctorant(); $this->assertTrue( $admission->getIndividu()->getId() === $doctorant->getId(), "Le dossier d'admission n'appartient pas à l'individu " . $doctorant ); } } private function getRequestedThese(): ?These { if ($rapportActivite = $this->getRequestedRapport()) { return $rapportActivite->getThese(); } elseif ($routeMatch = $this->getRouteMatch()) { return $routeMatch->getThese(); } else { return null; } } private function getRequestedAdmission(): ?Admission { $admission = null; if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('individu')) { $admission = $this->admissionService->getRepository()->findOneByIndividu($id); } return $admission; } protected function getRouteMatch(): ?RouteMatch { /** @var \Application\RouteMatch $rm */ $rm = $this->getMvcEvent()->getRouteMatch(); return $rm; } } No newline at end of file module/Admission/src/Admission/Assertion/AdmissionAssertionFactory.php 0 → 100644 +46 −0 Changes for module/Admission/src/Admission/Assertion/AdmissionAssertionFactory.php: 46 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Admission\Assertion; use Admission\Service\Admission\AdmissionService; use Application\Assertion\AbstractAssertion; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; use Psr\Container\NotFoundExceptionInterface; class AdmissionAssertionFactory { /** * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ public function __invoke(ContainerInterface $container): AdmissionAssertion { $userContext = $container->get('UnicaenAuth\Service\UserContext'); $admission = $container->get(AdmissionService::class); $messageCollector = $container->get('MessageCollector'); /** @var $assertion */ $assertion = new AdmissionAssertion(); $assertion->setUserContextService($userContext); $assertion->setAdmissionService($admission); $assertion->setServiceMessageCollector($messageCollector); $this->injectCommons($assertion, $container); return $assertion; } /** * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ protected function injectCommons(AbstractAssertion $assertion, ContainerInterface $container) { $authorizeService = $container->get('BjyAuthorize\Service\Authorize'); $mvcEvent = $container->get('Application')->getMvcEvent(); $assertion->setServiceAuthorize($authorizeService); $assertion->setMvcEvent($mvcEvent); } } No newline at end of file module/Admission/src/Admission/Controller/AdmissionAbstractController.php +1 −0 Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,7 @@ use Laminas\Mvc\Controller\AbstractActionController; * * @method MultipageFormPlugin multipageForm(?MultipageForm $form = null) * @method FlashMessenger flashMessenger() * @method boolean isAllowed($resource, $privilege = null) */ class AdmissionAbstractController extends AbstractActionController { Loading Loading
module/Admission/Sql/admission.sql +62 −35 Changes for module/Admission/Sql/admission.sql: 62 added lines, 35 removed lines. Original line number Diff line number Diff line Loading @@ -12,12 +12,17 @@ create table admission_admission histo_destruction timestamp ); -- Ajoutez la colonne 'individu_id' de type bigint qui fait référence à la table 'individu' ALTER TABLE admission_etudiant ADD COLUMN individu_id bigint REFERENCES individu (id); create table admission_etudiant ( id bigserial not null primary key, admission_id bigint REFERENCES admission_admission (id), civilite varchar(5), individu_id bigint REFERENCES individu (id), nom_usuel varchar(60), nom_famille varchar(60), prenom varchar(60), Loading Loading @@ -171,7 +176,7 @@ create table admission_verification ); -- -- Nouvelle catégorie. -- Nouvelle catégorie de privilèges : Admission. -- insert into CATEGORIE_PRIVILEGE(ID, CODE, LIBELLE, ORDRE) select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000; Loading @@ -180,15 +185,33 @@ select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000; -- Nouveaux privilèges. -- insert into PRIVILEGE(ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) with d(ordre, code, lib) as ( select 1, 'admission-lister', 'Lister le(s) dossier(s) d''admission en cours' union select 2, 'admission-afficher', 'Consulter un dossier d''admission' union select 3, 'admission-ajouter', 'Ajouter un dossier d''admission' union select 4, 'admission-modifier', 'Modifier un dossier d''admission' union select 5, 'admission-historiser', 'Historiser un dossier d''admission' union select 6, 'admission-supprimer', 'Supprimer un dossier d''admission' union select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission' ) with d(ordre, code, lib) as (select 1, 'admission-lister-tous-dossiers-admission', 'Lister les dossiers d''admission en cours' union select 1, 'admission-lister-son-dossier-admission', 'Lister son dossier d''admission en cours' union select 2, 'admission-afficher-tous-dossiers-admission', 'Consulter un dossier d''admission' union select 2, 'admission-afficher-son-dossier-admission', 'Consulter son dossier d''admission' union select 4, 'admission-modifier-tous-dossiers-admission', 'Modifier un dossier d''admission' union select 4, 'admission-modifier-modifier-son-dossier-admission', 'Modifier son dossier d''admission' union select 5, 'admission-historiser', 'Historiser un dossier d''admission' union select 6, 'admission-supprimer-tous-dossiers-admission', 'Supprimer un dossier d''admission' union select 6, 'admission-supprimer-son-dossier-admission', 'Supprimer son dossier d''admission' union select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission') select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre from d join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission' Loading @@ -198,15 +221,25 @@ from d -- Accord de privilèges à des profils. -- INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID) with data(categ, priv) as ( select 'admission', 'admission-lister' union select 'admission', 'admission-afficher' union select 'admission', 'admission-ajouter' union select 'admission', 'admission-modifier' union select 'admission', 'admission-historiser' union select 'admission', 'admission-supprimer' union select 'admission', 'admission-verifier' ) with data(categ, priv) as (select 'admission', 'admission-lister-tous-dossiers-admission' union select 'admission', 'admission-lister-son-dossier-admission' union select 'admission', 'admission-afficher-tous-dossiers-admission' union select 'admission', 'admission-afficher-son-dossier-admission' union select 'admission', 'admission-modifier-tous-dossiers-admission' union select 'admission', 'admission-modifier-modifier-son-dossier-admission' union select 'admission', 'admission-historiser' union select 'admission', 'admission-supprimer-tous-dossiers-admission' union select 'admission', 'admission-supprimer-son-dossier-admission' union select 'admission', 'admission-verifier') select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID from data join PROFIL on profil.ROLE_ID in ( Loading @@ -215,18 +248,16 @@ from data ) join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv where not exists ( select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id ) ; where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id); INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID) with data(categ, priv) as ( select 'admission', 'admission-lister' union select 'admission', 'admission-afficher' union select 'admission', 'admission-ajouter' union select 'admission', 'admission-modifier' union select 'admission', 'admission-supprimer' ) with data(categ, priv) as (select 'admission', 'admission-lister-son-dossier-admission' union select 'admission', 'admission-afficher-son-dossier-admission' union select 'admission', 'admission-modifier-modifier-son-dossier-admission' union select 'admission', 'admission-supprimer-son-dossier-admission') select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID from data join PROFIL on profil.ROLE_ID in ( Loading @@ -234,16 +265,12 @@ from data ) join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv where not exists ( select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id ) ; where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id); insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID) select p2r.ROLE_ID, pp.PRIVILEGE_ID from PROFIL_TO_ROLE p2r join profil pr on pr.id = p2r.PROFIL_ID join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id where not exists ( select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id ) where not exists (select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id) ; No newline at end of file
module/Admission/config/module.config.php +60 −27 Changes for module/Admission/config/module.config.php: 60 added lines, 27 removed lines. Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ namespace Admission; use Admission\Assertion\AdmissionAssertion; use Admission\Assertion\AdmissionAssertionFactory; use Admission\Controller\AdmissionController; use Admission\Controller\AdmissionControllerFactory; use Admission\Entity\Db\Repository\EtudiantRepository; use Admission\Entity\Db\Repository\IndividuRepositoryFactory; use Admission\Form\Admission\AdmissionForm; use Admission\Form\Admission\AdmissionFormFactory; Loading @@ -19,27 +20,27 @@ use Admission\Form\Fieldset\Validation\ValidationFieldset; use Admission\Form\Fieldset\Validation\ValidationFieldsetFactory; use Admission\Form\Fieldset\Verification\VerificationFieldset; use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory; use Admission\Hydrator\AdmissionHydrator; use Admission\Hydrator\AdmissionHydratorFactory; use Admission\Hydrator\FinancementHydrator; use Admission\Hydrator\FinancementHydratorFactory; use Admission\Hydrator\EtudiantHydrator; use Admission\Hydrator\EtudiantHydratorFactory; use Admission\Hydrator\InscriptionHydrator; use Admission\Hydrator\InscriptionHydratorFactory; use Admission\Hydrator\ValidationHydrator; use Admission\Hydrator\ValidationHydratorFactory; use Admission\Hydrator\VerificationHydrator; use Admission\Hydrator\VerificationHydratorFactory; use Admission\Hydrator\Admission\AdmissionHydrator; use Admission\Hydrator\Admission\AdmissionHydratorFactory; use Admission\Hydrator\Etudiant\EtudiantHydrator; use Admission\Hydrator\Etudiant\EtudiantHydratorFactory; use Admission\Hydrator\Financement\FinancementHydrator; use Admission\Hydrator\Financement\FinancementHydratorFactory; use Admission\Hydrator\Inscription\InscriptionHydrator; use Admission\Hydrator\Inscription\InscriptionHydratorFactory; use Admission\Hydrator\Validation\ValidationHydrator; use Admission\Hydrator\Validation\ValidationHydratorFactory; use Admission\Hydrator\Verification\VerificationHydrator; use Admission\Hydrator\Verification\VerificationHydratorFactory; use Admission\Provider\Privilege\AdmissionPrivileges; use Admission\Service\Admission\AdmissionService; use Admission\Service\Admission\AdmissionServiceFactory; use Admission\Service\Document\DocumentService; use Admission\Service\Document\DocumentServiceFactory; use Admission\Service\Financement\FinancementService; use Admission\Service\Financement\FinancementServiceFactory; use Admission\Service\Etudiant\EtudiantService; use Admission\Service\Etudiant\EtudiantServiceFactory; use Admission\Service\Financement\FinancementService; use Admission\Service\Financement\FinancementServiceFactory; use Admission\Service\Inscription\InscriptionService; use Admission\Service\Inscription\InscriptionServiceFactory; use Admission\Service\Validation\ValidationService; Loading @@ -49,7 +50,6 @@ use Admission\Service\Verification\VerificationServiceFactory; use Doctrine\ORM\Mapping\Driver\XmlDriver; use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Laminas\Router\Http\Segment; use Laminas\ServiceManager\Factory\InvokableFactory; use UnicaenAuth\Guard\PrivilegeController; use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider; Loading @@ -72,19 +72,48 @@ return array( ], ], 'bjyauthorize' => [ 'resource_providers' => [ 'BjyAuthorize\Provider\Resource\Config' => [ 'Admission' => [], ], ], 'rule_providers' => [ PrivilegeRuleProvider::class => [ 'allow' => [ [ 'privileges' => [ AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_HISTORISER, AdmissionPrivileges::ADMISSION_VERIFIER, ], 'resources' => ['Admission'], 'assertion' => AdmissionAssertion::class, ], ], ], ], 'guards' => [ PrivilegeController::class => [ [ 'controller' => AdmissionController::class, 'action' => [ 'index', // 'confirmer', // 'enregistrer', 'confirmer', 'enregistrer', 'rechercher-individu' ], 'privileges' => [ AdmissionPrivileges::ADMISSION_LISTER, AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, ], 'assertion' => AdmissionAssertion::class, ], [ 'controller' => AdmissionController::class, Loading @@ -92,7 +121,7 @@ return array( 'ajouter', ], 'privileges' => [ AdmissionPrivileges::ADMISSION_AJOUTER, AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION, ], ], [ Loading @@ -103,9 +132,11 @@ return array( 'financement', 'validation', ], // 'privileges' => [ // AdmissionPrivileges::ADMISSION_AFFICHER, // ], 'privileges' => [ AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION, ], 'assertion' => AdmissionAssertion::class, ], [ 'controller' => AdmissionController::class, Loading @@ -113,7 +144,8 @@ return array( 'annuler', ], 'privileges' => [ AdmissionPrivileges::ADMISSION_SUPPRIMER, AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION, AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION, ], ], ] Loading @@ -138,13 +170,13 @@ return array( 'route' => '/:action/:individu', 'constraints' => [ /** * @see AdmissionController::individuAction() * @see AdmissionController::etudiantAction() * @see AdmissionController::inscriptionAction() * @see AdmissionController::financementAction() * @see AdmissionController::validationAction() */ 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', 'individu' => '[0-9]*' 'admission' => '[0-9]*' ], ], ], Loading Loading @@ -199,7 +231,8 @@ return array( InscriptionService::class => InscriptionServiceFactory::class, ValidationService::class => ValidationServiceFactory::class, DocumentService::class => DocumentServiceFactory::class, VerificationService::class => VerificationServiceFactory::class VerificationService::class => VerificationServiceFactory::class, AdmissionAssertion::class => AdmissionAssertionFactory::class ], ], Loading
module/Admission/src/Admission/Assertion/AdmissionAssertion.php 0 → 100644 +217 −0 Changes for module/Admission/src/Admission/Assertion/AdmissionAssertion.php: 217 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Admission\Assertion; use Admission\Entity\Db\Admission; use Admission\Provider\Privilege\AdmissionPrivileges; use Admission\Service\Admission\AdmissionServiceAwareTrait; use Application\Assertion\AbstractAssertion; use Application\Assertion\Exception\FailedAssertionException; use Application\Assertion\ThrowsFailedAssertionExceptionTrait; use Application\RouteMatch; use Application\Service\UserContextServiceAwareInterface; use Application\Service\UserContextServiceAwareTrait; use Laminas\Permissions\Acl\Resource\ResourceInterface; use RapportActivite\Entity\Db\RapportActivite; use These\Entity\Db\These; use UnicaenApp\Service\MessageCollectorAwareInterface; use UnicaenApp\Service\MessageCollectorAwareTrait; class AdmissionAssertion extends AbstractAssertion implements UserContextServiceAwareInterface, MessageCollectorAwareInterface { private ?Admission $admission = null; private ?RapportActivite $rapportActivite = null; use ThrowsFailedAssertionExceptionTrait; use MessageCollectorAwareTrait; use AdmissionServiceAwareTrait; use UserContextServiceAwareTrait; /** * @param array $page * @return bool */ public function __invoke(array $page): bool { return $this->assertPage($page); } /** * @param array $page * @return bool */ private function assertPage(array $page): bool { return true; } /** * @param string $controller * @param string $action * @param string $privilege * @return boolean */ protected function assertController($controller, $action = null, $privilege = null): bool { if (! parent::assertController($controller, $action, $privilege)) { return false; } // $these = $this->getRequestedThese(); // if ($these === null) { // return true; // } // if (!$this->initForControllerAction($action)) { // return false; // } // try { // switch ($action) { // case 'lister': // // je ne comprends pas pourquoi : on peut arriver ici sans thèse spécifiée dans l'URL ! // if ($this->these !== null) { // $this->assertAppartenanceThese($this->these); // } // break; // // case 'ajouter': // case 'financement': // if ($this->admission !== null) { // $this->assertAppartenanceAdmission($this->admission); // } // break; // case 'modifier': // case 'supprimer': // case 'consulter': // case 'telecharger': // case 'generer': // $this->assertAppartenanceThese($this->rapportActivite->getThese()); // break; // } // } catch (FailedAssertionException $e) { // if ($e->getMessage()) { // $this->getServiceMessageCollector()->addMessage($e->getMessage(), __CLASS__); // } // return false; // } return true; } private function initForControllerAction(string $action): bool { switch ($action) { case 'lister': // $this->admission = $this->getRequestedThese(); // break; case 'financement': $this->admission = $this->getRequestedAdmission(); break; // case 'consulter': // case 'modifier': // case 'supprimer': // case 'ajouter': // $this->rapportActivite = $this->rapportActiviteService->newRapportActivite($this->getRequestedThese()); // break; default: throw new \InvalidArgumentException(__METHOD__ . " : Action inattendue : " . $action); } return true; } /** * @param Admission $entity * @param string $privilege * @return boolean */ protected function assertEntity(ResourceInterface $entity, $privilege = null): bool { if (! parent::assertEntity($entity, $privilege)) { return false; } $this->admission = $entity; try { // switch ($privilege) { // case RapportActivitePrivileges::RAPPORT_ACTIVITE_AJOUTER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_AJOUTER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_MODIFIER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_MODIFIER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_TELEVERSER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_TELEVERSER_SIEN: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_SUPPRIMER_TOUT: // case RapportActivitePrivileges::RAPPORT_ACTIVITE_SUPPRIMER_SIEN: // $this->assertEtatThese($this->rapportActivite->getThese()); // } switch ($privilege) { case AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION: case AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION: $this->assertAppartenanceAdmission($this->admission->getIndividu()); } } catch (FailedAssertionException $e) { if ($e->getMessage()) { $this->getServiceMessageCollector()->addMessage($e->getMessage(), __CLASS__); } return false; } return true; } // private function assertEtatThese(These $these) // { // $this->assertTrue( // in_array($these->getEtatThese(), [These::ETAT_EN_COURS, These::ETAT_SOUTENUE]), // "La thèse doit être en cours ou soutenue" // ); // } private function assertAppartenanceAdmission(Admission $admission) { $role = $this->userContextService->getSelectedIdentityRole(); if (!$role) { return; } if ($role->isDoctorant()) { $doctorant = $this->userContextService->getIdentityDoctorant(); $this->assertTrue( $admission->getIndividu()->getId() === $doctorant->getId(), "Le dossier d'admission n'appartient pas à l'individu " . $doctorant ); } } private function getRequestedThese(): ?These { if ($rapportActivite = $this->getRequestedRapport()) { return $rapportActivite->getThese(); } elseif ($routeMatch = $this->getRouteMatch()) { return $routeMatch->getThese(); } else { return null; } } private function getRequestedAdmission(): ?Admission { $admission = null; if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('individu')) { $admission = $this->admissionService->getRepository()->findOneByIndividu($id); } return $admission; } protected function getRouteMatch(): ?RouteMatch { /** @var \Application\RouteMatch $rm */ $rm = $this->getMvcEvent()->getRouteMatch(); return $rm; } } No newline at end of file
module/Admission/src/Admission/Assertion/AdmissionAssertionFactory.php 0 → 100644 +46 −0 Changes for module/Admission/src/Admission/Assertion/AdmissionAssertionFactory.php: 46 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Admission\Assertion; use Admission\Service\Admission\AdmissionService; use Application\Assertion\AbstractAssertion; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; use Psr\Container\NotFoundExceptionInterface; class AdmissionAssertionFactory { /** * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ public function __invoke(ContainerInterface $container): AdmissionAssertion { $userContext = $container->get('UnicaenAuth\Service\UserContext'); $admission = $container->get(AdmissionService::class); $messageCollector = $container->get('MessageCollector'); /** @var $assertion */ $assertion = new AdmissionAssertion(); $assertion->setUserContextService($userContext); $assertion->setAdmissionService($admission); $assertion->setServiceMessageCollector($messageCollector); $this->injectCommons($assertion, $container); return $assertion; } /** * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ protected function injectCommons(AbstractAssertion $assertion, ContainerInterface $container) { $authorizeService = $container->get('BjyAuthorize\Service\Authorize'); $mvcEvent = $container->get('Application')->getMvcEvent(); $assertion->setServiceAuthorize($authorizeService); $assertion->setMvcEvent($mvcEvent); } } No newline at end of file
module/Admission/src/Admission/Controller/AdmissionAbstractController.php +1 −0 Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,7 @@ use Laminas\Mvc\Controller\AbstractActionController; * * @method MultipageFormPlugin multipageForm(?MultipageForm $form = null) * @method FlashMessenger flashMessenger() * @method boolean isAllowed($resource, $privilege = null) */ class AdmissionAbstractController extends AbstractActionController { Loading