fixup! feat(dav): dispatch out-of-office started and ended events

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Nov 23, 2023 · ea0dbb4 · ea0dbb4
1 parent 780d4c8
commit ea0dbb4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/apps/dav/tests/unit/BackgroundJob/OutOfOfficeEventDispatcherJobTest.php b/apps/dav/tests/unit/BackgroundJob/OutOfOfficeEventDispatcherJobTest.php
@@ -27,6 +27,7 @@
 namespace OCA\DAV\Tests\unit\BackgroundJob;
 
 use OCA\DAV\BackgroundJob\OutOfOfficeEventDispatcherJob;
+use OCA\DAV\CalDAV\TimezoneService;
 use OCA\DAV\Db\Absence;
 use OCA\DAV\Db\AbsenceMapper;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -56,6 +57,7 @@ class OutOfOfficeEventDispatcherJobTest extends TestCase {
 
 	/** @var MockObject|IUserManager */
 	private $userManager;
+	private MockObject|TimezoneService $timezoneService;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -65,17 +67,21 @@ protected function setUp(): void {
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$this->userManager = $this->createMock(IUserManager::class);
+		$this->timezoneService = $this->createMock(TimezoneService::class);
 
 		$this->job = new OutOfOfficeEventDispatcherJob(
 			$this->timeFactory,
 			$this->absenceMapper,
 			$this->logger,
 			$this->eventDispatcher,
 			$this->userManager,
+			$this->timezoneService,
 		);
 	}
 
 	public function testDispatchStartEvent() {
+		$this->timezoneService->method('getUserTimezone')->with('user')->willReturn('Europe/Berlin');
+
 		$absence = new Absence();
 		$absence->setId(200);
 		$absence->setUserId('user');
@@ -106,6 +112,8 @@ public function testDispatchStartEvent() {
 	}
 
 	public function testDispatchStopEvent() {
+		$this->timezoneService->method('getUserTimezone')->with('user')->willReturn('Europe/Berlin');
+
 		$absence = new Absence();
 		$absence->setId(200);
 		$absence->setUserId('user');
@@ -136,6 +144,8 @@ public function testDispatchStopEvent() {
 	}
 
 	public function testDoesntDispatchUnknownEvent() {
+		$this->timezoneService->method('getUserTimezone')->with('user')->willReturn('Europe/Berlin');
+
 		$absence = new Absence();
 		$absence->setId(100);
 		$absence->setUserId('user');

diff --git a/tests/lib/User/AvailabilityCoordinatorTest.php b/tests/lib/User/AvailabilityCoordinatorTest.php
@@ -28,6 +28,7 @@
 
 use OC\User\AvailabilityCoordinator;
 use OC\User\OutOfOfficeData;
+use OCA\DAV\CalDAV\TimezoneService;
 use OCA\DAV\Db\Absence;
 use OCA\DAV\Db\AbsenceMapper;
 use OCP\ICache;
@@ -45,6 +46,7 @@ class AvailabilityCoordinatorTest extends TestCase {
 	private IConfig|MockObject $config;
 	private AbsenceMapper $absenceMapper;
 	private LoggerInterface $logger;
+	private MockObject|TimezoneService $timezoneService;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -54,6 +56,7 @@ protected function setUp(): void {
 		$this->absenceMapper = $this->createMock(AbsenceMapper::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->timezoneService = $this->createMock(TimezoneService::class);
 
 		$this->cacheFactory->expects(self::once())
 			->method('createLocal')
@@ -64,6 +67,7 @@ protected function setUp(): void {
 			$this->absenceMapper,
 			$this->config,
 			$this->logger,
+			$this->timezoneService,
 		);
 	}
 
@@ -86,6 +90,7 @@ public function testGetOutOfOfficeData(): void {
 		$absence->setLastDay('2023-10-08');
 		$absence->setStatus('Vacation');
 		$absence->setMessage('On vacation');
+		$this->timezoneService->method('getUserTimezone')->with('user')->willReturn('Europe/Berlin');
 
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
@@ -101,13 +106,13 @@ public function testGetOutOfOfficeData(): void {
 			->willReturn($absence);
 		$this->cache->expects(self::once())
 			->method('set')
-			->with('user', '{"id":"420","startDate":1696118400,"endDate":1696723200,"shortMessage":"Vacation","message":"On vacation"}', 300);
+			->with('user', '{"id":"420","startDate":1696111200,"endDate":1696802340,"shortMessage":"Vacation","message":"On vacation"}', 300);
 
 		$expected = new OutOfOfficeData(
 			'420',
 			$user,
-			1696118400,
-			1696723200,
+			1696111200,
+			1696802340,
 			'Vacation',
 			'On vacation',
 		);
@@ -149,6 +154,7 @@ public function testGetOutOfOfficeDataWithInvalidCachedData(): void {
 		$absence->setLastDay('2023-10-08');
 		$absence->setStatus('Vacation');
 		$absence->setMessage('On vacation');
+		$this->timezoneService->method('getUserTimezone')->with('user')->willReturn('Europe/Berlin');
 
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
@@ -164,13 +170,13 @@ public function testGetOutOfOfficeDataWithInvalidCachedData(): void {
 			->willReturn($absence);
 		$this->cache->expects(self::once())
 			->method('set')
-			->with('user', '{"id":"420","startDate":1696118400,"endDate":1696723200,"shortMessage":"Vacation","message":"On vacation"}', 300);
+			->with('user', '{"id":"420","startDate":1696111200,"endDate":1696802340,"shortMessage":"Vacation","message":"On vacation"}', 300);
 
 		$expected = new OutOfOfficeData(
 			'420',
 			$user,
-			1696118400,
-			1696723200,
+			1696111200,
+			1696802340,
 			'Vacation',
 			'On vacation',
 		);