-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
generate birthday calendars in a background job after admin enabled them
Signed-off-by: Georg Ehrke <[email protected]>
- Loading branch information
1 parent
a87d986
commit 2b51d84
Showing
7 changed files
with
277 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2017 Georg Ehrke <[email protected]> | ||
| * | ||
| * @author Georg Ehrke <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * 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 | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OCA\DAV\BackgroundJob; | ||
|
|
||
| use OC\BackgroundJob\QueuedJob; | ||
| use OCA\DAV\CalDAV\BirthdayService; | ||
| use OCP\IConfig; | ||
|
|
||
| class GenerateBirthdayCalendarBackgroundJob extends QueuedJob { | ||
|
|
||
| /** @var BirthdayService */ | ||
| private $birthdayService; | ||
|
|
||
| /** @var IConfig */ | ||
| private $config; | ||
|
|
||
| /** | ||
| * GenerateAllBirthdayCalendarsBackgroundJob constructor. | ||
| * | ||
| * @param BirthdayService $birthdayService | ||
| * @param IConfig $config | ||
| */ | ||
| public function __construct(BirthdayService $birthdayService, | ||
| IConfig $config) { | ||
| $this->birthdayService = $birthdayService; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| /** | ||
| * @param array $arguments | ||
| */ | ||
| public function run($arguments) { | ||
| $userId = $arguments['userId']; | ||
|
|
||
| // make sure admin didn't change his mind | ||
| $isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'); | ||
| if ($isGloballyEnabled !== 'yes') { | ||
| return; | ||
| } | ||
|
|
||
| // did the user opt out? | ||
| $isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes'); | ||
| if ($isUserEnabled !== 'yes') { | ||
| return; | ||
| } | ||
|
|
||
| $this->birthdayService->syncUser($userId); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2017, Georg Ehrke | ||
| * | ||
| * @author Georg Ehrke <[email protected]> | ||
| * | ||
| * @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\unit\BackgroundJob; | ||
|
|
||
| use OCA\DAV\BackgroundJob\GenerateBirthdayCalendarBackgroundJob; | ||
| use OCA\DAV\CalDAV\BirthdayService; | ||
| use OCA\DAV\CalDAV\CalDavBackend; | ||
| use OCA\DAV\CalDAV\CalendarHome; | ||
| use OCP\IConfig; | ||
| use Sabre\DAV\MkCol; | ||
| use Test\TestCase; | ||
|
|
||
| class GenerateBirthdayCalendarBackgroundJobTest extends TestCase { | ||
|
|
||
| /** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject */ | ||
| private $birthdayService; | ||
|
|
||
| /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | ||
| private $config; | ||
|
|
||
| /** @var \OCA\DAV\BackgroundJob\GenerateBirthdayCalendarBackgroundJob */ | ||
| private $backgroundJob; | ||
|
|
||
| protected function setUp() { | ||
| parent::setUp(); | ||
|
|
||
| $this->birthdayService = $this->createMock(BirthdayService::class); | ||
| $this->config = $this->createMock(IConfig::class); | ||
|
|
||
| $this->backgroundJob = new GenerateBirthdayCalendarBackgroundJob( | ||
| $this->birthdayService, $this->config); | ||
| } | ||
|
|
||
| public function testRun() { | ||
| $this->config->expects($this->once()) | ||
| ->method('getAppValue') | ||
| ->with('dav', 'generateBirthdayCalendar', 'yes') | ||
| ->will($this->returnValue('yes')); | ||
|
|
||
| $this->config->expects($this->once()) | ||
| ->method('getUserValue') | ||
| ->with('user123', 'dav', 'generateBirthdayCalendar', 'yes') | ||
| ->will($this->returnValue('yes')); | ||
|
|
||
| $this->birthdayService->expects($this->once()) | ||
| ->method('syncUser') | ||
| ->with('user123'); | ||
|
|
||
| $this->backgroundJob->run(['userId' => 'user123']); | ||
| } | ||
|
|
||
| public function testRunGloballyDisabled() { | ||
| $this->config->expects($this->once()) | ||
| ->method('getAppValue') | ||
| ->with('dav', 'generateBirthdayCalendar', 'yes') | ||
| ->will($this->returnValue('no')); | ||
|
|
||
| $this->config->expects($this->never()) | ||
| ->method('getUserValue'); | ||
|
|
||
| $this->birthdayService->expects($this->never()) | ||
| ->method('syncUser'); | ||
|
|
||
| $this->backgroundJob->run(['userId' => 'user123']); | ||
| } | ||
|
|
||
| public function testRunUserDisabled() { | ||
| $this->config->expects($this->once()) | ||
| ->method('getAppValue') | ||
| ->with('dav', 'generateBirthdayCalendar', 'yes') | ||
| ->will($this->returnValue('yes')); | ||
|
|
||
| $this->config->expects($this->once()) | ||
| ->method('getUserValue') | ||
| ->with('user123', 'dav', 'generateBirthdayCalendar', 'yes') | ||
| ->will($this->returnValue('no')); | ||
|
|
||
| $this->birthdayService->expects($this->never()) | ||
| ->method('syncUser'); | ||
|
|
||
| $this->backgroundJob->run(['userId' => 'user123']); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters