enh: add clean up buffer

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Aug 9, 2023 · 18fb955 · 18fb955
1 parent 7af30fc
commit 18fb955
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/files_reminders/lib/Db/ReminderMapper.php b/apps/files_reminders/lib/Db/ReminderMapper.php
@@ -26,6 +26,7 @@
 
 namespace OCA\FilesReminders\Db;
 
+use DateTime;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -138,12 +139,13 @@ public function findOverdue() {
 	/**
 	 * @return Reminder[]
 	 */
-	public function findNotified(?int $limit = null) {
+	public function findNotified(DateTime $buffer, ?int $limit = null) {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('id', 'user_id', 'file_id', 'due_date', 'updated_at', 'created_at', 'notified')
 			->from($this->getTableName())
 			->where($qb->expr()->eq('notified', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)))
+			->andWhere($qb->expr()->lt('due_date', $qb->createNamedParameter($buffer, IQueryBuilder::PARAM_DATE)))
 			->orderBy('due_date', 'ASC')
 			->setMaxResults($limit);
 

diff --git a/apps/files_reminders/lib/Service/ReminderService.php b/apps/files_reminders/lib/Service/ReminderService.php
@@ -167,7 +167,10 @@ public function send(Reminder $reminder): void {
 	}
 
 	public function cleanUp(?int $limit = null): void {
-		$reminders = $this->reminderMapper->findNotified($limit);
+		$buffer = (new DateTime())
+			->setTimezone(new DateTimeZone('UTC'))
+			->modify('-1 day');
+		$reminders = $this->reminderMapper->findNotified($buffer, $limit);
 		foreach ($reminders as $reminder) {
 			$this->reminderMapper->delete($reminder);
 		}