mirror of https://github.com/nextcloud/server.git
add list-calendars command
Signed-off-by: Georg Ehrke <developer@georgehrke.com> Rebase and delete URI suggestion part Invite to use occ dav:list-calendars instead Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix autoload Signed-off-by: Thomas Citharel <tcit@tcit.fr> Use injection & test everything And rebase Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add test for ListCalendars and refactoring Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix indentation Signed-off-by: Thomas Citharel <tcit@tcit.fr>pull/5881/head
Georg Ehrke
6 years ago
committed by
Thomas Citharel
parent
943d48cb3e
commit
4a2238c75b
@ -0,0 +1,108 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Georg Ehrke
|
||||
*
|
||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||
* @author Thomas Citharel <tcit@tcit.fr>
|
||||
*
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
namespace OCA\DAV\Command;
|
||||
|
||||
use OCA\DAV\CalDAV\BirthdayService;
|
||||
use OCA\DAV\CalDAV\CalDavBackend;
|
||||
use OCA\DAV\Connector\Sabre\Principal;
|
||||
use OCP\IConfig;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\IGroupManager;
|
||||
use OCP\IUserManager;
|
||||
use OCP\IUserSession;
|
||||
use OCP\Share\IManager;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Helper\Table;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
class ListCalendars extends Command {
|
||||
|
||||
/** @var IUserManager */
|
||||
protected $userManager;
|
||||
|
||||
/** @var CalDavBackend */
|
||||
private $caldav;
|
||||
|
||||
/**
|
||||
* @param IUserManager $userManager
|
||||
* @param CalDavBackend $caldav
|
||||
*/
|
||||
function __construct(IUserManager $userManager, CalDavBackend $caldav) {
|
||||
parent::__construct();
|
||||
$this->userManager = $userManager;
|
||||
$this->caldav = $caldav;
|
||||
}
|
||||
|
||||
protected function configure() {
|
||||
$this
|
||||
->setName('dav:list-calendars')
|
||||
->setDescription('List all calendars of a user')
|
||||
->addArgument('user',
|
||||
InputArgument::REQUIRED,
|
||||
'User for whom all calendars will be listed');
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
$user = $input->getArgument('user');
|
||||
if (!$this->userManager->userExists($user)) {
|
||||
throw new \InvalidArgumentException("User <$user> is unknown.");
|
||||
}
|
||||
|
||||
$calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
|
||||
|
||||
$calendarTableData = [];
|
||||
foreach($calendars as $calendar) {
|
||||
// skip birthday calendar
|
||||
if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$readOnly = false;
|
||||
$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
|
||||
if (isset($calendar[$readOnlyIndex])) {
|
||||
$readOnly = $calendar[$readOnlyIndex];
|
||||
}
|
||||
|
||||
$calendarTableData[] = [
|
||||
$calendar['uri'],
|
||||
$calendar['{DAV:}displayname'],
|
||||
$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
|
||||
$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
|
||||
$readOnly ? ' x ' : ' ✓ ',
|
||||
];
|
||||
}
|
||||
|
||||
if (count($calendarTableData) > 0) {
|
||||
$table = new Table($output);
|
||||
$table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
|
||||
->setRows($calendarTableData);
|
||||
|
||||
$table->render();
|
||||
} else {
|
||||
$output->writeln("<info>User <$user> has no calendars</info>");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,139 @@
|
||||
<?php
|
||||
/**
|
||||
* @author Thomas Citharel <tcit@tcit.fr>
|
||||
*
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\DAV\Tests\Command;
|
||||
|
||||
use InvalidArgumentException;
|
||||
use OCA\DAV\CalDAV\BirthdayService;
|
||||
use OCA\DAV\CalDAV\CalDavBackend;
|
||||
use OCA\DAV\Command\ListCalendars;
|
||||
use OCP\IUserManager;
|
||||
use Symfony\Component\Console\Tester\CommandTester;
|
||||
use Test\TestCase;
|
||||
|
||||
|
||||
/**
|
||||
* Class ListCalendarsTest
|
||||
*
|
||||
* @package OCA\DAV\Tests\Command
|
||||
*/
|
||||
class ListCalendarsTest extends TestCase {
|
||||
|
||||
/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject $userManager */
|
||||
private $userManager;
|
||||
|
||||
/** @var CalDavBackend|\PHPUnit_Framework_MockObject_MockObject $l10n */
|
||||
private $calDav;
|
||||
|
||||
/** @var ListCalendars */
|
||||
private $command;
|
||||
|
||||
const USERNAME = 'username';
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->userManager = $this->createMock(IUserManager::class);
|
||||
$this->calDav = $this->createMock(CalDavBackend::class);
|
||||
|
||||
$this->command = new ListCalendars(
|
||||
$this->userManager,
|
||||
$this->calDav
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
*/
|
||||
public function testWithBadUser()
|
||||
{
|
||||
$this->userManager->expects($this->once())
|
||||
->method('userExists')
|
||||
->with(self::USERNAME)
|
||||
->willReturn(false);
|
||||
|
||||
$commandTester = new CommandTester($this->command);
|
||||
$commandTester->execute([
|
||||
'user' => self::USERNAME,
|
||||
]);
|
||||
$this->assertContains("User <" . self::USERNAME . "> in unknown", $commandTester->getDisplay());
|
||||
}
|
||||
|
||||
public function testWithCorrectUserWithNoCalendars()
|
||||
{
|
||||
$this->userManager->expects($this->once())
|
||||
->method('userExists')
|
||||
->with(self::USERNAME)
|
||||
->willReturn(true);
|
||||
|
||||
$this->calDav->expects($this->once())
|
||||
->method('getCalendarsForUser')
|
||||
->with('principals/users/' . self::USERNAME)
|
||||
->willReturn([]);
|
||||
|
||||
$commandTester = new CommandTester($this->command);
|
||||
$commandTester->execute([
|
||||
'user' => self::USERNAME,
|
||||
]);
|
||||
$this->assertContains("User <" . self::USERNAME . "> has no calendars\n", $commandTester->getDisplay());
|
||||
}
|
||||
|
||||
public function dataExecute()
|
||||
{
|
||||
return [
|
||||
[false, '✓'],
|
||||
[true, 'x']
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider dataExecute
|
||||
*/
|
||||
public function testWithCorrectUser(bool $readOnly, string $output)
|
||||
{
|
||||
$this->userManager->expects($this->once())
|
||||
->method('userExists')
|
||||
->with(self::USERNAME)
|
||||
->willReturn(true);
|
||||
|
||||
$this->calDav->expects($this->once())
|
||||
->method('getCalendarsForUser')
|
||||
->with('principals/users/' . self::USERNAME)
|
||||
->willReturn([
|
||||
[
|
||||
'uri' => BirthdayService::BIRTHDAY_CALENDAR_URI,
|
||||
],
|
||||
[
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => $readOnly,
|
||||
'uri' => 'test',
|
||||
'{DAV:}displayname' => 'dp',
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => 'owner-principal',
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname' => 'owner-dp',
|
||||
]
|
||||
]);
|
||||
|
||||
$commandTester = new CommandTester($this->command);
|
||||
$commandTester->execute([
|
||||
'user' => self::USERNAME,
|
||||
]);
|
||||
$this->assertContains($output, $commandTester->getDisplay());
|
||||
$this->assertNotContains(BirthdayService::BIRTHDAY_CALENDAR_URI, $commandTester->getDisplay());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue