From a3bd15e10295122ea2dcf459846c835ca2cff1f5 Mon Sep 17 00:00:00 2001 From: contributor Date: Thu, 13 Nov 2025 18:30:38 +0200 Subject: [PATCH] move date conversion function to enex directly to protect from future potential refactoring --- apps/server/src/services/date_utils.ts | 17 +++-------------- apps/server/src/services/import/enex.ts | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/apps/server/src/services/date_utils.ts b/apps/server/src/services/date_utils.ts index 7a1a9020a..89b39f456 100644 --- a/apps/server/src/services/date_utils.ts +++ b/apps/server/src/services/date_utils.ts @@ -27,19 +27,6 @@ function localNowDate() { } } -function formatDateTimeToLocalISO(date: Date | string | null | undefined) { - if (!date) { - return undefined; - } - - const d = dayjs(date); - if (!d.isValid()) { - return undefined; - } - - return d.format(LOCAL_DATETIME_FORMAT); -} - function pad(num: number) { return num <= 9 ? `0${num}` : `${num}`; } @@ -104,10 +91,12 @@ function validateUtcDateTime(str: string | undefined) { } export default { + LOCAL_DATETIME_FORMAT, + UTC_DATETIME_FORMAT, utcNowDateTime, localNowDateTime, localNowDate, - formatDateTimeToLocalISO, + utcDateStr, utcDateTimeStr, parseDateTime, diff --git a/apps/server/src/services/import/enex.ts b/apps/server/src/services/import/enex.ts index 49950109f..5fe70fa47 100644 --- a/apps/server/src/services/import/enex.ts +++ b/apps/server/src/services/import/enex.ts @@ -1,3 +1,4 @@ +import dayjs from "dayjs"; import sax from "sax"; import stream from "stream"; import { Throttle } from "stream-throttle"; @@ -236,8 +237,8 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN function updateDates(note: BNote, utcDateCreated?: string, utcDateModified?: string) { // it's difficult to force custom dateCreated and dateModified to Note entity, so we do it post-creation with SQL - const dateCreated = date_utils.formatDateTimeToLocalISO(utcDateCreated); - const dateModified = date_utils.formatDateTimeToLocalISO(utcDateModified); + const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated); + const dateModified = formatDateTimeToLocalDbFormat(utcDateModified); sql.execute( ` UPDATE notes @@ -410,4 +411,17 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN }); } +function formatDateTimeToLocalDbFormat(date: Date | string | null | undefined) { + if (!date) { + return undefined; + } + + const d = dayjs(date); + if (!d.isValid()) { + return undefined; + } + + return d.format(date_utils.LOCAL_DATETIME_FORMAT); +} + export default { importEnex };