Merge pull request #27508 from nextcloud/fix/noid/caldav-trash-filter-deleted-calendar

Skip deleted calendar objects of deleted calendars

Author: kesselb

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -1098,14 +1098,23 @@ public function getDeletedCalendarObjects(int $deletedBefore): array {
 		return $result;
 	}
 
+	/**
+	 * Return all deleted calendar objects by the given principal that are not
+	 * in deleted calendars.
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 * @throws \OCP\DB\Exception
+	 */
 	public function getDeletedCalendarObjectsByPrincipal(string $principalUri): array {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['co.id', 'co.uri', 'co.lastmodified', 'co.etag', 'co.calendarid', 'co.size', 'co.componenttype', 'co.classification', 'co.deleted_at'])
 			->selectAlias('c.uri', 'calendaruri')
 			->from('calendarobjects', 'co')
 			->join('co', 'calendars', 'c', $query->expr()->eq('c.id', 'co.calendarid', IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->isNotNull('co.deleted_at'));
+			->andWhere($query->expr()->isNotNull('co.deleted_at'))
+			->andWhere($query->expr()->isNull('c.deleted_at'));
 		$stmt = $query->executeQuery();
 
 		$result = [];