cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [command:fastUserEnrolment] Better parsing of options and removed test instructions

develop-unstable
Sami Mokaddem 2023-01-18 10:00:55 +01:00
parent f36f33e7cf
commit ee6913d7f0
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Command/FastUserEnrolmentCommand.php
View File

@ -34,7 +34,7 @@ class FastUserEnrolmentCommand extends Command
'default' => 'member', 'default' => 'member',
]); ]);
$parser->addOption('individual_email_column', [ $parser->addOption('individual_email_column', [
'short' => 'e', 'short' => 'i',
'help' => 'The name of the column to find the individual email address', 'help' => 'The name of the column to find the individual email address',
'default' => 'Email', 'default' => 'Email',
]); ]);
@ -50,6 +50,7 @@ class FastUserEnrolmentCommand extends Command
'default' => false, 'default' => false,
]); ]);
$parser->addOption('role_id', [ $parser->addOption('role_id', [
'short' => 'r',
'help' => 'The role to assign to the user', 'help' => 'The role to assign to the user',
]); ]);
$parser->addOption('yes', [ $parser->addOption('yes', [
@ -69,7 +70,7 @@ class FastUserEnrolmentCommand extends Command
$this->individual_email_column = $args->getOption('individual_email_column'); $this->individual_email_column = $args->getOption('individual_email_column');
$this->organisation_name_column = $args->getOption('organisation_name_column'); $this->organisation_name_column = $args->getOption('organisation_name_column');
$this->create_user = $args->getOption('create_user'); $this->create_user = $args->getOption('create_user');
$this->role_id = $args->getArgument('role_id'); $this->role_id = $args->getOption('role_id');
$this->autoYes = $args->getOption('yes'); $this->autoYes = $args->getOption('yes');
$alignmentTable = $this->modelClass; $alignmentTable = $this->modelClass;
@ -93,11 +94,12 @@ class FastUserEnrolmentCommand extends Command
if ($this->create_user) { if ($this->create_user) {
$this->loadModel('Users'); $this->loadModel('Users');
if (is_null($this->role_id)) { if (is_null($this->role_id)) {
$defaultRole = $this->Users->Roles->find()->select(['id'])->where(['is_default' => true])->first()->toArray(); $defaultRole = $this->Users->Roles->find()->select(['id'])->where(['is_default' => true])->first();
if (empty($defaultRole)) { if (empty($defaultRole)) {
$this->io->error(__('No default role available. Create a defaul role or provide the role ID to be assigned.')); $this->io->error(__('No default role available. Create a default role or provide the role ID to be assigned.'));
die(1); die(1);
} }
$defaultRole = $defaultRole->toArray();
if (!empty($defaultRole['perm_admin'])) { if (!empty($defaultRole['perm_admin'])) {
$selection = $io->askChoice('The default role has the `admin` permission. Confirm giving the admin permission to users to be enrolled.', ['Y', 'N'], 'N'); $selection = $io->askChoice('The default role has the `admin` permission. Confirm giving the admin permission to users to be enrolled.', ['Y', 'N'], 'N');
if ($selection != 'Y') { if ($selection != 'Y') {
@ -171,9 +173,6 @@ class FastUserEnrolmentCommand extends Command
{ {
$entities = []; $entities = [];
foreach ($alignmentEntities as $alignmentEntity) { foreach ($alignmentEntities as $alignmentEntity) {
if ($alignmentEntity->individual_email != 'Lionel.Ferette@cert.be') {
continue;
}
$entity = $this->Users->newEntity([ $entity = $this->Users->newEntity([
'individual_id' => $alignmentEntity->individual_id, 'individual_id' => $alignmentEntity->individual_id,
'organisation_id' => $alignmentEntity->organisation_id, 'organisation_id' => $alignmentEntity->organisation_id,