Enhancement: Apply user's timezone to meta fields

Signed-off-by: Kostiantyn Miakshyn <[email protected]>

Author: Koc

lib/Db/Row2Mapper.php

@@ -13,6 +13,7 @@
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Helper\ColumnsHelper;
+use OCA\Tables\Helper\TimezoneHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -39,7 +40,16 @@ class Row2Mapper {
 
 	private ColumnsHelper $columnsHelper;
 
-	public function __construct(?string $userId, IDBConnection $db, LoggerInterface $logger, UserHelper $userHelper, RowSleeveMapper $rowSleeveMapper, ColumnsHelper $columnsHelper, ColumnMapper $columnMapper) {
+	public function __construct(
+		?string $userId,
+		IDBConnection $db,
+		LoggerInterface $logger,
+		UserHelper $userHelper,
+		RowSleeveMapper $rowSleeveMapper,
+		ColumnsHelper $columnsHelper,
+		ColumnMapper $columnMapper,
+		private TimezoneHelper $timezoneHelper,
+	) {
 		$this->rowSleeveMapper = $rowSleeveMapper;
 		$this->userId = $userId;
 		$this->db = $db;
@@ -631,9 +641,9 @@ private function parseEntities(IResult $result, array $sleeves): array {
 			$rows[$sleeve->getId()] = new Row2();
 			$rows[$sleeve->getId()]->setId($sleeve->getId());
 			$rows[$sleeve->getId()]->setCreatedBy($sleeve->getCreatedBy());
-			$rows[$sleeve->getId()]->setCreatedAt($sleeve->getCreatedAt());
+			$rows[$sleeve->getId()]->setCreatedAt($this->timezoneHelper->applyUserTimezone($sleeve->getCreatedAt()));
 			$rows[$sleeve->getId()]->setLastEditBy($sleeve->getLastEditBy());
-			$rows[$sleeve->getId()]->setLastEditAt($sleeve->getLastEditAt());
+			$rows[$sleeve->getId()]->setLastEditAt($this->timezoneHelper->applyUserTimezone($sleeve->getLastEditAt()));
 			$rows[$sleeve->getId()]->setTableId($sleeve->getTableId());
 		}
 

lib/Helper/TimezoneHelper.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Helper;
+
+use DateTimeZone;
+use OCP\IConfig;
+use OCP\IUserSession;
+
+class TimezoneHelper {
+	private ?string $timezone = null;
+
+	public function __construct(
+		private IConfig $config,
+		private IUserSession $userSession,
+	) {
+	}
+
+	public function applyUserTimezone(string $date): string {
+		$userTimezone = $this->getUserTimezone();
+
+		$dateTime = new \DateTimeImmutable($date, new DateTimeZone('UTC'));
+
+		return $dateTime
+			->setTimezone(new DateTimeZone($userTimezone))
+			->format('Y-m-d H:i:s');
+	}
+
+	public function getUserTimezone(): string {
+		if ($this->timezone) {
+			return $this->timezone;
+		}
+
+		$userId = $this->userSession->getUser()?->getUID();
+		$defaultTimeZone = $this->config->getSystemValueString('default_timezone', 'UTC');
+
+		if ($userId) {
+			$this->timezone = $this->config->getUserValue($userId, 'core', 'timezone', $defaultTimeZone);
+		}
+
+		return $this->timezone ?? $defaultTimeZone;
+	}
+}

tests/unit/Db/Row2MapperTestDependencies.php

@@ -15,6 +15,7 @@
 use OCA\Tables\Db\RowSleeveMapper;
 use OCA\Tables\Helper\CircleHelper;
 use OCA\Tables\Helper\ColumnsHelper;
+use OCA\Tables\Helper\TimezoneHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -65,7 +66,8 @@ protected function setupDependencies(): void {
 			$this->userHelper,
 			$this->rowSleeveMapper,
 			$this->columnsHelper,
-			$this->columnMapper
+			$this->columnMapper,
+			$this->createMock(TimezoneHelper::class)
 		);
 
 		if (!self::$testDataInitialized) {