diff --git a/apps/server/src/routes/api/edited-notes.spec.ts b/apps/server/src/routes/api/edited-notes.spec.ts index fbc0d0842..dae79302b 100644 --- a/apps/server/src/routes/api/edited-notes.spec.ts +++ b/apps/server/src/routes/api/edited-notes.spec.ts @@ -1,6 +1,6 @@ import cls from '../../services/cls.js'; import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'; -import { resolveDateParams } from "./edited-notes.js"; +import { dateNoteLabelKeywordToDateFilter } from "./edited-notes.js"; // test date setup // client: UTC+1 @@ -20,12 +20,12 @@ const expectedYearMinus1 = "2024"; function runTest(dateStrToResolve: string, expectedDate: string) { cls.init(() => { cls.set("localNowDateTime", clientDate); - const resolvedDate = resolveDateParams(dateStrToResolve).date; - expect(resolvedDate).toBe(expectedDate); + const dateFilter = dateNoteLabelKeywordToDateFilter(dateStrToResolve); + expect(dateFilter.date).toBe(expectedDate); }); } -describe("edited-notes::resolveDateParams", () => { +describe("edited-notes::dateNoteLabelKeywordToDateFilter", () => { beforeEach(() => { vi.stubEnv('TZ', 'UTC'); vi.useFakeTimers(); diff --git a/apps/server/src/routes/api/edited-notes.ts b/apps/server/src/routes/api/edited-notes.ts index 0e5d5a881..171e19649 100644 --- a/apps/server/src/routes/api/edited-notes.ts +++ b/apps/server/src/routes/api/edited-notes.ts @@ -22,9 +22,9 @@ interface NotePojoWithNotePath extends NotePojo { } function getEditedNotesOnDate(req: Request) { - const resolvedDateParams = resolveDateParams(req.params.date); + const dateFilter = dateNoteLabelKeywordToDateFilter(req.params.date); - const sqlParams = { date: resolvedDateParams.date + "%" }; + const sqlParams = { date: dateFilter.date + "%" }; const limit = 50; const sqlQuery = /*sql*/`\ SELECT notes.* @@ -145,7 +145,7 @@ type DateFilter = DateValue; * (e.g., "2023-10-27", "2023-10", "2023"). * @returns A `DateFilter` object containing the resolved date string. */ -export function resolveDateParams(dateStr: string): DateFilter { +export function dateNoteLabelKeywordToDateFilter(dateStr: string): DateFilter { const match = dateStr.match(/^(today|month|year)([+-]\d+)?$/i); if (!match) {