From 96fa6fb15fc237ee8575267b303432dbe122be43 Mon Sep 17 00:00:00 2001 From: noodleofdeath Date: Sun, 28 Jan 2024 16:42:24 -0500 Subject: [PATCH] fix api --- .../v1/controllers/system/SystemController.ts | 4 +-- .../src/api/v1/routes/system/SystemRouter.ts | 1 - .../achievement/Achievement.model.ts | 32 +++++++------------ .../v1/schema/system/log/SystemLog.types.ts | 2 +- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/server/src/api/v1/controllers/system/SystemController.ts b/src/server/src/api/v1/controllers/system/SystemController.ts index df7f2135..4c3a726f 100644 --- a/src/server/src/api/v1/controllers/system/SystemController.ts +++ b/src/server/src/api/v1/controllers/system/SystemController.ts @@ -16,8 +16,8 @@ import { GetSitemapRequest } from './types'; import { MailService, StaticGeneratorService } from '../../../../services'; import { AuthError, - InternalError, Request as ExpressRequest, + InternalError, } from '../../middleware'; import { Cache, @@ -70,7 +70,7 @@ export class SystemController { @Post('/log') public static async logSystemEvent( @Request() req: ExpressRequest, - @Body() e: SystemLogCreationAttributes, + @Body() e: SystemLogCreationAttributes ): Promise { await SystemLog.create(e); if (e.notify?.email) { diff --git a/src/server/src/api/v1/routes/system/SystemRouter.ts b/src/server/src/api/v1/routes/system/SystemRouter.ts index cd346761..d983eede 100644 --- a/src/server/src/api/v1/routes/system/SystemRouter.ts +++ b/src/server/src/api/v1/routes/system/SystemRouter.ts @@ -55,5 +55,4 @@ router.post( } ); - export default router; diff --git a/src/server/src/api/v1/schema/resources/achievement/Achievement.model.ts b/src/server/src/api/v1/schema/resources/achievement/Achievement.model.ts index 75d57a9b..8b5a63a1 100644 --- a/src/server/src/api/v1/schema/resources/achievement/Achievement.model.ts +++ b/src/server/src/api/v1/schema/resources/achievement/Achievement.model.ts @@ -156,9 +156,7 @@ export class Achievement< displayName: 'Belated Bookworm', findCandidates: async () => { try { - const data = await UserMetadata.findAll({ - where: { key: 'bookmarkedSummaries' } - }); + const data = await UserMetadata.findAll({ where: { key: 'bookmarkedSummaries' } }); const users = data.filter((d) => Object.values(d.value).length >= 3).map((d) => d.userId); return await User.findAll({ where : { id: users } }); } catch (e) { @@ -171,12 +169,12 @@ export class Achievement< where: { key: 'bookmarkedSummaries', userId: user.id, - } + }, }); const count = (Object.values(data?.value ?? [])).length; return count / 3; } catch (e) { - return 0 + return 0; } }, name: 'belated-bookworm', @@ -187,9 +185,7 @@ export class Achievement< displayName: 'Avid Aficionado', findCandidates: async () => { try { - const data = await UserMetadata.findAll({ - where: { key: 'bookmarkedSummaries' } - }); + const data = await UserMetadata.findAll({ where: { key: 'bookmarkedSummaries' } }); const users = data.filter((d) => Object.values(d.value).length >= 10).map((d) => d.userId); return await User.findAll({ where : { id: users } }); } catch (e) { @@ -202,12 +198,12 @@ export class Achievement< where: { key: 'bookmarkedSummaries', userId: user.id, - } + }, }); const count = (Object.values(data?.value ?? [])).length; return count / 10; } catch (e) { - return 0 + return 0; } }, name: 'avid-aficionado', @@ -218,9 +214,7 @@ export class Achievement< displayName: 'Insatiable Inquirer', findCandidates: async () => { try { - const data = await UserMetadata.findAll({ - where: { key: 'bookmarkedSummaries' } - }); + const data = await UserMetadata.findAll({ where: { key: 'bookmarkedSummaries' } }); const users = data.filter((d) => Object.values(d.value).length >= 30).map((d) => d.userId); return await User.findAll({ where : { id: users } }); } catch (e) { @@ -233,12 +227,12 @@ export class Achievement< where: { key: 'bookmarkedSummaries', userId: user.id, - } + }, }); const count = Object.values(data?.value ?? []).length; return count / 30; } catch (e) { - return 0 + return 0; } }, name: 'insatiable-inquirer', @@ -249,9 +243,7 @@ export class Achievement< displayName: 'Highlight Honcho', findCandidates: async () => { try { - const data = await UserMetadata.findAll({ - where: { key: 'bookmarkedSummaries' } - }); + const data = await UserMetadata.findAll({ where: { key: 'bookmarkedSummaries' } }); const users = data.filter((d) => Object.values(d.value).length >= 100).map((d) => d.userId); return await User.findAll({ where : { id: users } }); } catch (e) { @@ -264,12 +256,12 @@ export class Achievement< where: { key: 'bookmarkedSummaries', userId: user.id, - } + }, }); const count = Object.values(data?.value ?? []).length; return count / 100; } catch (e) { - return 0 + return 0; } }, name: 'highlight-honcho', diff --git a/src/server/src/api/v1/schema/system/log/SystemLog.types.ts b/src/server/src/api/v1/schema/system/log/SystemLog.types.ts index b06db5b6..107b30fa 100644 --- a/src/server/src/api/v1/schema/system/log/SystemLog.types.ts +++ b/src/server/src/api/v1/schema/system/log/SystemLog.types.ts @@ -7,7 +7,7 @@ export type NotifyOptions = { html?: string; text?: string; subject?: string; -} +}; export type SystemLogAttributes = DatedAttributes & { level: SystemLogLevel;