From f7a4b441361404b378c30b7788b3699c208537ad Mon Sep 17 00:00:00 2001 From: Nicolas Hart Date: Mon, 31 Jul 2017 23:20:41 +0200 Subject: add search argument and limit option to list users command --- .../CoreBundle/Command/ListUserCommand.php | 22 ++++++++++++++++++++-- .../UserBundle/Repository/UserRepository.php | 13 +++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Command/ListUserCommand.php b/src/Wallabag/CoreBundle/Command/ListUserCommand.php index 852e93b7..20660d18 100644 --- a/src/Wallabag/CoreBundle/Command/ListUserCommand.php +++ b/src/Wallabag/CoreBundle/Command/ListUserCommand.php @@ -3,7 +3,9 @@ namespace Wallabag\CoreBundle\Command; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; @@ -15,6 +17,8 @@ class ListUserCommand extends ContainerAwareCommand ->setName('wallabag:user:list') ->setDescription('List all 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); - $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 = []; foreach ($users as $user) { @@ -36,7 +47,14 @@ class ListUserCommand extends ContainerAwareCommand $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; } diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php index 75cbeef2..be693d3b 100644 --- a/src/Wallabag/UserBundle/Repository/UserRepository.php +++ b/src/Wallabag/UserBundle/Repository/UserRepository.php @@ -55,6 +55,19 @@ class UserRepository extends EntityRepository ->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. * -- cgit v1.2.3