From a9774741e815c02a9f5973bf6477a7c9da653732 Mon Sep 17 00:00:00 2001 From: Hamza Mahjoubi Date: Mon, 10 Jun 2024 16:30:53 +0200 Subject: Feat: Allow users to select another user as their out-of-office replacement Signed-off-by: Hamza Mahjoubi --- apps/dav/lib/Controller/OutOfOfficeController.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'apps/dav/lib/Controller') diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php index b127c5c3cd3..b77b77f4b5e 100644 --- a/apps/dav/lib/Controller/OutOfOfficeController.php +++ b/apps/dav/lib/Controller/OutOfOfficeController.php @@ -93,6 +93,8 @@ class OutOfOfficeController extends OCSController { 'lastDay' => $data->getLastDay(), 'status' => $data->getStatus(), 'message' => $data->getMessage(), + 'replacementUserId' => $data->getReplacementUserId(), + 'replacementUserDisplayName' => $data->getReplacementUserDisplayName(), ]); } @@ -103,11 +105,14 @@ class OutOfOfficeController extends OCSController { * @param string $lastDay Last day of the absence in format `YYYY-MM-DD` * @param string $status Short text that is set as user status during the absence * @param string $message Longer multiline message that is shown to others during the absence - * @return DataResponse|DataResponse|DataResponse + * @param string $replacementUserId User id of the replacement user + * @param string $replacementUserDisplayName Display name of the replacement user + * @return DataResponse|DataResponse|DataResponse|DataResponse * * 200: Absence data * 400: When the first day is not before the last day * 401: When the user is not logged in + * 404: When the replacementUserId was provided but replacement user was not found */ #[NoAdminRequired] public function setOutOfOffice( @@ -115,12 +120,22 @@ class OutOfOfficeController extends OCSController { string $lastDay, string $status, string $message, + string $replacementUserId = '', + string $replacementUserDisplayName = '' + ): DataResponse { $user = $this->userSession?->getUser(); if ($user === null) { return new DataResponse(null, Http::STATUS_UNAUTHORIZED); } + if ($replacementUserId !== '') { + $replacementUser = $this->userManager->get($replacementUserId); + if ($replacementUser === null) { + return new DataResponse(null, Http::STATUS_NOT_FOUND); + } + } + $parsedFirstDay = new DateTimeImmutable($firstDay); $parsedLastDay = new DateTimeImmutable($lastDay); if ($parsedFirstDay->getTimestamp() > $parsedLastDay->getTimestamp()) { @@ -133,6 +148,8 @@ class OutOfOfficeController extends OCSController { $lastDay, $status, $message, + $replacementUserId, + $replacementUserDisplayName ); $this->coordinator->clearCache($user->getUID()); @@ -143,6 +160,8 @@ class OutOfOfficeController extends OCSController { 'lastDay' => $data->getLastDay(), 'status' => $data->getStatus(), 'message' => $data->getMessage(), + 'replacementUserId' => $data->getReplacementUserId(), + 'replacementUserDisplayName' => $data->getReplacementUserDisplayName(), ]); } -- cgit v1.2.3