mirror of
https://github.com/wallabag/wallabag.git
synced 2025-01-09 16:35:27 +00:00
add search argument and limit option to list users command
This commit is contained in:
parent
af31cfed76
commit
f7a4b44136
3 changed files with 83 additions and 3 deletions
|
@ -3,7 +3,9 @@
|
||||||
namespace Wallabag\CoreBundle\Command;
|
namespace Wallabag\CoreBundle\Command;
|
||||||
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
|
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
|
||||||
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Input\InputOption;
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
|
||||||
|
@ -15,6 +17,8 @@ class ListUserCommand extends ContainerAwareCommand
|
||||||
->setName('wallabag:user:list')
|
->setName('wallabag:user:list')
|
||||||
->setDescription('List all users')
|
->setDescription('List all users')
|
||||||
->setHelp('This command list all existing users')
|
->setHelp('This command list all existing users')
|
||||||
|
->addArgument('search', InputArgument::OPTIONAL, 'Filter list by given search term')
|
||||||
|
->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Max number of displayed users', 100)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +26,14 @@ class ListUserCommand extends ContainerAwareCommand
|
||||||
{
|
{
|
||||||
$io = new SymfonyStyle($input, $output);
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
$users = $this->getContainer()->get('wallabag_user.user_repository')->findAll();
|
$users = $this->getContainer()->get('wallabag_user.user_repository')
|
||||||
|
->getQueryBuilderForSearch($input->getArgument('search'))
|
||||||
|
->setMaxResults($input->getOption('limit'))
|
||||||
|
->getQuery()
|
||||||
|
->getResult();
|
||||||
|
|
||||||
|
$nbUsers = $this->getContainer()->get('wallabag_user.user_repository')
|
||||||
|
->getSumUsers();
|
||||||
|
|
||||||
$rows = [];
|
$rows = [];
|
||||||
foreach ($users as $user) {
|
foreach ($users as $user) {
|
||||||
|
@ -36,7 +47,14 @@ class ListUserCommand extends ContainerAwareCommand
|
||||||
|
|
||||||
$io->table(['username', 'email', 'is enabled?', 'is admin?'], $rows);
|
$io->table(['username', 'email', 'is enabled?', 'is admin?'], $rows);
|
||||||
|
|
||||||
$io->success(sprintf('%s user(s) displayed.', count($users)));
|
$io->success(
|
||||||
|
sprintf(
|
||||||
|
'%s/%s%s user(s) displayed.',
|
||||||
|
count($users),
|
||||||
|
$nbUsers,
|
||||||
|
$input->getArgument('search') === null ? '' : ' (filtered)'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,19 @@ class UserRepository extends EntityRepository
|
||||||
->getSingleScalarResult();
|
->getSingleScalarResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count how many users are existing.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getSumUsers()
|
||||||
|
{
|
||||||
|
return $this->createQueryBuilder('u')
|
||||||
|
->select('count(u)')
|
||||||
|
->getQuery()
|
||||||
|
->getSingleScalarResult();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves users filtered with a search term.
|
* Retrieves users filtered with a search term.
|
||||||
*
|
*
|
||||||
|
|
|
@ -21,6 +21,55 @@ class ListUserCommandTest extends WallabagCoreTestCase
|
||||||
'command' => $command->getName(),
|
'command' => $command->getName(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->assertContains('3 user(s) displayed.', $tester->getDisplay());
|
$this->assertContains('3/3 user(s) displayed.', $tester->getDisplay());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRunListUserCommandWithLimit()
|
||||||
|
{
|
||||||
|
$application = new Application($this->getClient()->getKernel());
|
||||||
|
$application->add(new ListUserCommand());
|
||||||
|
|
||||||
|
$command = $application->find('wallabag:user:list');
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute([
|
||||||
|
'command' => $command->getName(),
|
||||||
|
'--limit' => 2,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertContains('2/3 user(s) displayed.', $tester->getDisplay());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRunListUserCommandWithSearch()
|
||||||
|
{
|
||||||
|
$application = new Application($this->getClient()->getKernel());
|
||||||
|
$application->add(new ListUserCommand());
|
||||||
|
|
||||||
|
$command = $application->find('wallabag:user:list');
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute([
|
||||||
|
'command' => $command->getName(),
|
||||||
|
'search' => 'boss',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertContains('1/3 (filtered) user(s) displayed.', $tester->getDisplay());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRunListUserCommandWithSearchAndLimit()
|
||||||
|
{
|
||||||
|
$application = new Application($this->getClient()->getKernel());
|
||||||
|
$application->add(new ListUserCommand());
|
||||||
|
|
||||||
|
$command = $application->find('wallabag:user:list');
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute([
|
||||||
|
'command' => $command->getName(),
|
||||||
|
'search' => 'bo',
|
||||||
|
'--limit' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertContains('1/3 (filtered) user(s) displayed.', $tester->getDisplay());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue