chore

Author: tchapi

src/Controller/Admin/CalendarController.php

@@ -252,11 +252,17 @@ public function calendarDelete(ManagerRegistry $doctrine, int $userId, string $i
             $entityManager->remove($subscription);
         }
 
+        // Scheduling objects attached to the principal
         $schedulingObjects = $doctrine->getRepository(SchedulingObject::class)->findByPrincipalUri($instance->getPrincipalUri());
         foreach ($schedulingObjects ?? [] as $object) {
             $entityManager->remove($object);
         }
-
+        
+        // Scheduling objects attached to the calendar objects of the calendar
+        $schedulingObjectsOfCalendarObjects = $doctrine->getRepository(CalendarInstance::class)->findAllSchedulingObjectsForCalendar($instance->getId());
+        foreach ($schedulingObjectsOfCalendarObjects ?? [] as $object) {
+            $entityManager->remove($object);
+        }
         foreach ($instance->getCalendar()->getObjects() ?? [] as $object) {
             $entityManager->remove($object);
         }

src/Plugins/PublicAwareDAVACLPlugin.php

@@ -48,6 +48,10 @@ public function getAcl($node): array
         $acl = parent::getAcl($node);
 
         if ($this->public_calendars_enabled) {
+            // We have nothing to handle here, but SchedulingObject extends Calendar so we bail out early
+            if ($node instanceof \Sabre\CalDAV\SchedulingObject) {
+                return $acl;
+            }
             // Handle both Calendar AND SharedCalendar (which extends Calendar)
             if ($node instanceof \Sabre\CalDAV\Calendar || $node instanceof \Sabre\CalDAV\CalendarObject) {
                 // The property is private in \Sabre\CalDAV\CalendarObject and we don't want to create

src/Repository/CalendarInstanceRepository.php

@@ -74,6 +74,19 @@ public function hasDifferentOwner(int $calendarId, string $principalUri): bool
             ->getSingleScalarResult() > 0;
     }
 
+    public function findAllSchedulingObjectsForCalendar(int $calendarId): array
+    {
+        $objectRepository = $this->getEntityManager()->getRepository(\App\Entity\SchedulingObject::class);
+
+        return $objectRepository->createQueryBuilder('s')
+            ->leftJoin(CalendarObject::class, 'c', \Doctrine\ORM\Query\Expr\Join::WITH, 'c.uri = s.uri')
+            ->where('c.calendarid = :id')
+            ->andWhere('s.principaluri = :principalUri')
+            ->setParameter('id', $calendarId)
+            ->getQuery()
+            ->getResult();
+    }
+
     /**
      * Get counts of calendar objects by component type for a calendar instance.
      *