heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

upd: store old date and use it in previous versions

Browse source
This commit is contained in:
Mar0xy 2023-10-22 14:07:04 +02:00
parent 2706b6b618
commit 83be996a3d
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
6 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/migration/1697970083001-oldDateNoteEdit.js Normal file
View file

@ -0,0 +1,11 @@
export class OldDateNoteEdit1697970083001 {
name = "OldDateNoteEdit1697970083001";
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "note_edit" ADD COLUMN "oldDate" TIMESTAMP WITH TIME ZONE`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "note_edit" DROP COLUMN "oldDate"`);
}
}

3
packages/backend/src/core/NoteEditService.ts
View file

@ -388,6 +388,8 @@ export class NoteEditService implements OnApplicationShutdown {
}
if (Object.keys(update).length > 0) {
const exists = await this.noteEditRepository.findOneBy({ noteId: oldnote.id });
await this.noteEditRepository.insert({
id: this.idService.gen(),
noteId: oldnote.id,
@ -395,6 +397,7 @@ export class NoteEditService implements OnApplicationShutdown {
newText: update.text || undefined,
cw: update.cw || undefined,
fileIds: undefined,
oldDate: exists ? oldnote.updatedAt as Date : this.idService.parse(oldnote.id).date,
updatedAt: new Date(),
});

5
packages/backend/src/models/NoteEdit.ts
View file

@ -48,4 +48,9 @@ export class NoteEdit {
comment: "The updated date of the Note.",
})
public updatedAt: Date;
@Column("timestamp with time zone", {
comment: "The old date from before the edit",
})
public oldDate: Date;
}

3
packages/backend/src/server/api/endpoints/notes/versions.ts
View file

@ -50,12 +50,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
for (const edit of edits) {
editArray.push({
oldDate: edit.oldDate,
updatedAt: edit.updatedAt,
text: edit.oldText,
});
}
editArray = editArray.sort((a, b) => { return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(); });
editArray = editArray.sort((a, b) => { return new Date(b.oldDate).getTime() - new Date(a.oldDate).getTime(); });
return editArray;
});