From 8cda5f99fbbb2c4d2f21290253a5fa95cfea860e Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Sat, 25 Sep 2021 11:52:42 +0200 Subject: [PATCH] fix: services use the new typings from create methods Signed-off-by: Philip Molares --- src/auth/auth.service.ts | 4 ++-- src/history/history.service.ts | 2 +- src/notes/alias.service.ts | 10 +++++----- src/notes/notes.service.ts | 10 +++++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index 08f0c6e8a..789e9b7fb 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -79,17 +79,17 @@ export class AuthService { new Date().getTime() + 2 * 365 * 24 * 60 * 60 * 1000; if (validUntil === 0 || validUntil > maximumTokenValidity) { token = AuthToken.create( + keyId, user, identifier, - keyId, accessToken, new Date(maximumTokenValidity), ); } else { token = AuthToken.create( + keyId, user, identifier, - keyId, accessToken, new Date(validUntil), ); diff --git a/src/history/history.service.ts b/src/history/history.service.ts index 7285b06c1..a9b478b34 100644 --- a/src/history/history.service.ts +++ b/src/history/history.service.ts @@ -173,7 +173,7 @@ export class HistoryService { `Note with id/alias '${historyEntry.note}' not found.`, ); } - const entry = HistoryEntry.create(user, note); + const entry = HistoryEntry.create(user, note) as HistoryEntry; entry.pinStatus = historyEntry.pinStatus; entry.updatedAt = historyEntry.lastVisited; await manager.save(entry); diff --git a/src/notes/alias.service.ts b/src/notes/alias.service.ts index d507864c2..1d5b952b3 100644 --- a/src/notes/alias.service.ts +++ b/src/notes/alias.service.ts @@ -61,17 +61,17 @@ export class AliasService { `The alias '${alias}' is already a public id.`, ); } - let newAlias: Alias; + let newAlias; if (note.aliases.length === 0) { // the first alias is automatically made the primary alias - newAlias = Alias.create(alias, true); + newAlias = Alias.create(alias, note, true); } else { - newAlias = Alias.create(alias); + newAlias = Alias.create(alias, note); } - note.aliases.push(newAlias); + note.aliases.push(newAlias as Alias); await this.noteRepository.save(note); - return newAlias; + return newAlias as Alias; } /** diff --git a/src/notes/notes.service.ts b/src/notes/notes.service.ts index 9423cc046..5ea656cd2 100644 --- a/src/notes/notes.service.ts +++ b/src/notes/notes.service.ts @@ -97,10 +97,12 @@ export class NotesService { const newNote = Note.create(owner, alias); //TODO: Calculate patch newNote.revisions = Promise.resolve([ - Revision.create(noteContent, noteContent), + Revision.create(noteContent, noteContent, newNote as Note) as Revision, ]); if (owner) { - newNote.historyEntries = [HistoryEntry.create(owner)]; + newNote.historyEntries = [ + HistoryEntry.create(owner, newNote as Note) as HistoryEntry, + ]; } try { return await this.noteRepository.save(newNote); @@ -258,7 +260,7 @@ export class NotesService { async updateNote(note: Note, noteContent: string): Promise { const revisions = await note.revisions; //TODO: Calculate patch - revisions.push(Revision.create(noteContent, noteContent)); + revisions.push(Revision.create(noteContent, noteContent, note) as Revision); note.revisions = Promise.resolve(revisions); note.userPermissions = []; note.groupPermissions = []; @@ -306,6 +308,7 @@ export class NotesService { ); const createdPermission = NoteUserPermission.create( user, + note, newUserPermission.canEdit, ); createdPermission.note = note; @@ -319,6 +322,7 @@ export class NotesService { ); const createdPermission = NoteGroupPermission.create( group, + note, newGroupPermission.canEdit, ); createdPermission.note = note;