From 0dc29c70262ccc5dc4a0e9db6efca768c8a9d3fb Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Fri, 26 Apr 2024 07:49:47 +0500 Subject: [PATCH] core: refactor reminder upcoming time sql --- packages/core/src/collections/reminders.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/src/collections/reminders.ts b/packages/core/src/collections/reminders.ts index b95eaed76..f623b7fae 100644 --- a/packages/core/src/collections/reminders.ts +++ b/packages/core/src/collections/reminders.ts @@ -275,12 +275,13 @@ export function createUpcomingReminderTimeQuery(unix = "now") { const monthDayNow = sql`CAST(strftime('%d', ${dateNow}) AS INTEGER)`; const lastSelectedDay = sql`(SELECT MAX(value) FROM json_each(selectedDays))`; + const monthDate = sql`strftime('%m-%d%H:%M', date / 1000, 'unixepoch', 'localtime')`; return sql`CASE WHEN mode = 'once' THEN date / 1000 WHEN recurringMode = 'year' THEN strftime('%s', - strftime('%Y-', ${dateNow}) || strftime('%m-%d%H:%M', date / 1000, 'unixepoch', 'localtime'), - IIF(datetime(strftime('%Y-', ${dateNow}) || strftime('%m-%d%H:%M', date / 1000, 'unixepoch', 'localtime')) <= ${dateTimeNow}, '+1 year', '+0 year'), + strftime('%Y-', ${dateNow}) || ${monthDate}, + IIF(datetime(strftime('%Y-', ${dateNow}) || ${monthDate}) <= ${dateTimeNow}, '+1 year', '+0 year'), 'utc' ) WHEN recurringMode = 'day' THEN