From 8b758676643eb35ba490d3911d317f47e638830c Mon Sep 17 00:00:00 2001
From: Yannick Bungers <git@innay.de>
Date: Mon, 22 Feb 2021 22:34:18 +0100
Subject: [PATCH] Rename getNoteContentByNote to getNoteContent
Signed-off-by: Yannick Bungers <git@innay.de>
---
src/api/public/notes/notes.controller.ts | 2 +-
src/notes/notes.service.spec.ts | 4 ++--
src/notes/notes.service.ts | 4 ++--
test/public-api/notes.e2e-spec.ts | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/api/public/notes/notes.controller.ts b/src/api/public/notes/notes.controller.ts
index 42d218c13..e7739529b 100644
--- a/src/api/public/notes/notes.controller.ts
+++ b/src/api/public/notes/notes.controller.ts
@@ -176,7 +176,7 @@ export class NotesController {
if (!this.permissionsService.mayRead(req.user, note)) {
throw new UnauthorizedException('Reading note denied!');
}
- return await this.noteService.getNoteContentByNote(note);
+ return await this.noteService.getNoteContent(note);
} catch (e) {
if (e instanceof NotInDBError) {
throw new NotFoundException(e.message);
diff --git a/src/notes/notes.service.spec.ts b/src/notes/notes.service.spec.ts
index de77f4593..18a02dba5 100644
--- a/src/notes/notes.service.spec.ts
+++ b/src/notes/notes.service.spec.ts
@@ -180,7 +180,7 @@ describe('NotesService', () => {
});
});
- describe('getNoteContentByNote', () => {
+ describe('getNoteContent', () => {
it('works', async () => {
const content = 'testContent';
jest
@@ -189,7 +189,7 @@ describe('NotesService', () => {
const newNote = await service.createNote(content);
const revisions = await newNote.revisions;
jest.spyOn(revisionRepo, 'findOne').mockResolvedValueOnce(revisions[0]);
- service.getNoteContentByNote(newNote).then((result) => {
+ service.getNoteContent(newNote).then((result) => {
expect(result).toEqual(content);
});
});
diff --git a/src/notes/notes.service.ts b/src/notes/notes.service.ts
index aecc99d65..5b99e6f78 100644
--- a/src/notes/notes.service.ts
+++ b/src/notes/notes.service.ts
@@ -112,7 +112,7 @@ export class NotesService {
* @param {Note} note - the note to use
* @return {string} the content of the note
*/
- async getNoteContentByNote(note: Note): Promise<string> {
+ async getNoteContent(note: Note): Promise<string> {
return (await this.getLatestRevision(note)).content;
}
@@ -349,7 +349,7 @@ export class NotesService {
*/
async toNoteDto(note: Note): Promise<NoteDto> {
return {
- content: await this.getNoteContentByNote(note),
+ content: await this.getNoteContent(note),
metadata: await this.toNoteMetadataDto(note),
editedByAtPosition: [],
};
diff --git a/test/public-api/notes.e2e-spec.ts b/test/public-api/notes.e2e-spec.ts
index 97aa31705..f201f3d67 100644
--- a/test/public-api/notes.e2e-spec.ts
+++ b/test/public-api/notes.e2e-spec.ts
@@ -74,7 +74,7 @@ describe('Notes', () => {
.expect(201);
expect(response.body.metadata?.id).toBeDefined();
expect(
- await notesService.getNoteContentByNote(
+ await notesService.getNoteContent(
await notesService.getNoteByIdOrAlias(response.body.metadata.id),
),
).toEqual(content);
@@ -109,7 +109,7 @@ describe('Notes', () => {
.expect(201);
expect(response.body.metadata?.id).toBeDefined();
return expect(
- await notesService.getNoteContentByNote(
+ await notesService.getNoteContent(
await notesService.getNoteByIdOrAlias(response.body.metadata?.id),
),
).toEqual(content);
@@ -150,7 +150,7 @@ describe('Notes', () => {
.send(changedContent)
.expect(200);
await expect(
- await notesService.getNoteContentByNote(
+ await notesService.getNoteContent(
await notesService.getNoteByIdOrAlias('test4'),
),
).toEqual(changedContent);