fixup! feat: Calendar Import

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -2424,14 +2424,19 @@ public function searchPrincipalUri(string $principalUri,
 	 * @param string $uid
 	 * @return string|null
 	 */
-	public function getCalendarObjectByUID($principalUri, $uid) {
+	public function getCalendarObjectByUID($principalUri, $uid, $calendarUri = null) {
 		$query = $this->db->getQueryBuilder();
 		$query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
 			->from('calendarobjects', 'co')
 			->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
 			->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
 			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
 			->andWhere($query->expr()->isNull('co.deleted_at'));
+
+		if ($calendarUri !== null) {
+			$query->andWhere($query->expr()->eq('c.uri', $query->createNamedParameter($calendarUri)));
+		}
+
 		$stmt = $query->executeQuery();
 		$row = $stmt->fetch();
 		$stmt->closeCursor();

apps/dav/lib/CalDAV/Import/ImportService.php

@@ -219,6 +219,7 @@ private function findTimeZones(VCalendar $vObject): array {
 	 */
 	public function importProcess(CalendarImpl $calendar, CalendarImportOptions $options, callable $generator): array {
 		$calendarId = $calendar->getKey();
+		$calendarUri = $calendar->getUri();
 		$principalUri = $calendar->getPrincipalUri();
 		$outcome = [];
 		foreach ($generator() as $vObject) {
@@ -269,7 +270,7 @@ public function importProcess(CalendarImpl $calendar, CalendarImportOptions $opt
 				}
 			}
 			// create or update object in the data store
-			$objectId = $this->backend->getCalendarObjectByUID($principalUri, $uid);
+			$objectId = $this->backend->getCalendarObjectByUID($principalUri, $uid, $calendarUri);
 			$objectData = $vObject->serialize();
 			try {
 				if ($objectId === null) {