fix(caldav): Expand recurring events for principal calendar search

Assisted-by: Claude:claude-sonnet-4-6

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

Author: kesselb

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -2316,6 +2316,11 @@ public function searchPrincipalUri(string $principalUri,
 			$calendarOr = [];
 			$searchOr = [];
 
+			$start = null;
+			$end = null;
+
+			// Todo: The retries when $hasLimit && $hasTimeRange from https://github.com/nextcloud/server/pull/45222 should also be applied here to the calendarObjectIdQuery
+
 			// Fetch calendars and subscription
 			$calendars = $this->getCalendarsForUser($principalUri);
 			$subscriptions = $this->getSubscriptionsForUser($principalUri);
@@ -2394,19 +2399,21 @@ public function searchPrincipalUri(string $principalUri,
 			if (isset($options['offset'])) {
 				$calendarObjectIdQuery->setFirstResult($options['offset']);
 			}
-			if (isset($options['timerange'])) {
-				if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTimeInterface) {
-					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->gt(
-						'lastoccurence',
-						$calendarObjectIdQuery->createNamedParameter($options['timerange']['start']->getTimeStamp()),
-					));
-				}
-				if (isset($options['timerange']['end']) && $options['timerange']['end'] instanceof DateTimeInterface) {
-					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->lt(
-						'firstoccurence',
-						$calendarObjectIdQuery->createNamedParameter($options['timerange']['end']->getTimeStamp()),
-					));
-				}
+			if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTimeInterface) {
+				/** @var DateTimeInterface $start */
+				$start = $options['timerange']['start'];
+				$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->gt(
+					'lastoccurence',
+					$calendarObjectIdQuery->createNamedParameter($start->getTimestamp()),
+				));
+			}
+			if (isset($options['timerange']['end']) && $options['timerange']['end'] instanceof DateTimeInterface) {
+				/** @var DateTimeInterface $end */
+				$end = $options['timerange']['end'];
+				$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->lt(
+					'firstoccurence',
+					$calendarObjectIdQuery->createNamedParameter($end->getTimestamp()),
+				));
 			}
 
 			$result = $calendarObjectIdQuery->executeQuery();
@@ -2421,17 +2428,22 @@ public function searchPrincipalUri(string $principalUri,
 				->from('calendarobjects')
 				->where($query->expr()->in('id', $query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY)));
 
-			$result = $query->executeQuery();
-			$calendarObjects = [];
-			while (($array = $result->fetchAssociative()) !== false) {
-				$array['calendarid'] = (int)$array['calendarid'];
-				$array['calendartype'] = (int)$array['calendartype'];
-				$array['calendardata'] = $this->readBlob($array['calendardata']);
+			$calendarObjects = $this->searchCalendarObjects($query, $start, $end);
 
-				$calendarObjects[] = $array;
-			}
-			$result->closeCursor();
-			return $calendarObjects;
+			return array_map(function ($event) use ($start, $end) {
+				$calendarData = Reader::read($event['calendardata']);
+
+				// Expand recurrences if an explicit time range is requested
+				if ($calendarData instanceof VCalendar && isset($start, $end)) {
+					$calendarData = $calendarData->expand($start, $end);
+				}
+
+				$event['calendardata'] = $calendarData->serialize();
+				$event['calendarid'] = (int)$event['calendarid'];
+				$event['calendartype'] = (int)$event['calendartype'];
+
+				return $event;
+			}, $calendarObjects);
 		}, $this->db);
 	}
 

apps/dav/lib/Search/EventsSearchProvider.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\DAV\Search;
 
+use DateTimeImmutable;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\IUser;
 use OCP\Search\IFilteringProvider;
@@ -100,6 +101,20 @@ public function search(
 
 		/** @var string|null $term */
 		$term = $query->getFilter('term')?->get();
+
+		$since = $query->getFilter('since')?->get();
+		$until = $query->getFilter('until')?->get();
+
+		if ($since !== null && $until === null) {
+			$until = new DateTimeImmutable('now', new \DateTimeZone('Z'));
+		}
+
+		/** @var array{start: DateTimeImmutable, end: DateTimeImmutable} $timeRange */
+		$timeRange = [
+			'start' => $since,
+			'end' => $until,
+		];
+
 		if ($term === null) {
 			$searchResults = [];
 		} else {
@@ -112,10 +127,7 @@ public function search(
 				[
 					'limit' => $query->getLimit(),
 					'offset' => $query->getCursor(),
-					'timerange' => [
-						'start' => $query->getFilter('since')?->get(),
-						'end' => $query->getFilter('until')?->get(),
-					],
+					'timerange' => $timeRange,
 				]
 			);
 		}
@@ -132,10 +144,7 @@ public function search(
 				[
 					'limit' => $query->getLimit(),
 					'offset' => $query->getCursor(),
-					'timerange' => [
-						'start' => $query->getFilter('since')?->get(),
-						'end' => $query->getFilter('until')?->get(),
-					],
+					'timerange' => $timeRange,
 				],
 			);