4 files changed, 35 insertions, 6 deletions

diff --git a/apps/dav/lib/Db/Absence.php b/apps/dav/lib/Db/Absence.php
index 6b6d608ffd8..d7cd46087c3 100644
--- a/apps/dav/lib/Db/Absence.php
+++ b/apps/dav/lib/Db/Absence.php
@@ -29,6 +29,10 @@ use OCP\User\IOutOfOfficeData;
  * @method void setStatus(string $status)
  * @method string getMessage()
  * @method void setMessage(string $message)
+ * @method string getReplacementUserId()
+ * @method void setReplacementUserId(?string $replacementUserId)
+ * @method string getReplacementUserDisplayName()
+ * @method void setReplacementUserDisplayName(?string $replacementUserDisplayName)
  */
 class Absence extends Entity implements JsonSerializable {
 	protected string $userId = '';
@@ -43,17 +47,23 @@ class Absence extends Entity implements JsonSerializable {
 
 	protected string $message = '';
 
+	protected ?string $replacementUserId = null;
+
+	protected ?string $replacementUserDisplayName = null;
+
 	public function __construct() {
 		$this->addType('userId', 'string');
 		$this->addType('firstDay', 'string');
 		$this->addType('lastDay', 'string');
 		$this->addType('status', 'string');
 		$this->addType('message', 'string');
+		$this->addType('replacementUserId', 'string');
+		$this->addType('replacementUserDisplayName', 'string');
 	}
 
 	public function toOutOufOfficeData(IUser $user, string $timezone): IOutOfOfficeData {
 		if ($user->getUID() !== $this->getUserId()) {
-			throw new InvalidArgumentException("The user doesn't match the user id of this absence! Expected " . $this->getUserId() . ", got " . $user->getUID());
+			throw new InvalidArgumentException("The user doesn't match the user id of this absence! Expected " . $this->getUserId() . ', got ' . $user->getUID());
 		}
 		if ($this->getId() === null) {
 			throw new Exception('Creating out-of-office data without ID');
@@ -70,6 +80,8 @@ class Absence extends Entity implements JsonSerializable {
 			$endDate->getTimestamp(),
 			$this->getStatus(),
 			$this->getMessage(),
+			$this->getReplacementUserId(),
+			$this->getReplacementUserDisplayName(),
 		);
 	}
 
@@ -80,6 +92,8 @@ class Absence extends Entity implements JsonSerializable {
 			'lastDay' => $this->lastDay,
 			'status' => $this->status,
 			'message' => $this->message,
+			'replacementUserId' => $this->replacementUserId,
+			'replacementUserDisplayName' => $this->replacementUserDisplayName,
 		];
 	}
 }
diff --git a/apps/dav/lib/Db/Direct.php b/apps/dav/lib/Db/Direct.php
index 377a120c436..4e4a12d225f 100644
--- a/apps/dav/lib/Db/Direct.php
+++ b/apps/dav/lib/Db/Direct.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 namespace OCA\DAV\Db;
 
 use OCP\AppFramework\Db\Entity;
+use OCP\DB\Types;
 
 /**
  * @method string getUserId()
@@ -34,9 +35,9 @@ class Direct extends Entity {
 	protected $expiration;
 
 	public function __construct() {
-		$this->addType('userId', 'string');
-		$this->addType('fileId', 'int');
-		$this->addType('token', 'string');
-		$this->addType('expiration', 'int');
+		$this->addType('userId', Types::STRING);
+		$this->addType('fileId', Types::INTEGER);
+		$this->addType('token', Types::STRING);
+		$this->addType('expiration', Types::INTEGER);
 	}
 }
diff --git a/apps/dav/lib/Db/DirectMapper.php b/apps/dav/lib/Db/DirectMapper.php
index 05deffdca94..4fedac35b72 100644
--- a/apps/dav/lib/Db/DirectMapper.php
+++ b/apps/dav/lib/Db/DirectMapper.php
@@ -45,6 +45,6 @@ class DirectMapper extends QBMapper {
 				$qb->expr()->lt('expiration', $qb->createNamedParameter($expiration))
 			);
 
-		$qb->execute();
+		$qb->executeStatement();
 	}
 }
diff --git a/apps/dav/lib/Db/PropertyMapper.php b/apps/dav/lib/Db/PropertyMapper.php
index a0ecb348ba4..1789194ee7a 100644
--- a/apps/dav/lib/Db/PropertyMapper.php
+++ b/apps/dav/lib/Db/PropertyMapper.php
@@ -38,4 +38,18 @@ class PropertyMapper extends QBMapper {
 		return $this->findEntities($selectQb);
 	}
 
+	/**
+	 * @return Property[]
+	 */
+	public function findPropertiesByPath(string $userId, string $path): array {
+		$selectQb = $this->db->getQueryBuilder();
+		$selectQb->select('*')
+			->from(self::TABLE_NAME)
+			->where(
+				$selectQb->expr()->eq('userid', $selectQb->createNamedParameter($userId)),
+				$selectQb->expr()->eq('propertypath', $selectQb->createNamedParameter($path)),
+			);
+		return $this->findEntities($selectQb);
+	}
+
 }