Commit ec1a4992 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

update privileges, assertions concernant la modification d'une thèse et ce qui...

update privileges, assertions concernant la modification d'une thèse et ce qui la concerne (co-encadrements, direction...) améliorées, suppression form non utilisé
parent 400e50ae
Loading
Loading
Loading
Loading
+30 −0
Changes for doc/release-notes/8.x.0/01_saisie_these.sql: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -615,3 +615,33 @@ DELETE
from role_privilege
where privilege_id in (select id from privilege where code LIKE 'modification-de-ses-theses')
  and role_id in (select id from role where code LIKE 'DOCTORANT');

delete from profil_privilege pp1
where exists (
    select *
    from profil_privilege pp
             join profil on pp.profil_id = profil.id and role_id in ('DOCTORANT')
             join privilege p on pp.privilege_id = p.id
    where p.code in ('modification-de-ses-theses')
      and pp.profil_id = pp1.profil_id and pp.privilege_id = pp1.privilege_id
);

-- Suppression du privilège pour le Gestionnaire d'ED pour modifier leur thèse
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'these', 'modification-de-ses-theses')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
    'GEST_ED'
    )
         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);

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)
;
+18 −0
Changes for module/These/config/others/co-encadrant.config.php: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,19 +2,36 @@

namespace These;

use These\Assertion\Acteur\ActeurAssertion;
use These\Assertion\These\TheseAssertion;
use These\Controller\CoEncadrantController;
use These\Controller\Factory\CoEncadrantControllerFactory;
use These\Form\CoEncadrant\RechercherCoEncadrantFormFactory;
use These\Form\CoEncadrant\RechercherCoEncadrantForm;
use These\Provider\Privilege\CoEncadrantPrivileges;
use These\Provider\Privilege\ThesePrivileges;
use These\Service\CoEncadrant\CoEncadrantService;
use These\Service\CoEncadrant\CoEncadrantServiceFactory;
use UnicaenAuth\Guard\PrivilegeController;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return [
    'bjyauthorize'    => [
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            CoEncadrantPrivileges::COENCADRANT_GERER,
                        ],
                        'resources' => ['Acteur'],
                        'assertion'  => ActeurAssertion::class,
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
@@ -39,6 +56,7 @@ return [
                    'privileges' => [
                        CoEncadrantPrivileges::COENCADRANT_GERER,
                    ],
                    'assertion'  => ActeurAssertion::class,
                ],
            ],
        ],
