chore

Author: tchapi

src/Controller/DAVController.php

@@ -282,7 +282,7 @@ private function initServer(string $authMethod, string $authRealm = User::DEFAUL
         }
 
         if ($this->cardDAVEnabled && $this->calDAVEnabled) {
-            $this->server->addPlugin(new BirthdayCalendarPlugin($this->birthdayService));
+            $this->server->addPlugin(new BirthdayCalendarPlugin($this->birthdayService, $calendarBackend));
         }
 
         // WebDAV plugins

src/Entity/CalendarChange.php

@@ -24,7 +24,7 @@ class CalendarChange
     private $calendar;
 
     #[ORM\Column(type: 'smallint')]
-    private $operation;
+    private $operation;  // 1 = create, 2 = update, 3 = delete
 
     public function getId(): ?int
     {

src/Plugins/BirthdayCalendarPlugin.php

@@ -39,48 +39,56 @@ public function initialize(DAV\Server $server)
         $server->on('beforeUnbind', [$this, 'beforeCardDelete']);
     }
 
-    private function resyncCurrentPrincipal()
+    public function afterCardCreate(string $path, DAV\ICollection $parentNode): void
     {
-        $authPlugin = $this->server->getPlugin('auth');
-
-        if (!$authPlugin) {
-            return null;
-        }
-
-        $principal = $authPlugin->getCurrentPrincipal();
-
-        if ($principal) {
-            $this->birthdayService->syncPrincipal($principal);
+        if (!$parentNode instanceof CardDAV\AddressBook) {
+            return;
         }
+        $this->handleCardChange($path, $parentNode);
     }
 
-    public function afterCardCreate($path, DAV\ICollection $parentNode)
+    public function afterCardUpdate(string $path, DAV\IFile $node): void
     {
-        if (!$parentNode instanceof CardDAV\IAddressBook) {
+        if (!$node instanceof CardDAV\ICard) {
             return;
         }
+        $parentPath = dirname($path);
+        $parentNode = $this->server->tree->getNodeForPath($parentPath);
 
-        $principal = $this->resyncCurrentPrincipal();
-    }
-
-    public function afterCardUpdate($path, DAV\IFile $node)
-    {
-        if (!$node instanceof CardDAV\ICard) {
+        if (!$parentNode instanceof CardDAV\AddressBook) {
             return;
         }
 
-        $principal = $this->resyncCurrentPrincipal();
+        $this->handleCardChange($path, $parentNode);
     }
 
-    public function beforeCardDelete($path)
+    public function beforeCardDelete(string $path): void
     {
         $node = $this->server->tree->getNodeForPath($path);
 
         if (!$node instanceof CardDAV\ICard) {
             return;
         }
 
-        $principal = $this->resyncCurrentPrincipal();
+        $parentPath = dirname($path);
+        $parentNode = $this->server->tree->getNodeForPath($parentPath);
+
+        if (!$parentNode instanceof CardDAV\AddressBook) {
+            return;
+        }
+
+        $addressBookId = $parentNode->getProperties(['id'])['id'];
+
+        $this->birthdayService->onCardDeleted($addressBookId, basename($path));
+    }
+
+    private function handleCardChange(string $path, CardDAV\AddressBook $parentNode): void
+    {
+        $cardUri = basename($path);
+        $addressBookId = $parentNode->getProperties(['id'])['id'];
+        $cardNode = $this->server->tree->getNodeForPath($path);
+
+        $this->birthdayService->onCardChanged($addressBookId, $cardUri, $cardNode->get());
     }
 
     public function getPluginName(): string

src/Services/BirthdayService.php

@@ -20,6 +20,7 @@
 use App\Entity\Principal;
 use Doctrine\Persistence\ManagerRegistry;
 use Sabre\DAV\Sharing\Plugin as SharingPlugin;
+use Sabre\CalDAV\Backend\PDO as CalendarBackend;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\DateTimeParser;
@@ -33,6 +34,7 @@ class BirthdayService
     public function __construct(
         private ManagerRegistry $doctrine,
         private string $birthdayReminderOffset,
+        private CalendarBackend $calendarBackend,
     ) {
     }
 
@@ -62,11 +64,11 @@ public function onCardDeleted(int $addressBookId, string $cardUri): void
         $calendar = $this->ensureBirthdayCalendarExists($principalUri);
 
         $objectUri = $book->getUri().'-'.$cardUri.'.ics';
-        $calendarObject = $this->doctrine->getRepository(CalendarObject::class)->findOneBy(['calendar' => $calendar, 'uri' => $objectUri]);
 
-        $em = $this->doctrine->getManager();
-        $em->remove($calendarObject);
-        $em->flush();
+        $this->calendarBackend->deleteCalendarObject(
+            $calendar->getCalendar()->getId(),
+            $objectUri
+        );
     }
 
     public function shouldBirthdayCalendarExist(string $principalUri): bool
@@ -290,7 +292,7 @@ public function syncPrincipal(string $principal): void
         }
     }
 
-    public function birthdayEvenChanged(string $existingCalendarData, VCalendar $newCalendarData): bool
+    public function birthdayEventChanged(string $existingCalendarData, VCalendar $newCalendarData): bool
     {
         try {
             $existingBirthday = Reader::read($existingCalendarData);
@@ -315,44 +317,29 @@ private function updateCalendar(string $cardUri, string $cardData, AddressBook $
 
         $existing = $this->doctrine->getRepository(CalendarObject::class)->findOneBy(['calendar' => $calendar, 'uri' => $objectUri]);
 
-        $em = $this->doctrine->getManager();
-
         if (null === $calendarData) {
             if (null !== $existing) {
-                $em->remove($existing);
+                $this->calendarBackend->deleteCalendarObject(
+                    $calendar->getId(),
+                    $objectUri
+                );
             }
         } else {
-            $serializedCalendarData = $calendarData->serialize();
-            $vEvent = $calendarData->getComponents()[0];
-            $maxDate = new \DateTime(Constants::MAX_DATE);
-
             if (null === $existing) {
-                $calendarObject = (new CalendarObject())
-                            ->setCalendar($calendar)
-                            ->setUri($objectUri)
-                            ->setComponentType('VEVENT')
-                            ->setUid($objectUid)
-                            ->setLastModified((new \DateTime())->getTimestamp())
-                            ->setFirstOccurence($vEvent->DTSTART->getDateTime()->getTimeStamp())
-                            ->setLastOccurence($maxDate->getTimestamp())
-                            ->setEtag(md5($serializedCalendarData))
-                            ->setSize(strlen($serializedCalendarData))
-                            ->setCalendarData($serializedCalendarData);
-
-                $em->persist($calendarObject);
+                $this->calendarBackend->createCalendarObject(
+                    $calendar->getId(),
+                    $objectUri,
+                    $calendarData
+                );
             } else {
-                if ($this->birthdayEvenChanged($existing->getCalendarData(), $calendarData)) {
-                    $existing
-                        ->setLastModified((new \DateTime())->getTimestamp())
-                        ->setFirstOccurence($vEvent->DTSTART->getDateTime()->getTimeStamp())
-                        ->setLastOccurence($maxDate->getTimestamp())
-                        ->setEtag(md5($serializedCalendarData))
-                        ->setSize(strlen($serializedCalendarData))
-                        ->setCalendarData($serializedCalendarData);
+                if ($this->birthdayEventChanged($existing->getCalendarData(), $calendarData)) {
+                    $this->calendarBackend->updateCalendarObject(
+                        $calendar->getId(),
+                        $objectUri,
+                        $calendarData
+                    );
                 }
             }
         }
-
-        $em->flush();
     }
 }