From 0abc4ec6241606bdce90ace28ced9726557e89e0 Mon Sep 17 00:00:00 2001 From: Michael Dausmann Date: Sun, 25 Feb 2024 00:31:55 +1100 Subject: [PATCH] refactors --- lib/services/account.service.ts | 10 +++++----- lib/services/notes.service.ts | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/services/account.service.ts b/lib/services/account.service.ts index 5e88ba3..9c21279 100644 --- a/lib/services/account.service.ts +++ b/lib/services/account.service.ts @@ -101,13 +101,13 @@ export namespace AccountService { account_id: number, membership_id: number ): Promise { - const membership = prisma_client.membership.findFirstOrThrow({ + const membership = await prisma_client.membership.findFirstOrThrow({ where: { id: membership_id } }); - if ((await membership).account_id != account_id) { + if (membership.account_id != account_id) { throw new Error(`Membership does not belong to current account`); } @@ -126,13 +126,13 @@ export namespace AccountService { account_id: number, membership_id: number ): Promise { - const membership = prisma_client.membership.findFirstOrThrow({ + const membership = await prisma_client.membership.findFirstOrThrow({ where: { id: membership_id } }); - if ((await membership).account_id != account_id) { + if (membership.account_id != account_id) { throw new Error(`Membership does not belong to current account`); } @@ -214,7 +214,7 @@ export namespace AccountService { length: 10, numbers: true }); - return prisma_client.account.update({ + return await prisma_client.account.update({ where: { id: account_id }, data: { join_password } }); diff --git a/lib/services/notes.service.ts b/lib/services/notes.service.ts index b09a49d..4a0bf88 100644 --- a/lib/services/notes.service.ts +++ b/lib/services/notes.service.ts @@ -4,10 +4,6 @@ import { AccountLimitError } from './errors'; import { AccountService } from './account.service'; export namespace NotesService { - export async function getAllNotes() { - return prisma_client.note.findMany(); - } - export async function getNoteById(id: number) { return prisma_client.note.findUniqueOrThrow({ where: { id } }); }