+0 −6
Changes for module/These/config/others/these-saisie.config.php: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ use These\Assertion\These\TheseAssertion;
use These\Controller\Factory\TheseSaisieControllerFactory;
use These\Controller\TheseRechercheController;
use These\Controller\TheseSaisieController;
use These\Fieldset\Confidentialite\ConfidentialiteFieldset;
use These\Fieldset\Confidentialite\ConfidentialiteFieldsetFactory;
use These\Fieldset\Confidentialite\ConfidentialiteHydrator;
use These\Fieldset\Confidentialite\ConfidentialiteHydratorFactory;
use These\Fieldset\Direction\DirectionFieldset;
use These\Fieldset\Direction\DirectionFieldsetFactory;
use These\Fieldset\Direction\DirectionHydrator;
@@ -179,7 +175,6 @@ return [
    'form_elements' => [
        'factories' => [
            TheseSaisieForm::class => TheseSaisieFormFactory::class,
            ConfidentialiteFieldset::class => ConfidentialiteFieldsetFactory::class,
            EncadrementFieldset::class => EncadrementFieldsetFactory::class,
            GeneralitesFieldset::class => GeneralitesFieldsetFactory::class,
            DirectionFieldset::class => DirectionFieldsetFactory::class,
@@ -193,7 +188,6 @@ return [
        'factories' => [
            TheseSaisieHydrator::class => TheseSaisieHydratorFactory::class,

            ConfidentialiteHydrator::class => ConfidentialiteHydratorFactory::class,
            EncadrementHydrator::class => EncadrementHydratorFactory::class,
            GeneralitesHydrator::class => GeneralitesHydratorFactory::class,
            DirectionHydrator::class => DirectionHydratorFactory::class,
+20 −7
Changes for module/These/src/These/Assertion/Acteur/ActeurAssertion.php: 20 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -5,13 +5,16 @@ namespace These\Assertion\Acteur;
use Application\Assertion\AbstractAssertion;
use Application\Assertion\Exception\FailedAssertionException;
use Application\Assertion\ThrowsFailedAssertionExceptionTrait;
use Application\Entity\Db\Role;
use Application\RouteMatch;
use Application\Service\UserContextServiceAwareInterface;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use These\Entity\Db\Acteur;
use These\Entity\Db\These;
use These\Provider\Privilege\ActeurPrivileges;
use These\Provider\Privilege\CoEncadrantPrivileges;
use These\Service\Acteur\ActeurServiceAwareTrait;
use These\Service\CoEncadrant\CoEncadrantServiceAwareTrait;
use These\Service\These\TheseServiceAwareTrait;
use UnicaenApp\Service\MessageCollectorAwareInterface;

@@ -21,9 +24,10 @@ class ActeurAssertion extends AbstractAssertion
    use ThrowsFailedAssertionExceptionTrait;
    use TheseServiceAwareTrait;
    use ActeurServiceAwareTrait;
    use CoEncadrantServiceAwareTrait;

    private Acteur $acteur;
    private These $these;
    private ?Acteur $acteur;
    private ?These $these;

    /**
     * @param array $page
@@ -70,12 +74,15 @@ class ActeurAssertion extends AbstractAssertion
        }

        $this->acteur = $this->getRequestedActeur();
        $this->these = $this->acteur?->getId() !== null ? $this->acteur->getThese() : $this->getRequestedThese();

        try {
            switch ($action) {
                case 'modifier':
                    $this->assertEtatThese($this->acteur->getThese());
                    $this->theseService->assertAppartenanceThese($this->acteur->getThese(), $this->userContextService);
                case 'ajouter-co-encadrant':
                case 'retirer-co-encadrant':
                    $this->assertEtatThese($this->these);
                    $this->theseService->assertAppartenanceThese($this->these, $this->userContextService);
                    break;
            }

@@ -101,13 +108,17 @@ class ActeurAssertion extends AbstractAssertion
        }

        $this->acteur = $entity;
        $this->these = $this->acteur->getId() !== null ? $this->acteur->getThese() : $this->getRequestedThese();

        try {

            switch ($privilege) {
                case ActeurPrivileges::MODIFIER_ACTEUR_SES_THESES:
                    $this->assertEtatThese($this->acteur->getThese());
                    $this->theseService->assertAppartenanceThese($this->acteur->getThese(), $this->userContextService);
                case ActeurPrivileges::MODIFIER_ACTEUR_TOUTES_THESES:
                case CoEncadrantPrivileges::COENCADRANT_GERER:
                    if($this->these){
                        $this->assertEtatThese($this->these);
                        $this->theseService->assertAppartenanceThese($this->these, $this->userContextService);
                    }
            }

        } catch (FailedAssertionException $e) {
@@ -140,6 +151,8 @@ class ActeurAssertion extends AbstractAssertion
    {
        if ($id = $this?->getRouteMatch()?->getParam('acteur')) {
            return $this->acteurService->getRepository()->find($id);
        }else if($id = $this?->getRouteMatch()?->getParam('co-encadrant')){
            return $this->coEncadrantService->getCoEncadrant($id);
        }

        return null;
+5 −0
Changes for module/These/src/These/Assertion/Acteur/ActeurAssertionFactory.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace These\Assertion\Acteur;
use Application\Assertion\AbstractAssertion;
use Psr\Container\ContainerInterface;
use These\Service\Acteur\ActeurService;
use These\Service\CoEncadrant\CoEncadrantService;
use These\Service\These\TheseService;

class ActeurAssertionFactory
@@ -26,6 +27,10 @@ class ActeurAssertionFactory
        $acteurService = $container->get(ActeurService::class);
        $assertion->setActeurService($acteurService);

        /** @var CoEncadrantService $coEncadrantService */
        $coEncadrantService = $container->get(CoEncadrantService::class);
        $assertion->setCoEncadrantService($coEncadrantService);

        $this->injectCommons($assertion, $container);

        return $assertion;
Loading