mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-15 07:34:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(revision): lazy-load relations

Browse source 
Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2021-12-05 21:38:36 +01:00
parent 4e70044a2c
commit 5f87406809
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/notes/notes.service.spec.ts
View file

@ -711,7 +711,7 @@ describe('NotesService', () => {
.mockImplementation(async (note: Note): Promise<Note> => note); .mockImplementation(async (note: Note): Promise<Note> => note);
const note = await service.createNote(content, null); const note = await service.createNote(content, null);
const revisions = await note.revisions; const revisions = await note.revisions;
revisions[0].edits = [ revisions[0].edits = Promise.resolve([
{ {
revisions: Promise.resolve(revisions), revisions: Promise.resolve(revisions),
startPos: 0, startPos: 0,
@ -726,7 +726,7 @@ describe('NotesService', () => {
updatedAt: new Date(1549312452001), updatedAt: new Date(1549312452001),
author: Promise.resolve(author), author: Promise.resolve(author),
} as Edit, } as Edit,
]; ]);
revisions[0].createdAt = new Date(1549312452000); revisions[0].createdAt = new Date(1549312452000);
jest.spyOn(revisionRepo, 'findOne').mockResolvedValue(revisions[0]); jest.spyOn(revisionRepo, 'findOne').mockResolvedValue(revisions[0]);
const createQueryBuilder = { const createQueryBuilder = {
@ -810,7 +810,7 @@ describe('NotesService', () => {
.mockImplementation(async (note: Note): Promise<Note> => note); .mockImplementation(async (note: Note): Promise<Note> => note);
const note = await service.createNote(content, null); const note = await service.createNote(content, null);
const revisions = await note.revisions; const revisions = await note.revisions;
revisions[0].edits = [ revisions[0].edits = Promise.resolve([
{ {
revisions: Promise.resolve(revisions), revisions: Promise.resolve(revisions),
startPos: 0, startPos: 0,
@ -825,7 +825,7 @@ describe('NotesService', () => {
updatedAt: new Date(1549312452001), updatedAt: new Date(1549312452001),
author: Promise.resolve(author), author: Promise.resolve(author),
} as Edit, } as Edit,
]; ]);
revisions[0].createdAt = new Date(1549312452000); revisions[0].createdAt = new Date(1549312452000);
jest jest
.spyOn(revisionRepo, 'findOne') .spyOn(revisionRepo, 'findOne')

5
src/notes/notes.service.ts
View file

@ -340,11 +340,12 @@ export class NotesService {
*/ */
async calculateUpdateUser(note: Note): Promise<User | null> { async calculateUpdateUser(note: Note): Promise<User | null> {
const lastRevision = await this.getLatestRevision(note); const lastRevision = await this.getLatestRevision(note);
if (lastRevision && lastRevision.edits) { const edits = await lastRevision.edits;
if (edits.length > 0) {
// Sort the last Revisions Edits by their updatedAt Date to get the latest one // Sort the last Revisions Edits by their updatedAt Date to get the latest one
// the user of that Edit is the updateUser // the user of that Edit is the updateUser
return await ( return await (
await lastRevision.edits.sort( await edits.sort(
(a, b) => b.updatedAt.getTime() - a.updatedAt.getTime(), (a, b) => b.updatedAt.getTime() - a.updatedAt.getTime(),
)[0].author )[0].author
).user; ).user;

8
src/revisions/revision.entity.ts
View file

@ -58,14 +58,14 @@ export class Revision {
* Note this revision belongs to. * Note this revision belongs to.
*/ */
@ManyToOne((_) => Note, (note) => note.revisions, { onDelete: 'CASCADE' }) @ManyToOne((_) => Note, (note) => note.revisions, { onDelete: 'CASCADE' })
note: Note; note: Promise<Note>;
/** /**
* All edit objects which are used in the revision. * All edit objects which are used in the revision.
*/ */
@ManyToMany((_) => Edit, (edit) => edit.revisions) @ManyToMany((_) => Edit, (edit) => edit.revisions)
@JoinTable() @JoinTable()
edits: Edit[]; edits: Promise<Edit[]>;
// eslint-disable-next-line @typescript-eslint/no-empty-function // eslint-disable-next-line @typescript-eslint/no-empty-function
private constructor() {} private constructor() {}
@ -79,8 +79,8 @@ export class Revision {
newRevision.patch = patch; newRevision.patch = patch;
newRevision.content = content; newRevision.content = content;
newRevision.length = content.length; newRevision.length = content.length;
newRevision.note = note; newRevision.note = Promise.resolve(note);
newRevision.edits = []; newRevision.edits = Promise.resolve([]);
return newRevision; return newRevision;
} }
} }