fix(dav): don't schedule out-of-office jobs for dates in the past

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
nextcloud · Nov 28, 2023 · ba72471 · ba72471
1 parent 699ee7a
commit ba72471
Show file tree

Hide file tree

Showing 2 changed files with 492 additions and 20 deletions.
diff --git a/apps/dav/lib/Service/AbsenceService.php b/apps/dav/lib/Service/AbsenceService.php
@@ -34,9 +34,7 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
-use OCP\Calendar\IManager;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IConfig;
 use OCP\IUser;
 use OCP\User\Events\OutOfOfficeChangedEvent;
 use OCP\User\Events\OutOfOfficeClearedEvent;
@@ -50,8 +48,6 @@ public function __construct(
 		private IJobList $jobList,
 		private TimezoneService $timezoneService,
 		private ITimeFactory $timeFactory,
-		private IConfig $appConfig,
-		private IManager $calendarManager,
 	) {
 	}
 
@@ -97,22 +93,27 @@ public function createOrUpdateAbsence(
 			$this->eventDispatcher->dispatchTyped(new OutOfOfficeChangedEvent($eventData));
 		}
 
-		$this->jobList->scheduleAfter(
-			OutOfOfficeEventDispatcherJob::class,
-			$eventData->getStartDate(),
-			[
-				'id' => $absence->getId(),
-				'event' => OutOfOfficeEventDispatcherJob::EVENT_START,
-			],
-		);
-		$this->jobList->scheduleAfter(
-			OutOfOfficeEventDispatcherJob::class,
-			$eventData->getEndDate(),
-			[
-				'id' => $absence->getId(),
-				'event' => OutOfOfficeEventDispatcherJob::EVENT_END,
-			],
-		);
+		$now = $this->timeFactory->getTime();
+		if ($eventData->getStartDate() > $now) {
+			$this->jobList->scheduleAfter(
+				OutOfOfficeEventDispatcherJob::class,
+				$eventData->getStartDate(),
+				[
+					'id' => $absence->getId(),
+					'event' => OutOfOfficeEventDispatcherJob::EVENT_START,
+				],
+			);
+		}
+		if ($eventData->getEndDate() > $now) {
+			$this->jobList->scheduleAfter(
+				OutOfOfficeEventDispatcherJob::class,
+				$eventData->getEndDate(),
+				[
+					'id' => $absence->getId(),
+					'event' => OutOfOfficeEventDispatcherJob::EVENT_END,
+				],
+			);
+		}
 
 		return $absence;
 	}