gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-04 22:44:25 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

edited notes: more descriptive name dateNoteLabelKeywordToDateFilter

Browse Source
This commit is contained in:
contributor 2025-11-16 14:13:55 +02:00
parent 452b838180
commit e18fc4c70d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/server/src/routes/api/edited-notes.spec.ts
View File

@ -1,6 +1,6 @@
import cls from '../../services/cls.js'; import cls from '../../services/cls.js';
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'; import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
import { resolveDateParams } from "./edited-notes.js"; import { dateNoteLabelKeywordToDateFilter } from "./edited-notes.js";
// test date setup // test date setup
// client: UTC+1 // client: UTC+1
@ -20,12 +20,12 @@ const expectedYearMinus1 = "2024";
function runTest(dateStrToResolve: string, expectedDate: string) { function runTest(dateStrToResolve: string, expectedDate: string) {
cls.init(() => { cls.init(() => {
cls.set("localNowDateTime", clientDate); cls.set("localNowDateTime", clientDate);
const resolvedDate = resolveDateParams(dateStrToResolve).date; const dateFilter = dateNoteLabelKeywordToDateFilter(dateStrToResolve);
expect(resolvedDate).toBe(expectedDate); expect(dateFilter.date).toBe(expectedDate);
}); });
} }
describe("edited-notes::resolveDateParams", () => { describe("edited-notes::dateNoteLabelKeywordToDateFilter", () => {
beforeEach(() => { beforeEach(() => {
vi.stubEnv('TZ', 'UTC'); vi.stubEnv('TZ', 'UTC');
vi.useFakeTimers(); vi.useFakeTimers();

6
apps/server/src/routes/api/edited-notes.ts
View File

@ -22,9 +22,9 @@ interface NotePojoWithNotePath extends NotePojo {
} }
function getEditedNotesOnDate(req: Request) { 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 limit = 50;
const sqlQuery = /*sql*/`\ const sqlQuery = /*sql*/`\
SELECT notes.* SELECT notes.*
@ -145,7 +145,7 @@ type DateFilter = DateValue;
* (e.g., "2023-10-27", "2023-10", "2023"). * (e.g., "2023-10-27", "2023-10", "2023").
* @returns A `DateFilter` object containing the resolved date string. * @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); const match = dateStr.match(/^(today|month|year)([+-]\d+)?$/i);
if (!match) { if (!match) {