Merge pull request #22198 from owncloud/birthday-calendar

Sync a users contacts birthday to the users birthday calendar

2 files changed, 40 insertions, 5 deletions

diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php
index 28b9a833456..7a201e1dd78 100644
--- a/apps/dav/appinfo/application.php
+++ b/apps/dav/appinfo/application.php
@@ -20,6 +20,7 @@
  */
 namespace OCA\Dav\AppInfo;
 
+use OCA\DAV\CalDAV\BirthdayService;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\CardDAV\ContactsManager;
@@ -34,6 +35,7 @@ use \OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Contacts\IManager;
 use OCP\IUser;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
 
@@ -74,12 +76,12 @@ class Application extends App {
 		$container->registerService('CardDavBackend', function($c) {
 			/** @var IAppContainer $c */
 			$db = $c->getServer()->getDatabaseConnection();
-			$logger = $c->getServer()->getLogger();
+			$dispatcher = $c->getServer()->getEventDispatcher();
 			$principal = new \OCA\DAV\Connector\Sabre\Principal(
 				$c->getServer()->getUserManager(),
 				$c->getServer()->getGroupManager()
 			);
-			return new CardDavBackend($db, $principal, $logger);
+			return new CardDavBackend($db, $principal, $dispatcher);
 		});
 
 		$container->registerService('CalDavBackend', function($c) {
@@ -109,6 +111,15 @@ class Application extends App {
 				$c->query('CalDavBackend')
 			);
 		});
+
+		$container->registerService('BirthdayService', function($c) {
+			/** @var IAppContainer $c */
+			return new BirthdayService(
+				$c->query('CalDavBackend'),
+				$c->query('CardDavBackend')
+			);
+
+		});
 	}
 
 	/**
@@ -125,6 +136,30 @@ class Application extends App {
 		/** @var HookManager $hm */
 		$hm = $this->getContainer()->query('HookManager');
 		$hm->setup();
+
+		$listener = function($event) {
+			if ($event instanceof GenericEvent) {
+				$b = $this->getContainer()->query('BirthdayService');
+				$b->onCardChanged(
+					$event->getArgument('addressBookId'),
+					$event->getArgument('cardUri'),
+					$event->getArgument('cardData')
+				);
+			}
+		};
+
+		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener);
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener);
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) {
+			if ($event instanceof GenericEvent) {
+				$b = $this->getContainer()->query('BirthdayService');
+				$b->onCardDeleted(
+					$event->getArgument('addressBookId'),
+					$event->getArgument('cardUri')
+				);
+			}
+		});
 	}
 
 	public function getSyncService() {
diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php
index 4981cab9264..e07f6b4a25b 100644
--- a/apps/dav/appinfo/register_command.php
+++ b/apps/dav/appinfo/register_command.php
@@ -24,21 +24,21 @@ use OCA\DAV\Command\CreateAddressBook;
 use OCA\DAV\Command\CreateCalendar;
 use OCA\Dav\Command\MigrateAddressbooks;
 use OCA\Dav\Command\MigrateCalendars;
+use OCA\DAV\Command\SyncBirthdayCalendar;
 use OCA\DAV\Command\SyncSystemAddressBook;
 
-$config = \OC::$server->getConfig();
 $dbConnection = \OC::$server->getDatabaseConnection();
 $userManager = OC::$server->getUserManager();
 $groupManager = OC::$server->getGroupManager();
 $config = \OC::$server->getConfig();
-$logger = \OC::$server->getLogger();
 
 $app = new Application();
 
 /** @var Symfony\Component\Console\Application $application */
-$application->add(new CreateAddressBook($userManager, $groupManager, $dbConnection, $logger));
 $application->add(new CreateCalendar($userManager, $groupManager, $dbConnection));
+$application->add(new CreateAddressBook($userManager, $app->getContainer()->query('CardDavBackend')));
 $application->add(new SyncSystemAddressBook($app->getSyncService()));
+$application->add(new SyncBirthdayCalendar($userManager, $app->getContainer()->query('BirthdayService')));
 
 // the occ tool is *for now* only available in debug mode for developers to test
 if ($config->getSystemValue('debug', false)){