1 files changed, 81 insertions, 28 deletions

diff --git a/apps/files_reminders/lib/Service/ReminderService.php b/apps/files_reminders/lib/Service/ReminderService.php
index 8bd6887e754..6ee39562076 100644
--- a/apps/files_reminders/lib/Service/ReminderService.php
+++ b/apps/files_reminders/lib/Service/ReminderService.php
@@ -15,11 +15,15 @@ use OCA\FilesReminders\AppInfo\Application;
 use OCA\FilesReminders\Db\Reminder;
 use OCA\FilesReminders\Db\ReminderMapper;
 use OCA\FilesReminders\Exception\NodeNotFoundException;
+use OCA\FilesReminders\Exception\ReminderNotFoundException;
 use OCA\FilesReminders\Exception\UserNotFoundException;
 use OCA\FilesReminders\Model\RichReminder;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
+use OCP\ICache;
+use OCP\ICacheFactory;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -28,6 +32,9 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 
 class ReminderService {
+
+	private ICache $cache;
+
 	public function __construct(
 		protected IUserManager $userManager,
 		protected IURLGenerator $urlGenerator,
@@ -35,23 +42,49 @@ class ReminderService {
 		protected ReminderMapper $reminderMapper,
 		protected IRootFolder $root,
 		protected LoggerInterface $logger,
+		protected ICacheFactory $cacheFactory,
 	) {
+		$this->cache = $this->cacheFactory->createInMemory();
 	}
 
-	/**
-	 * @throws DoesNotExistException
-	 */
-	public function get(int $id): RichReminder {
-		$reminder = $this->reminderMapper->find($id);
-		return new RichReminder($reminder, $this->root);
+	public function cacheFolder(IUser $user, Folder $folder): void {
+		$reminders = $this->reminderMapper->findAllInFolder($user, $folder);
+		$reminderMap = [];
+		foreach ($reminders as $reminder) {
+			$reminderMap[$reminder->getFileId()] = $reminder;
+		}
+
+		$nodes = $folder->getDirectoryListing();
+		foreach ($nodes as $node) {
+			$reminder = $reminderMap[$node->getId()] ?? false;
+			$this->cache->set("{$user->getUID()}-{$node->getId()}", $reminder);
+		}
 	}
 
 	/**
-	 * @throws DoesNotExistException
+	 * @throws NodeNotFoundException
 	 */
-	public function getDueForUser(IUser $user, int $fileId): RichReminder {
-		$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
-		return new RichReminder($reminder, $this->root);
+	public function getDueForUser(IUser $user, int $fileId, bool $checkNode = true): ?RichReminder {
+		if ($checkNode) {
+			$this->checkNode($user, $fileId);
+		}
+		/** @var null|false|Reminder $cachedReminder */
+		$cachedReminder = $this->cache->get("{$user->getUID()}-$fileId");
+		if ($cachedReminder === false) {
+			return null;
+		}
+		if ($cachedReminder instanceof Reminder) {
+			return new RichReminder($cachedReminder, $this->root);
+		}
+
+		try {
+			$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
+			$this->cache->set("{$user->getUID()}-$fileId", $reminder);
+			return new RichReminder($reminder, $this->root);
+		} catch (DoesNotExistException $e) {
+			$this->cache->set("{$user->getUID()}-$fileId", false);
+			return null;
+		}
 	}
 
 	/**
@@ -74,18 +107,9 @@ class ReminderService {
 	 */
 	public function createOrUpdate(IUser $user, int $fileId, DateTime $dueDate): bool {
 		$now = new DateTime('now', new DateTimeZone('UTC'));
-		try {
-			$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
-			$reminder->setDueDate($dueDate);
-			$reminder->setUpdatedAt($now);
-			$this->reminderMapper->update($reminder);
-			return false;
-		} catch (DoesNotExistException $e) {
-			$node = $this->root->getUserFolder($user->getUID())->getFirstNodeById($fileId);
-			if (!$node) {
-				throw new NodeNotFoundException();
-			}
-			// Create new reminder if no reminder is found
+		$this->checkNode($user, $fileId);
+		$reminder = $this->getDueForUser($user, $fileId);
+		if ($reminder === null) {
 			$reminder = new Reminder();
 			$reminder->setUserId($user->getUID());
 			$reminder->setFileId($fileId);
@@ -93,29 +117,40 @@ class ReminderService {
 			$reminder->setUpdatedAt($now);
 			$reminder->setCreatedAt($now);
 			$this->reminderMapper->insert($reminder);
+			$this->cache->set("{$user->getUID()}-$fileId", $reminder);
 			return true;
 		}
+		$reminder->setDueDate($dueDate);
+		$reminder->setUpdatedAt($now);
+		$this->reminderMapper->update($reminder);
+		$this->cache->set("{$user->getUID()}-$fileId", $reminder);
+		return false;
 	}
 
 	/**
-	 * @throws DoesNotExistException
+	 * @throws NodeNotFoundException
+	 * @throws ReminderNotFoundException
 	 */
 	public function remove(IUser $user, int $fileId): void {
-		$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
-		$this->reminderMapper->delete($reminder);
+		$this->checkNode($user, $fileId);
+		$reminder = $this->getDueForUser($user, $fileId);
+		if ($reminder === null) {
+			throw new ReminderNotFoundException();
+		}
+		$this->deleteReminder($reminder);
 	}
 
 	public function removeAllForNode(Node $node): void {
 		$reminders = $this->reminderMapper->findAllForNode($node);
 		foreach ($reminders as $reminder) {
-			$this->reminderMapper->delete($reminder);
+			$this->deleteReminder($reminder);
 		}
 	}
 
 	public function removeAllForUser(IUser $user): void {
 		$reminders = $this->reminderMapper->findAllForUser($user);
 		foreach ($reminders as $reminder) {
-			$this->reminderMapper->delete($reminder);
+			$this->deleteReminder($reminder);
 		}
 	}
 
@@ -147,6 +182,7 @@ class ReminderService {
 		try {
 			$this->notificationManager->notify($notification);
 			$this->reminderMapper->markNotified($reminder);
+			$this->cache->set("{$user->getUID()}-{$reminder->getFileId()}", $reminder);
 		} catch (Throwable $th) {
 			$this->logger->error($th->getMessage(), $th->getTrace());
 		}
@@ -158,7 +194,24 @@ class ReminderService {
 			->modify('-1 day');
 		$reminders = $this->reminderMapper->findNotified($buffer, $limit);
 		foreach ($reminders as $reminder) {
-			$this->reminderMapper->delete($reminder);
+			$this->deleteReminder($reminder);
+		}
+	}
+
+	private function deleteReminder(Reminder $reminder): void {
+		$this->reminderMapper->delete($reminder);
+		$this->cache->set("{$reminder->getUserId()}-{$reminder->getFileId()}", false);
+	}
+
+
+	/**
+	 * @throws NodeNotFoundException
+	 */
+	private function checkNode(IUser $user, int $fileId): void {
+		$userFolder = $this->root->getUserFolder($user->getUID());
+		$node = $userFolder->getFirstNodeById($fileId);
+		if ($node === null) {
+			throw new NodeNotFoundException();
 		}
 	}
 }