From 8957cd9f3ef13eeb24a5e6d6f0e6ca77db5bab51 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sun, 13 Apr 2025 19:19:49 -0400 Subject: Make NoteEdit entity match the database schema --- packages/backend/src/models/NoteEdit.ts | 13 +++++++------ packages/backend/src/server/api/endpoints/notes/versions.ts | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'packages/backend/src') diff --git a/packages/backend/src/models/NoteEdit.ts b/packages/backend/src/models/NoteEdit.ts index 57b3c10095..449c974d52 100644 --- a/packages/backend/src/models/NoteEdit.ts +++ b/packages/backend/src/models/NoteEdit.ts @@ -26,11 +26,6 @@ export class NoteEdit { @JoinColumn() public note: MiNote | null; - @Column('text', { - nullable: true, - }) - public oldText: string | null; - @Column('text', { nullable: true, }) @@ -54,8 +49,14 @@ export class NoteEdit { }) public updatedAt: Date; + @Column('text', { + nullable: true, + }) + public oldText: string | null; + @Column('timestamp with time zone', { comment: 'The old date from before the edit', + nullable: true, }) - public oldDate: Date; + public oldDate: Date | null; } diff --git a/packages/backend/src/server/api/endpoints/notes/versions.ts b/packages/backend/src/server/api/endpoints/notes/versions.ts index b5ee42e67a..1c6f9838f5 100644 --- a/packages/backend/src/server/api/endpoints/notes/versions.ts +++ b/packages/backend/src/server/api/endpoints/notes/versions.ts @@ -106,7 +106,7 @@ export default class extends Endpoint { // eslint- for (const edit of edits) { editArray.push({ - oldDate: edit.oldDate.toISOString(), + oldDate: (edit.oldDate ?? edit.updatedAt).toISOString(), updatedAt: edit.updatedAt.toISOString(), text: edit.oldText ?? edit.newText ?? null, }); -- cgit v1.2.3-freya