diff --git a/api/jest.config.cts b/api/jest.config.cts index 91a829a..b0402c5 100644 --- a/api/jest.config.cts +++ b/api/jest.config.cts @@ -3,8 +3,12 @@ module.exports = { preset: '../jest.preset.js', testEnvironment: 'node', transform: { - '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], + '^.+\\.[tj]s$': ['ts-jest', { + tsconfig: '/tsconfig.spec.json', + isolatedModules: true, + }], }, moduleFileExtensions: ['ts', 'js', 'html'], coverageDirectory: '../coverage/api', + setupFilesAfterEnv: ['/src/test-setup.ts'], }; diff --git a/api/prisma/schema.prisma b/api/prisma/schema.prisma index a722689..9f8043e 100644 --- a/api/prisma/schema.prisma +++ b/api/prisma/schema.prisma @@ -24,7 +24,9 @@ model Game { platform String? status GameStatus dateAdded DateTime @default(now()) + dateStarted DateTime? dateCompleted DateTime? + dateFinished DateTime? rating Int? @db.Int @default(0) notes String? coverImage String? @@ -39,6 +41,7 @@ enum GameStatus { PLAYING COMPLETED BACKLOG + RETIRED } model Book { @@ -48,6 +51,7 @@ model Book { isbn String? status BookStatus dateAdded DateTime @default(now()) + dateStarted DateTime? dateFinished DateTime? rating Int? @db.Int @default(0) notes String? @@ -63,6 +67,7 @@ enum BookStatus { READING FINISHED TO_READ + RETIRED } model Music { @@ -72,7 +77,9 @@ model Music { type MusicType status MusicStatus dateAdded DateTime @default(now()) + dateStarted DateTime? dateCompleted DateTime? + dateFinished DateTime? rating Int? @db.Int @default(0) notes String? coverArt String? @@ -93,6 +100,7 @@ enum MusicStatus { LISTENING COMPLETED WANT_TO_LISTEN + RETIRED } model Art { @@ -115,7 +123,9 @@ model Show { type ShowType status ShowStatus dateAdded DateTime @default(now()) + dateStarted DateTime? dateCompleted DateTime? + dateFinished DateTime? rating Int? @db.Int @default(0) notes String? coverImage String? @@ -137,6 +147,7 @@ enum ShowStatus { WATCHING COMPLETED WANT_TO_WATCH + RETIRED } model Manga { @@ -145,7 +156,9 @@ model Manga { author String status MangaStatus dateAdded DateTime @default(now()) + dateStarted DateTime? dateCompleted DateTime? + dateFinished DateTime? rating Int? @db.Int @default(0) notes String? coverImage String? @@ -160,6 +173,7 @@ enum MangaStatus { READING COMPLETED WANT_TO_READ + RETIRED } model User { diff --git a/api/src/app/app.spec.ts b/api/src/app/app.spec.ts index b6b1947..31c73ce 100644 --- a/api/src/app/app.spec.ts +++ b/api/src/app/app.spec.ts @@ -15,6 +15,6 @@ describe('GET /', () => { url: '/', }); - expect(response.json()).toEqual({ message: 'Hello API' }); + expect(response.json()).toEqual({ version: expect.any(String) }); }); }); diff --git a/api/src/app/app.ts b/api/src/app/app.ts index 37d7d4e..bdaee04 100644 --- a/api/src/app/app.ts +++ b/api/src/app/app.ts @@ -13,8 +13,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) { // Log CSRF validation failures if (error.code === 'FST_CSRF_INVALID_TOKEN' || error.code === 'FST_CSRF_MISSING_SECRET') { await AuditService.log({ - action: AuditAction.CSRF_VALIDATION_FAILED, - category: AuditCategory.SECURITY, + action: AuditAction.csrfValidationFailed, + category: AuditCategory.security, details: `CSRF validation failed: ${error.message}, URL: ${request.url}`, success: false, }, request).catch(() => { @@ -25,8 +25,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) { // Log unauthorized access attempts if (error.statusCode === 401 || error.statusCode === 403) { await AuditService.log({ - action: AuditAction.UNAUTHORIZED_ACCESS, - category: AuditCategory.SECURITY, + action: AuditAction.unauthorizedAccess, + category: AuditCategory.security, details: `Unauthorized access attempt: ${error.message}, URL: ${request.url}`, success: false, }, request).catch(() => { @@ -57,5 +57,13 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) { fastify.register(AutoLoad, { dir: path.join(__dirname, 'routes'), options: { ...opts, prefix: '/api' }, + ignorePattern: /root\.ts$/, + }); + + // Register root route without prefix + fastify.register(AutoLoad, { + dir: path.join(__dirname, 'routes'), + options: { ...opts }, + matchFilter: /root\.ts$/, }); } diff --git a/api/src/app/plugins/auth.ts b/api/src/app/plugins/auth.ts index c3929bb..4843b37 100644 --- a/api/src/app/plugins/auth.ts +++ b/api/src/app/plugins/auth.ts @@ -82,7 +82,9 @@ const authPlugin: FastifyPluginAsync = async (app) => { try { await request.jwtVerify(); } catch (err) { - throw app.httpErrors.unauthorized("Invalid token"); + const error = new Error("Invalid token"); + (error as any).statusCode = 401; + throw error; } }); }; diff --git a/api/src/app/plugins/rate-limit.ts b/api/src/app/plugins/rate-limit.ts index 3f2ba5f..8343a14 100644 --- a/api/src/app/plugins/rate-limit.ts +++ b/api/src/app/plugins/rate-limit.ts @@ -17,8 +17,8 @@ const rateLimitPlugin: FastifyPluginAsync = async (app) => { errorResponseBuilder: (request) => { // Log rate limit exceeded event AuditService.log({ - action: AuditAction.RATE_LIMIT_EXCEEDED, - category: AuditCategory.SECURITY, + action: AuditAction.rateLimitExceeded, + category: AuditCategory.security, details: `Rate limit exceeded for URL: ${request.url}`, success: false, }, request).catch(() => { diff --git a/api/src/app/routes/art/index.ts b/api/src/app/routes/art/index.ts index 4c32b73..3c24820 100644 --- a/api/src/app/routes/art/index.ts +++ b/api/src/app/routes/art/index.ts @@ -46,8 +46,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { async (request) => { const art = await artService.createArt(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "art", resourceId: art.id, details: `Created art: ${art.title}`, @@ -74,8 +74,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { const art = await artService.updateArt(id, request.body); if (art) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "art", resourceId: id, details: `Updated art: ${art.title}`, @@ -98,8 +98,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await artService.deleteArt(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "art", resourceId: id, details: `Deleted art with ID: ${id}`, @@ -133,8 +133,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForArt(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "art", resourceId: id, details: `Added comment to art`, @@ -169,8 +169,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "art", resourceId: id, details: `Updated comment ${commentId} on art`, @@ -205,8 +205,8 @@ const artRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "art", resourceId: id, details: `Deleted comment ${commentId} from art`, diff --git a/api/src/app/routes/auth/index.ts b/api/src/app/routes/auth/index.ts index d666cf8..3bdadb9 100644 --- a/api/src/app/routes/auth/index.ts +++ b/api/src/app/routes/auth/index.ts @@ -85,8 +85,8 @@ const authRoutes: FastifyPluginAsync = async (app) => { // Log successful login await AuditService.log({ - action: AuditAction.LOGIN, - category: AuditCategory.AUTH, + action: AuditAction.login, + category: AuditCategory.auth, userId: user.id, details: `User ${user.username} logged in via Discord`, success: true, @@ -114,8 +114,8 @@ const authRoutes: FastifyPluginAsync = async (app) => { } catch (error) { // Log failed login attempt await AuditService.log({ - action: AuditAction.LOGIN_FAILED, - category: AuditCategory.SECURITY, + action: AuditAction.loginFailed, + category: AuditCategory.security, details: error instanceof Error ? error.message : String(error), success: false, }, request); @@ -229,8 +229,8 @@ const authRoutes: FastifyPluginAsync = async (app) => { const user = request.user as { id?: string; username?: string }; if (user?.id) { await AuditService.log({ - action: AuditAction.LOGOUT, - category: AuditCategory.AUTH, + action: AuditAction.logout, + category: AuditCategory.auth, userId: user.id, details: `User ${user.username ?? "unknown"} logged out`, success: true, diff --git a/api/src/app/routes/books/index.ts b/api/src/app/routes/books/index.ts index 5e8a818..f22cfa2 100644 --- a/api/src/app/routes/books/index.ts +++ b/api/src/app/routes/books/index.ts @@ -46,8 +46,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { async (request) => { const book = await bookService.createBook(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "book", resourceId: book.id, details: `Created book: ${book.title}`, @@ -74,8 +74,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { const book = await bookService.updateBook(id, request.body); if (book) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "book", resourceId: id, details: `Updated book: ${book.title}`, @@ -98,8 +98,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await bookService.deleteBook(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "book", resourceId: id, details: `Deleted book with ID: ${id}`, @@ -133,8 +133,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForBook(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "book", resourceId: id, details: `Added comment to book`, @@ -169,8 +169,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "book", resourceId: id, details: `Updated comment ${commentId} on book`, @@ -205,8 +205,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "book", resourceId: id, details: `Deleted comment ${commentId} from book`, diff --git a/api/src/app/routes/games/index.ts b/api/src/app/routes/games/index.ts index 5b5b66a..53e2e15 100644 --- a/api/src/app/routes/games/index.ts +++ b/api/src/app/routes/games/index.ts @@ -40,8 +40,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { async (request) => { const game = await gameService.createGame(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "game", resourceId: game.id, details: `Created game: ${game.title}`, @@ -66,8 +66,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { const game = await gameService.updateGame(id, request.body); if (game) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "game", resourceId: id, details: `Updated game: ${game.title}`, @@ -88,8 +88,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await gameService.deleteGame(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "game", resourceId: id, details: `Deleted game with ID: ${id}`, @@ -119,8 +119,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForGame(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "game", resourceId: id, details: `Added comment to game`, @@ -153,8 +153,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "game", resourceId: id, details: `Updated comment ${commentId} on game`, @@ -187,8 +187,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "game", resourceId: id, details: `Deleted comment ${commentId} from game`, diff --git a/api/src/app/routes/log/index.ts b/api/src/app/routes/log/index.ts new file mode 100644 index 0000000..9cdfc6f --- /dev/null +++ b/api/src/app/routes/log/index.ts @@ -0,0 +1,40 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { FastifyInstance, FastifyRequest } from 'fastify'; +import { logger } from '../../utils/logger'; + +interface LogBody { + level: 'debug' | 'info' | 'warn' | 'error'; + message: string; + context?: string; + error?: { + name: string; + message: string; + stack?: string; + }; +} + +export default async function (fastify: FastifyInstance) { + fastify.post('/log', async function (request: FastifyRequest<{ Body: LogBody }>) { + const { level, message, context, error } = request.body; + + if (level === 'error' && error) { + const errorObj = new Error(error.message); + errorObj.name = error.name; + if (error.stack) { + errorObj.stack = error.stack; + } + await logger.error(context || 'Frontend', errorObj); + } else if (level === 'error') { + await logger.log('warn', `[Frontend Error] ${message}`); + } else { + await logger.log(level, `[Frontend] ${message}`); + } + + return { success: true }; + }); +} diff --git a/api/src/app/routes/manga/index.ts b/api/src/app/routes/manga/index.ts index 1f46d63..3909744 100644 --- a/api/src/app/routes/manga/index.ts +++ b/api/src/app/routes/manga/index.ts @@ -37,8 +37,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { async (request) => { const manga = await mangaService.createManga(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "manga", resourceId: manga.id, details: `Created manga: ${manga.title}`, @@ -62,8 +62,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { const manga = await mangaService.updateManga(id, request.body); if (manga) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "manga", resourceId: id, details: `Updated manga: ${manga.title}`, @@ -83,8 +83,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await mangaService.deleteManga(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "manga", resourceId: id, details: `Deleted manga with ID: ${id}`, @@ -112,8 +112,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForManga(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "manga", resourceId: id, details: `Added comment to manga`, @@ -145,8 +145,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "manga", resourceId: id, details: `Updated comment ${commentId} on manga`, @@ -178,8 +178,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "manga", resourceId: id, details: `Deleted comment ${commentId} from manga`, diff --git a/api/src/app/routes/music/index.ts b/api/src/app/routes/music/index.ts index eae0662..5f63553 100644 --- a/api/src/app/routes/music/index.ts +++ b/api/src/app/routes/music/index.ts @@ -46,8 +46,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { async (request) => { const music = await musicService.createMusic(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "music", resourceId: music.id, details: `Created music: ${music.title}`, @@ -74,8 +74,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { const music = await musicService.updateMusic(id, request.body); if (music) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "music", resourceId: id, details: `Updated music: ${music.title}`, @@ -98,8 +98,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await musicService.deleteMusic(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "music", resourceId: id, details: `Deleted music with ID: ${id}`, @@ -133,8 +133,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForMusic(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "music", resourceId: id, details: `Added comment to music`, @@ -169,8 +169,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "music", resourceId: id, details: `Updated comment ${commentId} on music`, @@ -205,8 +205,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "music", resourceId: id, details: `Deleted comment ${commentId} from music`, diff --git a/api/src/app/routes/root.ts b/api/src/app/routes/root.ts index 923ea65..1a2aeb7 100644 --- a/api/src/app/routes/root.ts +++ b/api/src/app/routes/root.ts @@ -1,7 +1,30 @@ import { FastifyInstance } from 'fastify'; +import { readFileSync } from 'fs'; +import { join } from 'path'; + +interface PackageJson { + version: string; +} + +let cachedVersion: string | null = null; + +function getVersion(): string { + if (cachedVersion) { + return cachedVersion; + } + + try { + const packageJsonPath = join(process.cwd(), 'package.json'); + const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8')) as PackageJson; + cachedVersion = packageJson.version; + return cachedVersion; + } catch { + return 'unknown'; + } +} export default async function (fastify: FastifyInstance) { fastify.get('/', async function () { - return { message: 'Hello API' }; + return { version: getVersion() }; }); } diff --git a/api/src/app/routes/shows/index.ts b/api/src/app/routes/shows/index.ts index 2512ea3..a41c422 100644 --- a/api/src/app/routes/shows/index.ts +++ b/api/src/app/routes/shows/index.ts @@ -37,8 +37,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { async (request) => { const show = await showService.createShow(request.body); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "show", resourceId: show.id, details: `Created show: ${show.title}`, @@ -62,8 +62,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { const show = await showService.updateShow(id, request.body); if (show) { await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryUpdate, + category: AuditCategory.content, resourceType: "show", resourceId: id, details: `Updated show: ${show.title}`, @@ -83,8 +83,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { const { id } = request.params; await showService.deleteShow(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: AuditCategory.content, resourceType: "show", resourceId: id, details: `Deleted show with ID: ${id}`, @@ -112,8 +112,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { const userId = request.user.id; const comment = await commentService.createCommentForShow(id, userId, request.body); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentCreate, + category: AuditCategory.content, resourceType: "show", resourceId: id, details: `Added comment to show`, @@ -145,8 +145,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { const comment = await commentService.updateComment(commentId, request.body.content); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_UPDATE, - category: AuditCategory.CONTENT, + action: AuditAction.commentUpdate, + category: AuditCategory.content, resourceType: "show", resourceId: id, details: `Updated comment ${commentId} on show`, @@ -178,8 +178,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => { await commentService.deleteComment(commentId); await AuditService.logFromRequest(request, { - action: AuditAction.COMMENT_DELETE, - category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.commentDelete, + category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content, resourceType: "show", resourceId: id, details: `Deleted comment ${commentId} from show`, diff --git a/api/src/app/routes/suggestions/index.ts b/api/src/app/routes/suggestions/index.ts index 35d04cc..569deb4 100644 --- a/api/src/app/routes/suggestions/index.ts +++ b/api/src/app/routes/suggestions/index.ts @@ -85,8 +85,8 @@ export default async function (app: FastifyInstance): Promise { ); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_CREATE, - category: AuditCategory.CONTENT, + action: AuditAction.entryCreate, + category: AuditCategory.content, resourceType: "Suggestion", resourceId: suggestion.id, details: `Created ${suggestion.entityType} suggestion: ${suggestion.title}`, @@ -115,8 +115,8 @@ export default async function (app: FastifyInstance): Promise { const suggestion = await SuggestionService.acceptSuggestion(id); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.ADMIN, + action: AuditAction.entryUpdate, + category: AuditCategory.admin, resourceType: "Suggestion", resourceId: suggestion.id, details: `Accepted ${suggestion.entityType} suggestion: ${suggestion.title}`, @@ -146,8 +146,8 @@ export default async function (app: FastifyInstance): Promise { const suggestion = await SuggestionService.acceptSuggestionWithEdits(id, editedData); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.ADMIN, + action: AuditAction.entryUpdate, + category: AuditCategory.admin, resourceType: "Suggestion", resourceId: suggestion.id, details: `Accepted ${suggestion.entityType} suggestion with edits: ${suggestion.title}`, @@ -177,8 +177,8 @@ export default async function (app: FastifyInstance): Promise { const suggestion = await SuggestionService.declineSuggestion(id, reason); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_UPDATE, - category: AuditCategory.ADMIN, + action: AuditAction.entryUpdate, + category: AuditCategory.admin, resourceType: "Suggestion", resourceId: suggestion.id, details: `Declined ${suggestion.entityType} suggestion: ${suggestion.title}${reason ? ` (Reason: ${reason})` : ""}`, @@ -209,8 +209,8 @@ export default async function (app: FastifyInstance): Promise { const suggestion = await SuggestionService.deleteSuggestion(id, userId, isAdmin); await AuditService.logFromRequest(request, { - action: AuditAction.ENTRY_DELETE, - category: isAdmin ? AuditCategory.ADMIN : AuditCategory.CONTENT, + action: AuditAction.entryDelete, + category: isAdmin ? AuditCategory.admin : AuditCategory.content, resourceType: "Suggestion", resourceId: suggestion.id, details: `Deleted ${suggestion.entityType} suggestion: ${suggestion.title}`, diff --git a/api/src/app/routes/users/index.ts b/api/src/app/routes/users/index.ts index 485fd56..710f765 100644 --- a/api/src/app/routes/users/index.ts +++ b/api/src/app/routes/users/index.ts @@ -54,8 +54,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => { } await AuditService.logFromRequest(request, { - action: AuditAction.USER_BAN, - category: AuditCategory.ADMIN, + action: AuditAction.userBan, + category: AuditCategory.admin, targetUserId: id, details: `Banned user: ${user.username}`, }); @@ -78,8 +78,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => { } await AuditService.logFromRequest(request, { - action: AuditAction.USER_UNBAN, - category: AuditCategory.ADMIN, + action: AuditAction.userUnban, + category: AuditCategory.admin, targetUserId: id, details: `Unbanned user: ${user.username}`, }); diff --git a/api/src/app/services/audit.service.ts b/api/src/app/services/audit.service.ts index c45b117..1461692 100644 --- a/api/src/app/services/audit.service.ts +++ b/api/src/app/services/audit.service.ts @@ -36,7 +36,7 @@ export const AuditService = { request: FastifyRequest, data: Omit ) { - const userId = (request.user as { id?: string } | undefined)?.id; + const userId = ((request as any).user as { id?: string } | undefined)?.id; return this.log( { diff --git a/api/src/app/services/book.service.ts b/api/src/app/services/book.service.ts index de13a29..afb97bc 100644 --- a/api/src/app/services/book.service.ts +++ b/api/src/app/services/book.service.ts @@ -24,6 +24,7 @@ export class BookService { ...book, status: book.status as unknown as BookStatus, dateAdded: book.dateAdded, + dateStarted: book.dateStarted || undefined, dateFinished: book.dateFinished || undefined, tags: book.tags ?? [], links: book.links ?? [], @@ -46,6 +47,7 @@ export class BookService { ...book, status: book.status as unknown as BookStatus, dateAdded: book.dateAdded, + dateStarted: book.dateStarted || undefined, dateFinished: book.dateFinished || undefined, tags: book.tags ?? [], links: book.links ?? [], @@ -69,6 +71,7 @@ export class BookService { ...book, status: book.status as unknown as BookStatus, dateAdded: book.dateAdded, + dateStarted: book.dateStarted || undefined, dateFinished: book.dateFinished || undefined, tags: book.tags ?? [], links: book.links ?? [], @@ -95,6 +98,7 @@ export class BookService { ...book, status: book.status as unknown as BookStatus, dateAdded: book.dateAdded, + dateStarted: book.dateStarted || undefined, dateFinished: book.dateFinished || undefined, tags: book.tags ?? [], links: book.links ?? [], diff --git a/api/src/app/services/game.service.ts b/api/src/app/services/game.service.ts index d763807..d748c22 100644 --- a/api/src/app/services/game.service.ts +++ b/api/src/app/services/game.service.ts @@ -24,7 +24,9 @@ export class GameService { ...game, status: game.status as unknown as GameStatus, dateAdded: game.dateAdded, + dateStarted: game.dateStarted || undefined, dateCompleted: game.dateCompleted || undefined, + dateFinished: game.dateFinished || undefined, tags: game.tags ?? [], links: game.links ?? [], createdAt: game.createdAt, @@ -46,7 +48,9 @@ export class GameService { ...game, status: game.status as unknown as GameStatus, dateAdded: game.dateAdded, + dateStarted: game.dateStarted || undefined, dateCompleted: game.dateCompleted || undefined, + dateFinished: game.dateFinished || undefined, tags: game.tags ?? [], links: game.links ?? [], createdAt: game.createdAt, @@ -69,7 +73,9 @@ export class GameService { ...game, status: game.status as unknown as GameStatus, dateAdded: game.dateAdded, + dateStarted: game.dateStarted || undefined, dateCompleted: game.dateCompleted || undefined, + dateFinished: game.dateFinished || undefined, tags: game.tags ?? [], links: game.links ?? [], createdAt: game.createdAt, @@ -95,7 +101,9 @@ export class GameService { ...game, status: game.status as unknown as GameStatus, dateAdded: game.dateAdded, + dateStarted: game.dateStarted || undefined, dateCompleted: game.dateCompleted || undefined, + dateFinished: game.dateFinished || undefined, tags: game.tags ?? [], links: game.links ?? [], createdAt: game.createdAt, diff --git a/api/src/app/services/like.service.ts b/api/src/app/services/like.service.ts index 8c48d2d..7875836 100644 --- a/api/src/app/services/like.service.ts +++ b/api/src/app/services/like.service.ts @@ -32,8 +32,8 @@ export class LikeService { }); await AuditService.logFromRequest(req, { - action: AuditAction.UNLIKE, - category: AuditCategory.CONTENT, + action: AuditAction.unlike, + category: AuditCategory.content, resourceType: entityType, resourceId: entityId, details: `Unliked ${entityType}` @@ -52,8 +52,8 @@ export class LikeService { }); await AuditService.logFromRequest(req, { - action: AuditAction.LIKE, - category: AuditCategory.CONTENT, + action: AuditAction.like, + category: AuditCategory.content, resourceType: entityType, resourceId: entityId, details: `Liked ${entityType}` diff --git a/api/src/app/services/manga.service.ts b/api/src/app/services/manga.service.ts index bc7dbfd..f63dcd0 100644 --- a/api/src/app/services/manga.service.ts +++ b/api/src/app/services/manga.service.ts @@ -21,7 +21,9 @@ export class MangaService { ...m, status: m.status as unknown as MangaStatus, dateAdded: m.dateAdded, + dateStarted: m.dateStarted || undefined, dateCompleted: m.dateCompleted || undefined, + dateFinished: m.dateFinished || undefined, tags: m.tags ?? [], links: m.links ?? [], createdAt: m.createdAt, @@ -40,7 +42,9 @@ export class MangaService { ...manga, status: manga.status as unknown as MangaStatus, dateAdded: manga.dateAdded, + dateStarted: manga.dateStarted || undefined, dateCompleted: manga.dateCompleted || undefined, + dateFinished: manga.dateFinished || undefined, tags: manga.tags ?? [], links: manga.links ?? [], createdAt: manga.createdAt, @@ -60,7 +64,9 @@ export class MangaService { ...manga, status: manga.status as unknown as MangaStatus, dateAdded: manga.dateAdded, + dateStarted: manga.dateStarted || undefined, dateCompleted: manga.dateCompleted || undefined, + dateFinished: manga.dateFinished || undefined, tags: manga.tags ?? [], links: manga.links ?? [], createdAt: manga.createdAt, @@ -83,7 +89,9 @@ export class MangaService { ...manga, status: manga.status as unknown as MangaStatus, dateAdded: manga.dateAdded, + dateStarted: manga.dateStarted || undefined, dateCompleted: manga.dateCompleted || undefined, + dateFinished: manga.dateFinished || undefined, tags: manga.tags ?? [], links: manga.links ?? [], createdAt: manga.createdAt, diff --git a/api/src/app/services/music.service.ts b/api/src/app/services/music.service.ts index b7c8e03..405d8f0 100644 --- a/api/src/app/services/music.service.ts +++ b/api/src/app/services/music.service.ts @@ -25,7 +25,9 @@ export class MusicService { type: music.type as unknown as MusicType, status: music.status as unknown as MusicStatus, dateAdded: music.dateAdded, + dateStarted: music.dateStarted || undefined, dateCompleted: music.dateCompleted || undefined, + dateFinished: music.dateFinished || undefined, tags: music.tags ?? [], links: music.links ?? [], createdAt: music.createdAt, @@ -48,7 +50,9 @@ export class MusicService { type: music.type as unknown as MusicType, status: music.status as unknown as MusicStatus, dateAdded: music.dateAdded, + dateStarted: music.dateStarted || undefined, dateCompleted: music.dateCompleted || undefined, + dateFinished: music.dateFinished || undefined, tags: music.tags ?? [], links: music.links ?? [], createdAt: music.createdAt, @@ -73,7 +77,9 @@ export class MusicService { type: music.type as unknown as MusicType, status: music.status as unknown as MusicStatus, dateAdded: music.dateAdded, + dateStarted: music.dateStarted || undefined, dateCompleted: music.dateCompleted || undefined, + dateFinished: music.dateFinished || undefined, tags: music.tags ?? [], links: music.links ?? [], createdAt: music.createdAt, @@ -103,7 +109,9 @@ export class MusicService { type: music.type as unknown as MusicType, status: music.status as unknown as MusicStatus, dateAdded: music.dateAdded, + dateStarted: music.dateStarted || undefined, dateCompleted: music.dateCompleted || undefined, + dateFinished: music.dateFinished || undefined, tags: music.tags ?? [], links: music.links ?? [], createdAt: music.createdAt, diff --git a/api/src/app/services/show.service.ts b/api/src/app/services/show.service.ts index 57d7206..7d87652 100644 --- a/api/src/app/services/show.service.ts +++ b/api/src/app/services/show.service.ts @@ -22,7 +22,9 @@ export class ShowService { type: show.type as unknown as ShowType, status: show.status as unknown as ShowStatus, dateAdded: show.dateAdded, + dateStarted: show.dateStarted || undefined, dateCompleted: show.dateCompleted || undefined, + dateFinished: show.dateFinished || undefined, tags: show.tags ?? [], links: show.links ?? [], createdAt: show.createdAt, @@ -42,7 +44,9 @@ export class ShowService { type: show.type as unknown as ShowType, status: show.status as unknown as ShowStatus, dateAdded: show.dateAdded, + dateStarted: show.dateStarted || undefined, dateCompleted: show.dateCompleted || undefined, + dateFinished: show.dateFinished || undefined, tags: show.tags ?? [], links: show.links ?? [], createdAt: show.createdAt, @@ -64,7 +68,9 @@ export class ShowService { type: show.type as unknown as ShowType, status: show.status as unknown as ShowStatus, dateAdded: show.dateAdded, + dateStarted: show.dateStarted || undefined, dateCompleted: show.dateCompleted || undefined, + dateFinished: show.dateFinished || undefined, tags: show.tags ?? [], links: show.links ?? [], createdAt: show.createdAt, @@ -91,7 +97,9 @@ export class ShowService { type: show.type as unknown as ShowType, status: show.status as unknown as ShowStatus, dateAdded: show.dateAdded, + dateStarted: show.dateStarted || undefined, dateCompleted: show.dateCompleted || undefined, + dateFinished: show.dateFinished || undefined, tags: show.tags ?? [], links: show.links ?? [], createdAt: show.createdAt, diff --git a/api/src/app/utils/logger.ts b/api/src/app/utils/logger.ts new file mode 100644 index 0000000..10d3df6 --- /dev/null +++ b/api/src/app/utils/logger.ts @@ -0,0 +1,9 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { Logger } from "@nhcarrigan/logger"; + +export const logger = new Logger("Library", process.env.LOG_TOKEN ?? ""); \ No newline at end of file diff --git a/api/src/main.ts b/api/src/main.ts index b54fdb7..3270acd 100644 --- a/api/src/main.ts +++ b/api/src/main.ts @@ -1,9 +1,42 @@ import Fastify from 'fastify'; import { app } from './app/app'; +import { logger } from './app/utils/logger'; const host = process.env.HOST ?? 'localhost'; const port = process.env.PORT ? Number(process.env.PORT) : 12321; +// Global error handlers +process.on('uncaughtException', (error: Error) => { + void logger.error('Uncaught Exception', error); + process.exit(1); +}); + +process.on('unhandledRejection', (reason: unknown) => { + const error = reason instanceof Error ? reason : new Error(String(reason)); + void logger.error('Unhandled Rejection', error); + process.exit(1); +}); + +process.on('warning', (warning: Error) => { + void logger.log('warn', `Process Warning: ${warning.name} - ${warning.message}`); +}); + +process.on('SIGTERM', () => { + void logger.log('info', 'SIGTERM signal received: closing HTTP server'); + server.close(() => { + void logger.log('info', 'HTTP server closed'); + process.exit(0); + }); +}); + +process.on('SIGINT', () => { + void logger.log('info', 'SIGINT signal received: closing HTTP server'); + server.close(() => { + void logger.log('info', 'HTTP server closed'); + process.exit(0); + }); +}); + // Instantiate Fastify with some config const server = Fastify({ logger: true, @@ -19,6 +52,6 @@ server.listen({ port, host }, (err) => { server.log.error(err); process.exit(1); } else { - console.log(`[ ready ] http://${host}:${port}`); + void logger.log('info', `Server ready at http://${host}:${port}`); } }); diff --git a/api/src/test-setup.ts b/api/src/test-setup.ts new file mode 100644 index 0000000..a394aba --- /dev/null +++ b/api/src/test-setup.ts @@ -0,0 +1,47 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +// Set required environment variables for tests +process.env.JWT_SECRET = 'test-secret'; +process.env.DISCORD_CLIENT_ID = 'test-client-id'; +process.env.DISCORD_CLIENT_SECRET = 'test-client-secret'; +process.env.DOMAIN = 'http://localhost:3000'; +process.env.API_URL = 'http://localhost:3000/api'; +process.env.DATABASE_URL = 'postgresql://test:test@localhost:5432/test'; +process.env.BASE_URL = 'http://localhost:4200'; +process.env.NODE_ENV = 'test'; + +// Mock ESM packages to avoid import issues in Jest +jest.mock('jsdom', () => ({ + JSDOM: class { + window = { + document: { + createElement: jest.fn(() => ({})), + }, + }; + }, +})); + +jest.mock('marked', () => ({ + marked: jest.fn((input: string) => `

${input}

`), +})); + +jest.mock('dompurify', () => { + const mockDOMPurify = { + sanitize: jest.fn((input: string) => input), + addHook: jest.fn(), + }; + const createDOMPurify = jest.fn(() => mockDOMPurify); + return createDOMPurify; +}); + +jest.mock('@nhcarrigan/logger', () => ({ + Logger: class { + log = jest.fn().mockResolvedValue(undefined); + error = jest.fn().mockResolvedValue(undefined); + metric = jest.fn().mockResolvedValue(undefined); + }, +})); \ No newline at end of file diff --git a/api/tsconfig.app.json b/api/tsconfig.app.json index 43114b8..2d3bdf4 100644 --- a/api/tsconfig.app.json +++ b/api/tsconfig.app.json @@ -10,6 +10,7 @@ "jest.config.ts", "jest.config.cts", "src/**/*.spec.ts", - "src/**/*.test.ts" + "src/**/*.test.ts", + "src/test-setup.ts" ] } diff --git a/apps/frontend/src/app/app.config.ts b/apps/frontend/src/app/app.config.ts index 3fe03c2..5e709b8 100644 --- a/apps/frontend/src/app/app.config.ts +++ b/apps/frontend/src/app/app.config.ts @@ -2,6 +2,7 @@ import { ApplicationConfig, provideBrowserGlobalErrorListeners, APP_INITIALIZER, + ErrorHandler, } from '@angular/core'; import { provideRouter } from '@angular/router'; import { provideHttpClient, withInterceptors, HTTP_INTERCEPTORS } from '@angular/common/http'; @@ -9,12 +10,19 @@ import { appRoutes } from './app.routes'; import { AuthService } from './services/auth.service'; import { AuthInterceptor } from './interceptors/auth.interceptor'; import { initializeAuth } from './initializers/auth.initializer'; +import { GlobalErrorHandler } from './services/global-error-handler.service'; +import { ConsoleLoggerService } from './services/console-logger.service'; +import { initializeConsoleLogger } from './initializers/console-logger.initializer'; export const appConfig: ApplicationConfig = { providers: [ provideBrowserGlobalErrorListeners(), provideRouter(appRoutes), provideHttpClient(), + { + provide: ErrorHandler, + useClass: GlobalErrorHandler + }, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, @@ -25,6 +33,12 @@ export const appConfig: ApplicationConfig = { useFactory: initializeAuth, deps: [AuthService], multi: true + }, + { + provide: APP_INITIALIZER, + useFactory: initializeConsoleLogger, + deps: [ConsoleLoggerService], + multi: true } ], }; diff --git a/apps/frontend/src/app/app.html b/apps/frontend/src/app/app.html index 4bdc0fb..f447414 100644 --- a/apps/frontend/src/app/app.html +++ b/apps/frontend/src/app/app.html @@ -3,3 +3,4 @@ + diff --git a/apps/frontend/src/app/app.ts b/apps/frontend/src/app/app.ts index 88e48d6..7826492 100644 --- a/apps/frontend/src/app/app.ts +++ b/apps/frontend/src/app/app.ts @@ -2,10 +2,11 @@ import { Component, inject, OnInit } from '@angular/core'; import { RouterModule } from '@angular/router'; import { HeaderComponent } from './components/header/header.component'; import { FooterComponent } from './components/footer/footer.component'; +import { ToastComponent } from './components/toast/toast.component'; import { AnalyticsService } from './services/analytics.service'; @Component({ - imports: [RouterModule, HeaderComponent, FooterComponent], + imports: [RouterModule, HeaderComponent, FooterComponent, ToastComponent], selector: 'app-root', templateUrl: './app.html', styleUrl: './app.scss', diff --git a/apps/frontend/src/app/components/admin/admin-suggestions.component.ts b/apps/frontend/src/app/components/admin/admin-suggestions.component.ts index 2a7b175..a0198ed 100644 --- a/apps/frontend/src/app/components/admin/admin-suggestions.component.ts +++ b/apps/frontend/src/app/components/admin/admin-suggestions.component.ts @@ -39,22 +39,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared- All ({{ suggestions().length }})
@@ -1571,7 +1571,7 @@ export class ArtGalleryComponent implements OnInit { try { await this.suggestionService.createSuggestion({ - entityType: SuggestionEntity.ART, + entityType: SuggestionEntity.art, title: this.suggestedArt.title, artist: this.suggestedArt.artist, imageUrl: this.suggestedArt.imageUrl, diff --git a/apps/frontend/src/app/components/books/books-list.component.ts b/apps/frontend/src/app/components/books/books-list.component.ts index bd180cc..3bfaa06 100644 --- a/apps/frontend/src/app/components/books/books-list.component.ts +++ b/apps/frontend/src/app/components/books/books-list.component.ts @@ -79,9 +79,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of newBook.tags; track tag; let i = $index) { {{ tag }} @@ -144,8 +164,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
-
- +
@for (link of newBook.links; track link.url; let i = $index) {
@@ -222,9 +241,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of editBook.tags; track tag; let i = $index) { {{ tag }} @@ -287,8 +326,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
-
- +
@for (link of editBook.links; track link.url; let i = $index) {
@@ -421,8 +459,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti @if (showFilters()) {
- -
+
@for (tag of allTags(); track tag) {
@if (loading()) { @@ -548,12 +592,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
} + @if (book.dateStarted) { +

+ Started: {{ formatDate(book.dateStarted) }} +

+ } + @if (book.dateFinished) {

Finished: {{ formatDate(book.dateFinished) }}

} + @if (book.createdAt) { +

+ Added: {{ formatDate(book.createdAt) }} +

+ } + + @if (book.updatedAt) { +

+ Updated: {{ formatDate(book.updatedAt) }} +

+ } + @if (authService.isAdmin()) {
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of newGame.tags; track tag; let i = $index) { {{ tag }} @@ -132,8 +152,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
-
- +
@for (link of newGame.links; track link.url; let i = $index) {
@@ -198,9 +217,30 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of editGame.tags; track tag; let i = $index) { {{ tag }} @@ -263,8 +302,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
-
- +
@for (link of editGame.links; track link.url; let i = $index) {
@@ -436,6 +474,13 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti > Backlog ({{ backlogCount() }}) +
@if (loading()) { @@ -504,6 +549,26 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
} + @if (game.dateStarted) { +

+ Started: {{ formatDate(game.dateStarted) }} +

+ } + + @if (game.dateFinished) { +

+ Finished: {{ formatDate(game.dateFinished) }} +

+ } + +

+ Added: {{ formatDate(game.createdAt) }} +

+ +

+ Updated: {{ formatDate(game.updatedAt) }} +

+ @if (authService.isAdmin()) {
+
+ @if (user.avatar) { + + } + @if (showDropdown()) { +
+ @if (!user.isAdmin) { + My Suggestions + } + My Likes + @if (user.isAdmin) { + Users + Audit + Suggestions + } + +
+ } +
} @else { } @@ -122,6 +139,75 @@ import { ApiService } from '../../services/api.service'; color: var(--witch-lavender); } + .user-menu { + position: relative; + } + + .user-avatar { + width: 40px; + height: 40px; + border-radius: 50%; + border: 2px solid var(--witch-lavender); + transition: all 0.3s; + cursor: pointer; + } + + .user-avatar:hover { + border-color: var(--witch-moon); + transform: scale(1.1); + } + + .dropdown-menu { + position: absolute; + top: 50px; + right: 0; + background-color: var(--witch-purple); + border: 2px solid var(--witch-lavender); + border-radius: 8px; + padding: 0.5rem 0; + min-width: 180px; + box-shadow: 0 4px 12px var(--witch-shadow); + z-index: 1000; + animation: fadeIn 0.2s ease-in; + } + + @keyframes fadeIn { + from { + opacity: 0; + transform: translateY(-10px); + } + to { + opacity: 1; + transform: translateY(0); + } + } + + .dropdown-item { + display: block; + width: 100%; + padding: 0.75rem 1rem; + color: var(--witch-lavender); + text-decoration: none; + background: none; + border: none; + text-align: left; + font-size: 0.9rem; + cursor: pointer; + transition: all 0.2s; + } + + .dropdown-item:hover { + background-color: var(--witch-plum); + color: var(--witch-moon); + } + + .logout-btn { + border-top: 1px solid var(--witch-lavender); + margin-top: 0.5rem; + padding-top: 0.75rem; + font-weight: 500; + } + .admin-badge { background-color: var(--witch-rose); color: var(--witch-moon); @@ -190,6 +276,7 @@ export class HeaderComponent implements OnInit { authService = inject(AuthService); private apiService = inject(ApiService); version = signal(null); + showDropdown = signal(false); ngOnInit() { this.apiService.get<{ version: string }>('/version').subscribe({ @@ -198,11 +285,20 @@ export class HeaderComponent implements OnInit { }); } + toggleDropdown() { + this.showDropdown.update(v => !v); + } + + closeDropdown() { + this.showDropdown.set(false); + } + login() { this.authService.login(); } logout() { + this.closeDropdown(); this.authService.logout().subscribe(); } } \ No newline at end of file diff --git a/apps/frontend/src/app/components/manga/manga-list.component.ts b/apps/frontend/src/app/components/manga/manga-list.component.ts index 3fa1bdc..4030f30 100644 --- a/apps/frontend/src/app/components/manga/manga-list.component.ts +++ b/apps/frontend/src/app/components/manga/manga-list.component.ts @@ -68,9 +68,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of newManga.tags; track tag; let i = $index) { {{ tag }} @@ -133,8 +153,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
-
- +
@for (link of newManga.links; track link.url; let i = $index) {
@@ -200,9 +219,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of editManga.tags; track tag; let i = $index) { {{ tag }} @@ -265,8 +304,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
-
- +
@for (link of editManga.links; track link.url; let i = $index) {
@@ -439,6 +477,13 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion > Want to Read ({{ wantToReadCount() }}) +
@if (loading()) { @@ -505,6 +550,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
} + @if (manga.dateStarted) { +

+ Started: {{ formatDate(manga.dateStarted) }} +

+ } + + @if (manga.dateFinished) { +

+ Finished: {{ formatDate(manga.dateFinished) }} +

+ } + + @if (manga.createdAt) { +

+ Added: {{ formatDate(manga.createdAt) }} +

+ } + + @if (manga.updatedAt) { +

+ Updated: {{ formatDate(manga.updatedAt) }} +

+ } + @if (authService.isAdmin()) {
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of newMusic.tags; track tag; let i = $index) { {{ tag }} @@ -142,8 +162,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
-
- +
@for (link of newMusic.links; track link.url; let i = $index) {
@@ -218,9 +237,30 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of editMusicData.tags; track tag; let i = $index) { {{ tag }} @@ -283,8 +322,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
-
- +
@for (link of editMusicData.links; track link.url; let i = $index) {
@@ -500,6 +538,13 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, > Want to Listen ({{ wantToListenCount() }}) +
@@ -581,9 +626,27 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
} - @if (music.dateCompleted) { -

- Completed: {{ formatDate(music.dateCompleted) }} + @if (music.dateStarted) { +

+ Started: {{ formatDate(music.dateStarted) }} +

+ } + + @if (music.dateFinished) { +

+ Finished: {{ formatDate(music.dateFinished) }} +

+ } + + @if (music.createdAt) { +

+ Added: {{ formatDate(music.createdAt) }} +

+ } + + @if (music.updatedAt) { +

+ Updated: {{ formatDate(music.updatedAt) }}

} @@ -1017,7 +1080,10 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, margin: 0.5rem 0; } - .date-completed { + .date-started, + .date-finished, + .date-added, + .date-updated { font-size: 0.85rem; color: var(--witch-plum); margin-top: 0.5rem; @@ -1435,6 +1501,7 @@ export class MusicListComponent implements OnInit { listeningCount = computed(() => this.music().filter(m => m.status === MusicStatus.listening).length); completedCount = computed(() => this.music().filter(m => m.status === MusicStatus.completed).length); wantToListenCount = computed(() => this.music().filter(m => m.status === MusicStatus.wantToListen).length); + retiredCount = computed(() => this.music().filter(m => m.status === MusicStatus.retired).length); allTags = computed(() => { const tagsSet = new Set(); @@ -1488,11 +1555,13 @@ export class MusicListComponent implements OnInit { totalFilteredMusic = computed(() => this.filteredMusic().length); - newMusic: Partial = { + newMusic: Partial & { dateStarted?: Date; dateFinished?: Date } = { title: '', artist: '', type: MusicType.album, status: MusicStatus.wantToListen, + dateStarted: undefined, + dateFinished: undefined, rating: undefined, notes: '', tags: [], @@ -1583,6 +1652,7 @@ export class MusicListComponent implements OnInit { case MusicStatus.listening: return 'Currently Listening'; case MusicStatus.completed: return 'Completed'; case MusicStatus.wantToListen: return 'Want to Listen'; + case MusicStatus.retired: return 'Retired'; } } @@ -1599,6 +1669,8 @@ export class MusicListComponent implements OnInit { artist: '', type: MusicType.album, status: MusicStatus.wantToListen, + dateStarted: undefined, + dateFinished: undefined, rating: undefined, notes: '', coverArt: undefined, @@ -1665,6 +1737,8 @@ export class MusicListComponent implements OnInit { artist: this.newMusic.artist, type: this.newMusic.type, status: this.newMusic.status, + dateStarted: this.newMusic.dateStarted ? new Date(this.newMusic.dateStarted) : undefined, + dateFinished: this.newMusic.dateFinished ? new Date(this.newMusic.dateFinished) : undefined, rating: this.newMusic.rating, notes: this.newMusic.notes, coverArt: this.newMusic.coverArt, @@ -1693,6 +1767,8 @@ export class MusicListComponent implements OnInit { artist: music.artist, type: music.type, status: music.status, + dateStarted: music.dateStarted, + dateFinished: music.dateFinished, rating: music.rating, notes: music.notes, coverArt: music.coverArt, @@ -1721,7 +1797,13 @@ export class MusicListComponent implements OnInit { const music = this.editingMusic(); if (!music || !this.editMusicData.title || !this.editMusicData.artist || !this.editMusicData.type || !this.editMusicData.status) return; - this.musicService.updateMusic(music.id, this.editMusicData).subscribe(() => { + const updateData = { + ...this.editMusicData, + dateStarted: this.editMusicData.dateStarted ? new Date(this.editMusicData.dateStarted) : undefined, + dateFinished: this.editMusicData.dateFinished ? new Date(this.editMusicData.dateFinished) : undefined, + }; + + this.musicService.updateMusic(music.id, updateData).subscribe(() => { this.loadMusic(); this.cancelEdit(); }); @@ -1919,7 +2001,7 @@ export class MusicListComponent implements OnInit { try { await this.suggestionService.createSuggestion({ - entityType: SuggestionEntity.MUSIC, + entityType: SuggestionEntity.music, title: this.suggestedMusic.title, artist: this.suggestedMusic.artist, type: this.suggestedMusic.type, diff --git a/apps/frontend/src/app/components/my-likes/my-likes.component.ts b/apps/frontend/src/app/components/my-likes/my-likes.component.ts index cde8192..4c77078 100644 --- a/apps/frontend/src/app/components/my-likes/my-likes.component.ts +++ b/apps/frontend/src/app/components/my-likes/my-likes.component.ts @@ -373,12 +373,12 @@ export class MyLikesComponent implements OnInit { } getItemTitle(likedItem: LikedItemDto): string { - const item = likedItem.item; + const item = likedItem.item as any; return item.title || item.name || 'Untitled'; } getItemSubtitle(likedItem: LikedItemDto): string { - const item = likedItem.item; + const item = likedItem.item as any; const type = likedItem.like.entityType; switch (type) { @@ -400,7 +400,7 @@ export class MyLikesComponent implements OnInit { } getItemImage(likedItem: LikedItemDto): string | null { - const item = likedItem.item; + const item = likedItem.item as any; return item.coverImage || item.imageUrl || null; } diff --git a/apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts b/apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts index 6846c3d..8a6872b 100644 --- a/apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts +++ b/apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts @@ -43,22 +43,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared- All ({{ suggestions().length }})
- @if (suggestion.status === SuggestionStatus.DECLINED && suggestion.declineReason) { + @if (suggestion.status === SuggestionStatus.declined && suggestion.declineReason) {
Reason: {{ suggestion.declineReason }}
@@ -337,9 +337,9 @@ export class MySuggestionsComponent implements OnInit { SuggestionStatus = SuggestionStatus; - unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.UNREVIEWED).length; - acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.ACCEPTED).length; - declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.DECLINED).length; + unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.unreviewed).length; + acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.accepted).length; + declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.declined).length; filteredSuggestions = computed(() => { const filter = this.statusFilter(); @@ -397,20 +397,20 @@ export class MySuggestionsComponent implements OnInit { getStatusLabel(status: SuggestionStatus): string { switch (status) { - case SuggestionStatus.UNREVIEWED: return 'Pending Review'; - case SuggestionStatus.ACCEPTED: return 'Accepted'; - case SuggestionStatus.DECLINED: return 'Declined'; + case SuggestionStatus.unreviewed: return 'Pending Review'; + case SuggestionStatus.accepted: return 'Accepted'; + case SuggestionStatus.declined: return 'Declined'; } } getEntityIcon(entityType: SuggestionEntity): string { switch (entityType) { - case SuggestionEntity.GAME: return '🎮'; - case SuggestionEntity.BOOK: return '📚'; - case SuggestionEntity.MUSIC: return '🎵'; - case SuggestionEntity.MANGA: return '📖'; - case SuggestionEntity.SHOW: return '📺'; - case SuggestionEntity.ART: return '🎨'; + case SuggestionEntity.game: return '🎮'; + case SuggestionEntity.book: return '📚'; + case SuggestionEntity.music: return '🎵'; + case SuggestionEntity.manga: return '📖'; + case SuggestionEntity.show: return '📺'; + case SuggestionEntity.art: return '🎨'; } } diff --git a/apps/frontend/src/app/components/shows/shows-list.component.ts b/apps/frontend/src/app/components/shows/shows-list.component.ts index 8c11c3b..1f6268e 100644 --- a/apps/frontend/src/app/components/shows/shows-list.component.ts +++ b/apps/frontend/src/app/components/shows/shows-list.component.ts @@ -66,9 +66,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of newShow.tags; track tag; let i = $index) { {{ tag }} @@ -131,8 +151,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
-
- +
@for (link of newShow.links; track link.url; let i = $index) {
@@ -196,9 +215,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg +
+
+ + +
+ +
+ + +
+
- -
+
@for (tag of editShow.tags; track tag; let i = $index) { {{ tag }} @@ -261,8 +300,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
-
- +
@for (link of editShow.links; track link.url; let i = $index) {
@@ -433,6 +471,13 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg > Want to Watch ({{ wantToWatchCount() }}) +
@if (loading()) { @@ -499,6 +544,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
} + @if (show.dateStarted) { +

+ Started: {{ formatDate(show.dateStarted) }} +

+ } + + @if (show.dateFinished) { +

+ Finished: {{ formatDate(show.dateFinished) }} +

+ } + + @if (show.createdAt) { +

+ Added: {{ formatDate(show.createdAt) }} +

+ } + + @if (show.updatedAt) { +

+ Updated: {{ formatDate(show.updatedAt) }} +

+ } + @if (authService.isAdmin()) {
+
+ } +
diff --git a/apps/frontend/src/app/components/toast/toast.component.ts b/apps/frontend/src/app/components/toast/toast.component.ts new file mode 100644 index 0000000..611df14 --- /dev/null +++ b/apps/frontend/src/app/components/toast/toast.component.ts @@ -0,0 +1,18 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { Component, inject } from '@angular/core'; +import { ToastService } from '../../services/toast.service'; + +@Component({ + selector: 'app-toast', + standalone: true, + templateUrl: './toast.component.html', + styleUrls: ['./toast.component.css'] +}) +export class ToastComponent { + public toastService = inject(ToastService); +} diff --git a/apps/frontend/src/app/initializers/console-logger.initializer.ts b/apps/frontend/src/app/initializers/console-logger.initializer.ts new file mode 100644 index 0000000..3145fc1 --- /dev/null +++ b/apps/frontend/src/app/initializers/console-logger.initializer.ts @@ -0,0 +1,13 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { ConsoleLoggerService } from '../services/console-logger.service'; + +export function initializeConsoleLogger(consoleLogger: ConsoleLoggerService) { + return () => { + consoleLogger.initialise(); + }; +} diff --git a/apps/frontend/src/app/interceptors/auth.interceptor.ts b/apps/frontend/src/app/interceptors/auth.interceptor.ts index 769e1af..8b8b4d4 100644 --- a/apps/frontend/src/app/interceptors/auth.interceptor.ts +++ b/apps/frontend/src/app/interceptors/auth.interceptor.ts @@ -16,17 +16,17 @@ import { import { Observable, catchError, throwError, switchMap, BehaviorSubject, filter, take } from 'rxjs'; import { Router } from '@angular/router'; import { environment } from '../../environments/environment'; +import { ToastService } from '../services/toast.service'; @Injectable() export class AuthInterceptor implements HttpInterceptor { + private router = inject(Router); + private http = inject(HttpClient); + private toast = inject(ToastService); + private isRefreshing = false; private refreshTokenSubject = new BehaviorSubject(null); - constructor( - private router: Router, - private http: HttpClient - ) {} - intercept(request: HttpRequest, next: HttpHandler): Observable> { // Clone the request to add withCredentials const authReq = request.clone({ @@ -38,6 +38,9 @@ export class AuthInterceptor implements HttpInterceptor { if (error.status === 401 && !request.url.includes('/auth/refresh') && !request.url.includes('/auth/logout')) { return this.handle401Error(authReq, next); } + + // Show toast for other HTTP errors + this.showErrorToast(error); return throwError(() => error); }) ); @@ -61,6 +64,7 @@ export class AuthInterceptor implements HttpInterceptor { catchError((err) => { this.isRefreshing = false; this.refreshTokenSubject.next(false); + this.toast.error('Your session has expired. Please log in again.'); this.router.navigate(['/']); return throwError(() => err); }) @@ -78,4 +82,28 @@ export class AuthInterceptor implements HttpInterceptor { }) ); } + + private showErrorToast(error: HttpErrorResponse): void { + let message = 'Something went wrong. Please try again.'; + + switch (error.status) { + case 400: + message = error.error?.message || 'Invalid request. Please check your input.'; + break; + case 403: + message = 'You do not have permission to perform this action.'; + break; + case 404: + message = 'Resource not found.'; + break; + case 500: + message = 'Server error. Please try again later.'; + break; + case 0: + message = 'Network error. Please check your connection.'; + break; + } + + this.toast.error(message); + } } \ No newline at end of file diff --git a/apps/frontend/src/app/services/art.service.ts b/apps/frontend/src/app/services/art.service.ts index 1824b97..c70da7b 100644 --- a/apps/frontend/src/app/services/art.service.ts +++ b/apps/frontend/src/app/services/art.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types'; providedIn: 'root' }) export class ArtService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllArt(): Observable { return this.api.get('/art'); diff --git a/apps/frontend/src/app/services/auth.service.ts b/apps/frontend/src/app/services/auth.service.ts index 1a9189c..ec7c2c4 100644 --- a/apps/frontend/src/app/services/auth.service.ts +++ b/apps/frontend/src/app/services/auth.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable, signal } from '@angular/core'; +import { Injectable, signal, inject } from '@angular/core'; import { Router } from '@angular/router'; import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs'; import { ApiService } from './api.service'; @@ -16,15 +16,14 @@ import { HttpClient } from '@angular/common/http'; providedIn: 'root' }) export class AuthService { + private api = inject(ApiService); + private router = inject(Router); + private http = inject(HttpClient); + private currentUser = signal(null); public readonly user = this.currentUser.asReadonly(); private refreshing = false; - - constructor( - private api: ApiService, - private router: Router, - private http: HttpClient - ) {} + private refreshInterval?: ReturnType; login(): void { // Redirect to API login endpoint @@ -35,6 +34,7 @@ export class AuthService { return this.api.get('/auth/me').pipe( tap(response => { this.currentUser.set(response.user); + this.startRefreshTimer(); }), catchError(error => { if (error.status === 401) { @@ -42,9 +42,11 @@ export class AuthService { switchMap(() => this.api.get('/auth/me')), tap(response => { this.currentUser.set(response.user); + this.startRefreshTimer(); }), catchError(() => { this.currentUser.set(null); + this.stopRefreshTimer(); return throwError(() => error); }) ); @@ -68,20 +70,45 @@ export class AuthService { tap(response => { this.currentUser.set(response.user); this.refreshing = false; + this.startRefreshTimer(); }), catchError(error => { this.refreshing = false; this.currentUser.set(null); + this.stopRefreshTimer(); return throwError(() => error); }) ); } + private startRefreshTimer(): void { + this.stopRefreshTimer(); + + // Refresh token every 13 minutes (before 15-minute expiry) + const refreshIntervalMs = 13 * 60 * 1000; + this.refreshInterval = setInterval(() => { + this.refreshToken().subscribe({ + error: (err) => { + console.error('Background token refresh failed:', err); + this.stopRefreshTimer(); + } + }); + }, refreshIntervalMs); + } + + private stopRefreshTimer(): void { + if (this.refreshInterval) { + clearInterval(this.refreshInterval); + this.refreshInterval = undefined; + } + } + logout(): Observable<{ message: string }> { return this.api.post<{ message: string }>('/auth/logout', {}).pipe( tap(() => { this.currentUser.set(null); this.api.clearCsrfToken(); + this.stopRefreshTimer(); this.router.navigate(['/']); }) ); @@ -89,6 +116,7 @@ export class AuthService { clearUser(): void { this.currentUser.set(null); + this.stopRefreshTimer(); } isAuthenticated(): boolean { diff --git a/apps/frontend/src/app/services/books.service.ts b/apps/frontend/src/app/services/books.service.ts index be899b7..3b0d8b8 100644 --- a/apps/frontend/src/app/services/books.service.ts +++ b/apps/frontend/src/app/services/books.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types'; providedIn: 'root' }) export class BooksService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllBooks(): Observable { return this.api.get('/books'); diff --git a/apps/frontend/src/app/services/comments.service.ts b/apps/frontend/src/app/services/comments.service.ts index 4490492..454bc6f 100644 --- a/apps/frontend/src/app/services/comments.service.ts +++ b/apps/frontend/src/app/services/comments.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Comment, CreateCommentDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Comment, CreateCommentDto } from '@library/shared-types'; providedIn: 'root' }) export class CommentsService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getCommentsForGame(gameId: string): Observable { return this.api.get(`/games/${gameId}/comments`); diff --git a/apps/frontend/src/app/services/console-logger.service.ts b/apps/frontend/src/app/services/console-logger.service.ts new file mode 100644 index 0000000..89f311e --- /dev/null +++ b/apps/frontend/src/app/services/console-logger.service.ts @@ -0,0 +1,127 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { Injectable, inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { environment } from '../../environments/environment'; + +interface LogPayload { + level: 'debug' | 'info' | 'warn' | 'error'; + message: string; + context?: string; + error?: { + name: string; + message: string; + stack?: string; + }; +} + +@Injectable({ + providedIn: 'root' +}) +export class ConsoleLoggerService { + private http = inject(HttpClient); + private originalConsole = { + log: console.log.bind(console), + error: console.error.bind(console), + warn: console.warn.bind(console), + debug: console.debug.bind(console), + info: console.info.bind(console) + }; + + /** + * Initialises the console override to pipe logs to the API. + */ + initialise(): void { + console.log = (...args: unknown[]) => { + this.originalConsole.log(...args); + this.sendLog('info', this.formatArgs(args)); + }; + + console.info = (...args: unknown[]) => { + this.originalConsole.info(...args); + this.sendLog('info', this.formatArgs(args)); + }; + + console.debug = (...args: unknown[]) => { + this.originalConsole.debug(...args); + this.sendLog('debug', this.formatArgs(args)); + }; + + console.warn = (...args: unknown[]) => { + this.originalConsole.warn(...args); + this.sendLog('warn', this.formatArgs(args)); + }; + + console.error = (...args: unknown[]) => { + this.originalConsole.error(...args); + + // Check if the first argument is an Error object + if (args[0] instanceof Error) { + const error = args[0]; + this.sendLog('error', error.message, 'Console', { + name: error.name, + message: error.message, + stack: error.stack + }); + } else { + this.sendLog('error', this.formatArgs(args)); + } + }; + + // Global error handlers + window.addEventListener('error', (event: ErrorEvent) => { + this.originalConsole.error('Uncaught Error:', event.error); + this.sendLog('error', event.message, 'Window Error', { + name: event.error?.name || 'Error', + message: event.message, + stack: event.error?.stack + }); + }); + + window.addEventListener('unhandledrejection', (event: PromiseRejectionEvent) => { + this.originalConsole.error('Unhandled Promise Rejection:', event.reason); + + const error = event.reason instanceof Error ? event.reason : new Error(String(event.reason)); + this.sendLog('error', error.message, 'Unhandled Rejection', { + name: error.name, + message: error.message, + stack: error.stack + }); + }); + } + + private formatArgs(args: unknown[]): string { + return args.map(arg => { + if (typeof arg === 'string') { + return arg; + } + if (arg instanceof Error) { + return `${arg.name}: ${arg.message}`; + } + try { + return JSON.stringify(arg); + } catch { + return String(arg); + } + }).join(' '); + } + + private sendLog(level: LogPayload['level'], message: string, context?: string, error?: LogPayload['error']): void { + const payload: LogPayload = { + level, + message, + context, + error + }; + + this.http.post(`${environment.apiUrl}/log`, payload).subscribe({ + error: (err) => { + this.originalConsole.error('Failed to send log to API:', err); + } + }); + } +} diff --git a/apps/frontend/src/app/services/games.service.ts b/apps/frontend/src/app/services/games.service.ts index 6f40437..fa95d12 100644 --- a/apps/frontend/src/app/services/games.service.ts +++ b/apps/frontend/src/app/services/games.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types'; providedIn: 'root' }) export class GamesService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllGames(): Observable { return this.api.get('/games'); diff --git a/apps/frontend/src/app/services/global-error-handler.service.ts b/apps/frontend/src/app/services/global-error-handler.service.ts new file mode 100644 index 0000000..d798e38 --- /dev/null +++ b/apps/frontend/src/app/services/global-error-handler.service.ts @@ -0,0 +1,43 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { ErrorHandler, Injectable, inject } from '@angular/core'; +import { ToastService } from './toast.service'; + +@Injectable() +export class GlobalErrorHandler implements ErrorHandler { + private toast = inject(ToastService); + + handleError(error: Error): void { + console.error('Global error caught:', error); + + // Show user-friendly error message + const message = this.getUserFriendlyMessage(error); + this.toast.error(message); + } + + private getUserFriendlyMessage(error: Error): string { + // Check for common error types + if (error.message.includes('Http failure')) { + return 'Network error. Please check your connection.'; + } + + if (error.message.includes('401') || error.message.includes('403')) { + return 'Your session has expired. Please refresh the page.'; + } + + if (error.message.includes('404')) { + return 'Resource not found.'; + } + + if (error.message.includes('500')) { + return 'Server error. Please try again later.'; + } + + // Generic error message + return 'Something went wrong. Please try again.'; + } +} diff --git a/apps/frontend/src/app/services/manga.service.ts b/apps/frontend/src/app/services/manga.service.ts index d89d464..b5fc787 100644 --- a/apps/frontend/src/app/services/manga.service.ts +++ b/apps/frontend/src/app/services/manga.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types'; providedIn: 'root' }) export class MangaService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllManga(): Observable { return this.api.get('/manga'); diff --git a/apps/frontend/src/app/services/music.service.ts b/apps/frontend/src/app/services/music.service.ts index f87d165..69fb0a7 100644 --- a/apps/frontend/src/app/services/music.service.ts +++ b/apps/frontend/src/app/services/music.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types'; providedIn: 'root' }) export class MusicService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllMusic(): Observable { return this.api.get('/music'); diff --git a/apps/frontend/src/app/services/shows.service.ts b/apps/frontend/src/app/services/shows.service.ts index 594eeb1..ad5feec 100644 --- a/apps/frontend/src/app/services/shows.service.ts +++ b/apps/frontend/src/app/services/shows.service.ts @@ -4,7 +4,7 @@ * @author Naomi Carrigan */ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { Observable } from 'rxjs'; import { ApiService } from './api.service'; import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types'; @@ -13,7 +13,8 @@ import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types'; providedIn: 'root' }) export class ShowsService { - constructor(private api: ApiService) {} + private api = inject(ApiService); + getAllShows(): Observable { return this.api.get('/shows'); diff --git a/apps/frontend/src/app/services/toast.service.ts b/apps/frontend/src/app/services/toast.service.ts new file mode 100644 index 0000000..a69e8af --- /dev/null +++ b/apps/frontend/src/app/services/toast.service.ts @@ -0,0 +1,70 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { Injectable, signal } from '@angular/core'; + +export interface Toast { + id: number; + message: string; + type: 'error' | 'success' | 'info' | 'warning'; + duration: number; +} + +@Injectable({ + providedIn: 'root' +}) +export class ToastService { + private toasts = signal([]); + public readonly toastList = this.toasts.asReadonly(); + private nextId = 0; + + /** + * Show an error toast notification. + */ + error(message: string, duration = 5000): void { + this.addToast(message, 'error', duration); + } + + /** + * Show a success toast notification. + */ + success(message: string, duration = 3000): void { + this.addToast(message, 'success', duration); + } + + /** + * Show an info toast notification. + */ + info(message: string, duration = 3000): void { + this.addToast(message, 'info', duration); + } + + /** + * Show a warning toast notification. + */ + warning(message: string, duration = 4000): void { + this.addToast(message, 'warning', duration); + } + + /** + * Remove a toast by ID. + */ + remove(id: number): void { + this.toasts.update(toasts => toasts.filter(t => t.id !== id)); + } + + private addToast(message: string, type: Toast['type'], duration: number): void { + const id = this.nextId++; + const toast: Toast = { id, message, type, duration }; + + this.toasts.update(toasts => [...toasts, toast]); + + // Auto-remove after duration + setTimeout(() => { + this.remove(id); + }, duration); + } +} diff --git a/dev.env b/dev.env new file mode 100644 index 0000000..d0fc8c4 --- /dev/null +++ b/dev.env @@ -0,0 +1,24 @@ +# Database +DATABASE_URL="op://Environment Variables - Naomi/Library/mongo url" + +# JWT Secret +JWT_SECRET="op://Environment Variables - Naomi/Library/jwt secret" + +# Discord OAuth +DISCORD_CLIENT_ID="op://Environment Variables - Naomi/Library/discord client id" +DISCORD_CLIENT_SECRET="op://Environment Variables - Naomi/Library/discord client secret" + +# Admin Configuration +ADMIN_DISCORD_ID="op://Environment Variables - Naomi/Library/admin discord id" + +# Discord Server +DISCORD_GUILD_ID="op://Environment Variables - Naomi/Library/discord server id" +SPONSOR_ROLE_ID="op://Environment Variables - Naomi/Library/sponsor role id" +MOD_ROLE_ID="op://Environment Variables - Naomi/Library/mod role id" +STAFF_ROLE_ID="op://Environment Variables - Naomi/Library/staff role id" + +# Application URL +BASE_URL="op://Environment Variables - Naomi/Library/localhost url" + +# Logger +LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth" \ No newline at end of file diff --git a/eslint.config.mjs b/eslint.config.mjs index 3f59adf..d13b71c 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,8 +1,3 @@ import nhcarrigan from '@nhcarrigan/eslint-config'; -export default [ - ...nhcarrigan, - { - ignores: ['**/dist', '**/out-tsc', 'node_modules'], - }, -]; \ No newline at end of file +export default nhcarrigan; \ No newline at end of file diff --git a/package.json b/package.json index d3ca0b5..ac30da9 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,9 @@ "version": "0.0.0", "license": "MIT", "scripts": { + "dev": "nx run-many --target=build --all && NODE_ENV=production op run --env-file=dev.env -- node dist/api/main.js", "lint": "nx run-many --target=lint --all", - "build": "nx run-many --target=build --all", + "build": "pnpm db:gen && nx run-many --target=build --all", "test": "nx run-many --target=test --all --passWithNoTests", "build:frontend": "nx build frontend --configuration=production", "build:api": "nx build api", @@ -25,21 +26,22 @@ "@angular/platform-browser": "21.1.2", "@angular/router": "21.1.2", "@fastify/autoload": "6.0.3", - "@fastify/cookie": "^11.0.2", - "@fastify/cors": "^11.0.0", - "@fastify/csrf-protection": "^7.1.0", - "@fastify/helmet": "^13.0.2", - "@fastify/jwt": "^10.0.0", - "@fastify/oauth2": "^8.1.2", - "@fastify/rate-limit": "^10.3.0", + "@fastify/cookie": "11.0.2", + "@fastify/cors": "11.0.0", + "@fastify/csrf-protection": "7.1.0", + "@fastify/helmet": "13.0.2", + "@fastify/jwt": "10.0.0", + "@fastify/oauth2": "8.1.2", + "@fastify/rate-limit": "10.3.0", "@fastify/sensible": "6.0.4", - "@fastify/static": "^9.0.0", + "@fastify/static": "9.0.0", + "@nhcarrigan/logger": "1.1.1", "@prisma/client": "6.19.2", - "dompurify": "^3.3.1", + "dompurify": "3.3.1", "fastify": "5.7.3", "fastify-plugin": "5.0.1", - "jsdom": "^28.0.0", - "marked": "^17.0.1", + "jsdom": "28.0.0", + "marked": "17.0.1", "rxjs": "7.8.2" }, "devDependencies": { @@ -65,10 +67,10 @@ "@swc-node/register": "1.9.2", "@swc/core": "1.5.29", "@swc/helpers": "0.5.18", - "@types/dompurify": "^3.2.0", + "@types/dompurify": "3.2.0", "@types/jest": "30.0.0", - "@types/jsdom": "^27.0.0", - "@types/jsonwebtoken": "^9.0.10", + "@types/jsdom": "27.0.0", + "@types/jsonwebtoken": "9.0.10", "@types/node": "20.19.9", "@typescript-eslint/utils": "8.54.0", "angular-eslint": "21.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcea136..6c258b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,37 +30,40 @@ importers: specifier: 6.0.3 version: 6.0.3 '@fastify/cookie': - specifier: ^11.0.2 + specifier: 11.0.2 version: 11.0.2 '@fastify/cors': - specifier: ^11.0.0 - version: 11.2.0 + specifier: 11.0.0 + version: 11.0.0 '@fastify/csrf-protection': - specifier: ^7.1.0 + specifier: 7.1.0 version: 7.1.0 '@fastify/helmet': - specifier: ^13.0.2 + specifier: 13.0.2 version: 13.0.2 '@fastify/jwt': - specifier: ^10.0.0 + specifier: 10.0.0 version: 10.0.0 '@fastify/oauth2': - specifier: ^8.1.2 + specifier: 8.1.2 version: 8.1.2 '@fastify/rate-limit': - specifier: ^10.3.0 + specifier: 10.3.0 version: 10.3.0 '@fastify/sensible': specifier: 6.0.4 version: 6.0.4 '@fastify/static': - specifier: ^9.0.0 + specifier: 9.0.0 version: 9.0.0 + '@nhcarrigan/logger': + specifier: 1.1.1 + version: 1.1.1 '@prisma/client': specifier: 6.19.2 version: 6.19.2(prisma@6.19.2(typescript@5.9.3))(typescript@5.9.3) dompurify: - specifier: ^3.3.1 + specifier: 3.3.1 version: 3.3.1 fastify: specifier: 5.7.3 @@ -69,10 +72,10 @@ importers: specifier: 5.0.1 version: 5.0.1 jsdom: - specifier: ^28.0.0 + specifier: 28.0.0 version: 28.0.0 marked: - specifier: ^17.0.1 + specifier: 17.0.1 version: 17.0.1 rxjs: specifier: 7.8.2 @@ -145,16 +148,16 @@ importers: specifier: 0.5.18 version: 0.5.18 '@types/dompurify': - specifier: ^3.2.0 + specifier: 3.2.0 version: 3.2.0 '@types/jest': specifier: 30.0.0 version: 30.0.0 '@types/jsdom': - specifier: ^27.0.0 + specifier: 27.0.0 version: 27.0.0 '@types/jsonwebtoken': - specifier: ^9.0.10 + specifier: 9.0.10 version: 9.0.10 '@types/node': specifier: 20.19.9 @@ -1611,8 +1614,8 @@ packages: '@fastify/cookie@11.0.2': resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==} - '@fastify/cors@11.2.0': - resolution: {integrity: sha512-LbLHBuSAdGdSFZYTLVA3+Ch2t+sA6nq3Ejc6XLAKiQ6ViS2qFnvicpj0htsx03FyYeLs04HfRNBsz/a8SvbcUw==} + '@fastify/cors@11.0.0': + resolution: {integrity: sha512-41Bx0LVGr2a6DnnhDN/SgfDlTRNZtEs8niPxyoymV6Hw09AIdz/9Rn/0Fpu+pBOs6kviwS44JY2mB8NcU2qSAA==} '@fastify/csrf-protection@7.1.0': resolution: {integrity: sha512-I2TDd4SRRYQivKCMHdB/8py+CPO9DT0e63lh4DO8MDCJh8NROq8HD/iO0IjYtwhsD3bZhr0cBXsFdfPvyTmzNw==} @@ -2488,6 +2491,9 @@ packages: typescript: '>=5' vitest: '>=2' + '@nhcarrigan/logger@1.1.1': + resolution: {integrity: sha512-P6OEQFHDtf6psybYGljuCxkSW6DLQCsx1aZZ3w4YKBXHBFjDbhuvpM9K1kPhVN48hakitx2WPLEoIFr6YZELYw==} + '@noble/hashes@1.4.0': resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==} engines: {node: '>= 16'} @@ -6890,6 +6896,9 @@ packages: resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} engines: {node: '>= 18'} + mnemonist@0.40.0: + resolution: {integrity: sha512-kdd8AFNig2AD5Rkih7EPCXhu/iMvwevQFX/uEiGhZyPZi7fHqOoF4V4kHLpCfysxXMgQ4B52kdPMCwARshKvEg==} + mnemonist@0.40.3: resolution: {integrity: sha512-Vjyr90sJ23CKKH/qPAgUKicw/v6pRoamxIEDFOF8uSgFME7DqPRpHgRTejWVjkdGg5dXj0/NyxZHZ9bcjH+2uQ==} @@ -11558,10 +11567,10 @@ snapshots: cookie: 1.1.1 fastify-plugin: 5.0.1 - '@fastify/cors@11.2.0': + '@fastify/cors@11.0.0': dependencies: fastify-plugin: 5.0.1 - toad-cache: 3.7.0 + mnemonist: 0.40.0 '@fastify/csrf-protection@7.1.0': dependencies: @@ -12722,6 +12731,8 @@ snapshots: - eslint-import-resolver-webpack - supports-color + '@nhcarrigan/logger@1.1.1': {} + '@noble/hashes@1.4.0': {} '@nodelib/fs.scandir@2.1.5': @@ -18229,6 +18240,10 @@ snapshots: dependencies: minipass: 7.1.2 + mnemonist@0.40.0: + dependencies: + obliterator: 2.0.5 + mnemonist@0.40.3: dependencies: obliterator: 2.0.5 diff --git a/prod.env b/prod.env index f49d9e2..6e20d68 100644 --- a/prod.env +++ b/prod.env @@ -18,4 +18,7 @@ MOD_ROLE_ID="op://Environment Variables - Naomi/Library/mod role id" STAFF_ROLE_ID="op://Environment Variables - Naomi/Library/staff role id" # Application URL -BASE_URL="op://Environment Variables - Naomi/Library/base url" \ No newline at end of file +BASE_URL="op://Environment Variables - Naomi/Library/base url" + +# Logger +LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth" \ No newline at end of file diff --git a/shared-types/eslint.config.mjs b/shared-types/eslint.config.mjs index 57fad5a..8be400c 100644 --- a/shared-types/eslint.config.mjs +++ b/shared-types/eslint.config.mjs @@ -3,19 +3,113 @@ import { fileURLToPath } from 'url'; import { dirname } from 'path'; const __dirname = dirname(fileURLToPath(import.meta.url)); +const nhcarriganArray = Array.isArray(nhcarrigan) ? nhcarrigan : [nhcarrigan]; + +// Jest globals that should be available in test files +const jestGlobals = { + afterAll: 'readonly', + afterEach: 'readonly', + beforeAll: 'readonly', + beforeEach: 'readonly', + describe: 'readonly', + expect: 'readonly', + it: 'readonly', + jest: 'readonly', + test: 'readonly', +}; + +// Map the nhcarrigan configs to handle shared-types directory structure +const mappedConfigs = nhcarriganArray.flatMap(config => { + if (!config.files) { + return [config]; + } + + const newFiles = config.files + .map(pattern => { + if (pattern.startsWith('src/')) { + return pattern.replace('src/', 'shared-types/src/'); + } else if (pattern.startsWith('test/')) { + return pattern.replace('test/', 'shared-types/test/'); + } + return pattern; + }); + + // Determine if this is a test file config + const isTestFile = newFiles[0]?.includes('test/'); + + // Update configs to handle shared-types directory structure + let updatedConfig = { ...config, files: newFiles }; + + if (config.languageOptions) { + const updatedLanguageOptions = { ...config.languageOptions }; + + // Add Jest globals for test files + if (isTestFile) { + updatedLanguageOptions.globals = { ...updatedLanguageOptions.globals, ...jestGlobals }; + } + + // Update parserOptions to use our tsconfig with proper tsconfigRootDir + if (config.languageOptions.parserOptions) { + updatedLanguageOptions.parserOptions = { + ...config.languageOptions.parserOptions, + tsconfigRootDir: __dirname, + }; + } + + updatedConfig = { ...updatedConfig, languageOptions: updatedLanguageOptions }; + } + + return [updatedConfig]; +}); export default [ - ...nhcarrigan, { - ignores: ['**/dist', '**/out-tsc', 'node_modules'], + ignores: ['dist', 'out-tsc', 'node_modules'], }, + ...mappedConfigs, + // Disable vitest rules for this Jest project { - files: ['**/*.ts'], - languageOptions: { - parserOptions: { - project: './tsconfig.lib.json', - tsconfigRootDir: __dirname, - }, + files: ['shared-types/test/**/*.spec.ts'], + rules: { + 'vitest/consistent-test-filename': 'off', + 'vitest/consistent-test-it': 'off', + 'vitest/expect-expect': 'off', + 'vitest/no-alias-methods': 'off', + 'vitest/no-commented-out-tests': 'off', + 'vitest/no-conditional-expect': 'off', + 'vitest/no-conditional-in-test': 'off', + 'vitest/no-conditional-tests': 'off', + 'vitest/no-disabled-tests': 'off', + 'vitest/no-duplicate-hooks': 'off', + 'vitest/no-focused-tests': 'off', + 'vitest/no-identical-title': 'off', + 'vitest/no-standalone-expect': 'off', + 'vitest/no-test-prefixes': 'off', + 'vitest/no-test-return-statement': 'off', + 'vitest/prefer-comparison-matcher': 'off', + 'vitest/prefer-each': 'off', + 'vitest/prefer-equality-matcher': 'off', + 'vitest/prefer-expect-assertions': 'off', + 'vitest/prefer-expect-resolves': 'off', + 'vitest/prefer-hooks-in-order': 'off', + 'vitest/prefer-hooks-on-top': 'off', + 'vitest/prefer-lowercase-title': 'off', + 'vitest/prefer-mock-promise-shorthand': 'off', + 'vitest/prefer-spy-on': 'off', + 'vitest/prefer-strict-equal': 'off', + 'vitest/prefer-to-be': 'off', + 'vitest/prefer-to-be-falsy': 'off', + 'vitest/prefer-to-be-object': 'off', + 'vitest/prefer-to-be-truthy': 'off', + 'vitest/prefer-to-contain': 'off', + 'vitest/prefer-to-have-length': 'off', + 'vitest/prefer-todo': 'off', + 'vitest/require-hook': 'off', + 'vitest/require-to-throw-message': 'off', + 'vitest/require-top-level-describe': 'off', + 'vitest/valid-describe-callback': 'off', + 'vitest/valid-expect': 'off', + 'vitest/valid-title': 'off', }, }, ]; \ No newline at end of file diff --git a/shared-types/jest.config.ts b/shared-types/jest.config.ts new file mode 100644 index 0000000..647931b --- /dev/null +++ b/shared-types/jest.config.ts @@ -0,0 +1,22 @@ +export default { + displayName: "shared-types", + preset: "../jest.preset.js", + testEnvironment: "node", + transform: { + "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "/tsconfig.spec.json" }], + }, + moduleFileExtensions: ["ts", "js", "html"], + coverageDirectory: "../coverage/shared-types", + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, + collectCoverageFrom: [ + "src/**/*.ts", + "!src/index.ts", // Just re-exports + ], +}; \ No newline at end of file diff --git a/shared-types/project.json b/shared-types/project.json index 37ea472..0a4478f 100644 --- a/shared-types/project.json +++ b/shared-types/project.json @@ -5,5 +5,20 @@ "projectType": "library", "tags": [], "// targets": "to see all targets run: nx show project shared-types --web", - "targets": {} + "targets": { + "lint": { + "executor": "@nx/eslint:lint", + "options": { + "lintFilePatterns": ["shared-types/**/*.ts"] + } + }, + "test": { + "executor": "@nx/jest:jest", + "options": { + "jestConfig": "shared-types/jest.config.ts", + "passWithNoTests": true + }, + "outputs": ["{workspaceRoot}/coverage/{projectRoot}"] + } + } } diff --git a/shared-types/src/index.ts b/shared-types/src/index.ts index a906df5..66519bd 100644 --- a/shared-types/src/index.ts +++ b/shared-types/src/index.ts @@ -1,17 +1,17 @@ /** - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License * @author Naomi Carrigan */ -export * from "./lib/game.types"; -export * from "./lib/book.types"; -export * from "./lib/music.types"; -export * from "./lib/art.types"; -export * from "./lib/show.types"; -export * from "./lib/manga.types"; -export type * from "./lib/auth.types"; -export * from "./lib/comment.types"; +export type * from "./lib/art.types"; export * from "./lib/audit.types"; +export type * from "./lib/auth.types"; +export * from "./lib/book.types"; +export type * from "./lib/comment.types"; +export type * from "./lib/common.types"; +export * from "./lib/game.types"; +export type * from "./lib/like.types"; +export * from "./lib/manga.types"; +export * from "./lib/music.types"; +export * from "./lib/show.types"; export * from "./lib/suggestion.types"; -export * from "./lib/common.types"; -export * from "./lib/like.types"; \ No newline at end of file diff --git a/shared-types/src/lib/art.types.ts b/shared-types/src/lib/art.types.ts index 66754c6..e05190d 100644 --- a/shared-types/src/lib/art.types.ts +++ b/shared-types/src/lib/art.types.ts @@ -1,30 +1,33 @@ /** - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License + * @author Naomi Carrigan */ -import { Link } from "./common.types"; +import type { Link } from "./common.types"; -export interface Art { - id: string; - title: string; - artist: string; +interface Art { + id: string; + title: string; + artist: string; description?: string; - imageUrl: string; - tags: string[]; - links: Link[]; - dateAdded: Date; - createdAt: Date; - updatedAt: Date; + imageUrl: string; + tags: Array; + links: Array; + dateAdded: Date; + createdAt: Date; + updatedAt: Date; } -export interface CreateArtDto { - title: string; - artist: string; +interface CreateArtDto { + title: string; + artist: string; description?: string; - imageUrl: string; - tags?: string[]; - links?: Link[]; + imageUrl: string; + tags?: Array; + links?: Array; } -export interface UpdateArtDto extends Partial {} +type UpdateArtDto = Partial; + +export type { Art, CreateArtDto, UpdateArtDto }; diff --git a/shared-types/src/lib/audit.types.ts b/shared-types/src/lib/audit.types.ts index e1a2f3a..e0d708d 100644 --- a/shared-types/src/lib/audit.types.ts +++ b/shared-types/src/lib/audit.types.ts @@ -1,58 +1,72 @@ -export enum AuditAction { - LOGIN = "LOGIN", - LOGOUT = "LOGOUT", - LOGIN_FAILED = "LOGIN_FAILED", - COMMENT_CREATE = "COMMENT_CREATE", - COMMENT_UPDATE = "COMMENT_UPDATE", - COMMENT_DELETE = "COMMENT_DELETE", - ENTRY_CREATE = "ENTRY_CREATE", - ENTRY_UPDATE = "ENTRY_UPDATE", - ENTRY_DELETE = "ENTRY_DELETE", - LIKE = "LIKE", - UNLIKE = "UNLIKE", - USER_BAN = "USER_BAN", - USER_UNBAN = "USER_UNBAN", - RATE_LIMIT_EXCEEDED = "RATE_LIMIT_EXCEEDED", - CSRF_VALIDATION_FAILED = "CSRF_VALIDATION_FAILED", - UNAUTHORIZED_ACCESS = "UNAUTHORIZED_ACCESS", +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +enum AuditAction { + login = "LOGIN", + logout = "LOGOUT", + loginFailed = "LOGIN_FAILED", + commentCreate = "COMMENT_CREATE", + commentUpdate = "COMMENT_UPDATE", + commentDelete = "COMMENT_DELETE", + entryCreate = "ENTRY_CREATE", + entryUpdate = "ENTRY_UPDATE", + entryDelete = "ENTRY_DELETE", + like = "LIKE", + unlike = "UNLIKE", + userBan = "USER_BAN", + userUnban = "USER_UNBAN", + rateLimitExceeded = "RATE_LIMIT_EXCEEDED", + csrfValidationFailed = "CSRF_VALIDATION_FAILED", + unauthorizedAccess = "UNAUTHORIZED_ACCESS", } -export enum AuditCategory { - AUTH = "AUTH", - CONTENT = "CONTENT", - ADMIN = "ADMIN", - SECURITY = "SECURITY", +enum AuditCategory { + auth = "AUTH", + content = "CONTENT", + admin = "ADMIN", + security = "SECURITY", } -export interface AuditLogUser { - id: string; +interface AuditLogUser { + id: string; username: string; - avatar?: string; + avatar?: string; } -export interface AuditLog { - id: string; - action: AuditAction; - category: AuditCategory; - userId?: string; - user?: AuditLogUser; +interface AuditLog { + id: string; + action: AuditAction; + category: AuditCategory; + userId?: string; + user?: AuditLogUser; targetUserId?: string; - targetUser?: AuditLogUser; + targetUser?: AuditLogUser; resourceType?: string; - resourceId?: string; - details?: string; - userAgent?: string; - success: boolean; - createdAt: Date; + resourceId?: string; + details?: string; + userAgent?: string; + success: boolean; + createdAt: Date; } -export interface AuditLogFilters { - action?: AuditAction; - category?: AuditCategory; - userId?: string; - success?: boolean; +interface AuditLogFilters { + action?: AuditAction; + category?: AuditCategory; + userId?: string; + success?: boolean; startDate?: Date; - endDate?: Date; - page?: number; - limit?: number; + endDate?: Date; + page?: number; + limit?: number; } + +export { + AuditAction, + AuditCategory, + type AuditLog, + type AuditLogFilters, + type AuditLogUser, +}; diff --git a/shared-types/src/lib/auth.types.ts b/shared-types/src/lib/auth.types.ts index 7417a74..bdef58f 100644 --- a/shared-types/src/lib/auth.types.ts +++ b/shared-types/src/lib/auth.types.ts @@ -4,33 +4,36 @@ * @author Naomi Carrigan */ -export interface User { - id: string; - email: string; - username: string; - avatar?: string; +interface User { + id: string; + email: string; + username: string; + avatar?: string; discordId: string; - isAdmin: boolean; - isBanned: boolean; + isAdmin: boolean; + isBanned: boolean; inDiscord: boolean; - isVip: boolean; - isMod: boolean; - isStaff: boolean; + isVip: boolean; + isMod: boolean; + isStaff: boolean; } -export interface JwtPayload { +interface JwtPayload { + /** * User id. */ - sub: string; - email: string; + sub: string; + email: string; username: string; - isAdmin: boolean; - iat?: number; - exp?: number; + isAdmin: boolean; + iat?: number; + exp?: number; } -export interface AuthResponse { +interface AuthResponse { accessToken: string; - user: User; -} \ No newline at end of file + user: User; +} + +export type { AuthResponse, JwtPayload, User }; diff --git a/shared-types/src/lib/book.types.ts b/shared-types/src/lib/book.types.ts index 348a2ef..87ddc26 100644 --- a/shared-types/src/lib/book.types.ts +++ b/shared-types/src/lib/book.types.ts @@ -1,46 +1,53 @@ /** - * @copyright 2026 NHCarrigan - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License + * @author Naomi Carrigan */ -export enum BookStatus { +import type { Link } from "./common.types"; + +enum BookStatus { reading = "READING", finished = "FINISHED", toRead = "TO_READ", + retired = "RETIRED", } -import { Link } from "./common.types"; - -export interface Book { +interface Book { id: string; title: string; author: string; isbn?: string; status: BookStatus; dateAdded: Date; + dateStarted?: Date; dateFinished?: Date; rating?: number; notes?: string; coverImage?: string; - tags: string[]; - links: Link[]; + tags: Array; + links: Array; createdAt: Date; updatedAt: Date; } -export interface CreateBookDto { - title: string; - author: string; - isbn?: string; - status: BookStatus; - rating?: number; - notes?: string; - coverImage?: string; - tags?: string[]; - links?: Link[]; +interface CreateBookDto { + title: string; + author: string; + isbn?: string; + status: BookStatus; + dateStarted?: Date; + dateFinished?: Date; + rating?: number; + notes?: string; + coverImage?: string; + tags?: Array; + links?: Array; } -export interface UpdateBookDto extends Partial { +interface UpdateBookDto extends Partial { + dateStarted?: Date; dateFinished?: Date; } + +export { type Book, BookStatus, type CreateBookDto, type UpdateBookDto }; diff --git a/shared-types/src/lib/comment.types.ts b/shared-types/src/lib/comment.types.ts index c8192cb..3e4ecd1 100644 --- a/shared-types/src/lib/comment.types.ts +++ b/shared-types/src/lib/comment.types.ts @@ -4,32 +4,34 @@ * @author Naomi Carrigan */ -export interface CommentUser { - id: string; - username: string; - avatar?: string; +interface CommentUser { + id: string; + username: string; + avatar?: string; inDiscord?: boolean; - isVip?: boolean; - isMod?: boolean; - isStaff?: boolean; + isVip?: boolean; + isMod?: boolean; + isStaff?: boolean; } -export interface Comment { - id: string; - content: string; +interface Comment { + id: string; + content: string; rawContent?: string; - userId: string; - user: CommentUser; - gameId?: string; - bookId?: string; - musicId?: string; - artId?: string; - showId?: string; - mangaId?: string; - createdAt: Date; - updatedAt: Date; + userId: string; + user: CommentUser; + gameId?: string; + bookId?: string; + musicId?: string; + artId?: string; + showId?: string; + mangaId?: string; + createdAt: Date; + updatedAt: Date; } -export interface CreateCommentDto { +interface CreateCommentDto { content: string; } + +export type { Comment, CommentUser, CreateCommentDto }; diff --git a/shared-types/src/lib/common.types.ts b/shared-types/src/lib/common.types.ts index 3c3044a..73d6baf 100644 --- a/shared-types/src/lib/common.types.ts +++ b/shared-types/src/lib/common.types.ts @@ -1,4 +1,10 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + export interface Link { title: string; - url: string; + url: string; } diff --git a/shared-types/src/lib/game.types.ts b/shared-types/src/lib/game.types.ts index e4beedb..842f1d5 100644 --- a/shared-types/src/lib/game.types.ts +++ b/shared-types/src/lib/game.types.ts @@ -1,44 +1,53 @@ /** - * @copyright 2026 NHCarrigan - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License + * @author Naomi Carrigan */ -export enum GameStatus { +import type { Link } from "./common.types"; + +enum GameStatus { playing = "PLAYING", completed = "COMPLETED", backlog = "BACKLOG", + retired = "RETIRED", } -import { Link } from "./common.types"; - -export interface Game { +interface Game { id: string; title: string; platform?: string; status: GameStatus; dateAdded: Date; + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; rating?: number; notes?: string; coverImage?: string; - tags: string[]; - links: Link[]; + tags: Array; + links: Array; createdAt: Date; updatedAt: Date; } -export interface CreateGameDto { - title: string; - platform?: string; - status: GameStatus; - rating?: number; - notes?: string; - coverImage?: string; - tags?: string[]; - links?: Link[]; +interface CreateGameDto { + title: string; + platform?: string; + status: GameStatus; + dateStarted?: Date; + dateFinished?: Date; + rating?: number; + notes?: string; + coverImage?: string; + tags?: Array; + links?: Array; } -export interface UpdateGameDto extends Partial { +interface UpdateGameDto extends Partial { + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; } + +export { type CreateGameDto, type Game, GameStatus, type UpdateGameDto }; diff --git a/shared-types/src/lib/like.types.ts b/shared-types/src/lib/like.types.ts index b9767b5..31d3e57 100644 --- a/shared-types/src/lib/like.types.ts +++ b/shared-types/src/lib/like.types.ts @@ -1,32 +1,38 @@ /** - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License * @author Naomi Carrigan */ -export interface Like { - id: string; - userId: string; - entityType: 'book' | 'game' | 'show' | 'manga' | 'music' | 'art'; - entityId: string; - createdAt: Date; +interface Like { + id: string; + userId: string; + entityType: "book" | "game" | "show" | "manga" | "music" | "art"; + entityId: string; + createdAt: Date; } -export type CreateLikeDto = Pick; +type CreateLikeDto = Pick; -export interface LikeCountDto { - entityId: string; +interface LikeCountDto { + entityId: string; entityType: string; - count: number; + count: number; } -export interface LikedItemDto { +interface LikedItemDto { like: Like; - item: any; // This will be the actual entity (Book, Game, etc.) + + /** + * This will be the actual entity (Book, Game, etc.). + */ + item: unknown; } // Response types -export interface LikeResponse { +interface LikeResponse { liked: boolean; count: number; -} \ No newline at end of file +} + +export type { CreateLikeDto, Like, LikeCountDto, LikedItemDto, LikeResponse }; diff --git a/shared-types/src/lib/manga.types.ts b/shared-types/src/lib/manga.types.ts index 0ae9747..8173597 100644 --- a/shared-types/src/lib/manga.types.ts +++ b/shared-types/src/lib/manga.types.ts @@ -1,44 +1,54 @@ /** - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License * @author Naomi Carrigan */ -export enum MangaStatus { +import type { Link } from "./common.types"; + +enum MangaStatus { reading = "READING", completed = "COMPLETED", wantToRead = "WANT_TO_READ", + retired = "RETIRED", } -import { Link } from "./common.types"; - -export interface Manga { +interface Manga { id: string; title: string; author: string; status: MangaStatus; dateAdded: Date; + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; rating?: number; notes?: string; coverImage?: string; - tags: string[]; - links: Link[]; + tags: Array; + links: Array; createdAt: Date; updatedAt: Date; } -export interface CreateMangaDto { - title: string; - author: string; - status: MangaStatus; - rating?: number; - notes?: string; - coverImage?: string; - tags?: string[]; - links?: Link[]; +interface CreateMangaDto { + title: string; + author: string; + status: MangaStatus; + dateStarted?: Date; + dateFinished?: Date; + rating?: number; + notes?: string; + coverImage?: string; + tags?: Array; + links?: Array; } -export interface UpdateMangaDto extends Partial { +interface UpdateMangaDto extends Partial { + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; } + +export { MangaStatus }; +export type { CreateMangaDto, Manga, UpdateMangaDto }; diff --git a/shared-types/src/lib/music.types.ts b/shared-types/src/lib/music.types.ts index 947e783..911210b 100644 --- a/shared-types/src/lib/music.types.ts +++ b/shared-types/src/lib/music.types.ts @@ -1,52 +1,62 @@ /** - * @copyright 2026 NHCarrigan - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License + * @author Naomi Carrigan */ -export enum MusicType { +import type { Link } from "./common.types"; + +enum MusicType { album = "ALBUM", single = "SINGLE", ep = "EP", } -export enum MusicStatus { +enum MusicStatus { listening = "LISTENING", completed = "COMPLETED", wantToListen = "WANT_TO_LISTEN", + retired = "RETIRED", } -import { Link } from "./common.types"; - -export interface Music { +interface Music { id: string; title: string; artist: string; type: MusicType; status: MusicStatus; dateAdded: Date; + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; rating?: number; notes?: string; coverArt?: string; - tags: string[]; - links: Link[]; + tags: Array; + links: Array; createdAt: Date; updatedAt: Date; } -export interface CreateMusicDto { - title: string; - artist: string; - type: MusicType; - status: MusicStatus; - rating?: number; - notes?: string; - coverArt?: string; - tags?: string[]; - links?: Link[]; +interface CreateMusicDto { + title: string; + artist: string; + type: MusicType; + status: MusicStatus; + dateStarted?: Date; + dateFinished?: Date; + rating?: number; + notes?: string; + coverArt?: string; + tags?: Array; + links?: Array; } -export interface UpdateMusicDto extends Partial { +interface UpdateMusicDto extends Partial { + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; } + +export { MusicStatus, MusicType }; +export type { CreateMusicDto, Music, UpdateMusicDto }; diff --git a/shared-types/src/lib/show.types.ts b/shared-types/src/lib/show.types.ts index d790fb8..6de3b94 100644 --- a/shared-types/src/lib/show.types.ts +++ b/shared-types/src/lib/show.types.ts @@ -1,51 +1,61 @@ /** - * @copyright 2026 NHCarrigan + * @copyright NHCarrigan * @license Naomi's Public License * @author Naomi Carrigan */ -export enum ShowType { +import type { Link } from "./common.types"; + +enum ShowType { tvSeries = "TV_SERIES", anime = "ANIME", film = "FILM", documentary = "DOCUMENTARY", } -export enum ShowStatus { +enum ShowStatus { watching = "WATCHING", completed = "COMPLETED", wantToWatch = "WANT_TO_WATCH", + retired = "RETIRED", } -import { Link } from "./common.types"; - -export interface Show { +interface Show { id: string; title: string; type: ShowType; status: ShowStatus; dateAdded: Date; + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; rating?: number; notes?: string; coverImage?: string; - tags: string[]; - links: Link[]; + tags: Array; + links: Array; createdAt: Date; updatedAt: Date; } -export interface CreateShowDto { - title: string; - type: ShowType; - status: ShowStatus; - rating?: number; - notes?: string; - coverImage?: string; - tags?: string[]; - links?: Link[]; +interface CreateShowDto { + title: string; + type: ShowType; + status: ShowStatus; + dateStarted?: Date; + dateFinished?: Date; + rating?: number; + notes?: string; + coverImage?: string; + tags?: Array; + links?: Array; } -export interface UpdateShowDto extends Partial { +interface UpdateShowDto extends Partial { + dateStarted?: Date; dateCompleted?: Date; + dateFinished?: Date; } + +export { ShowStatus, ShowType }; +export type { CreateShowDto, Show, UpdateShowDto }; diff --git a/shared-types/src/lib/suggestion.types.ts b/shared-types/src/lib/suggestion.types.ts index 3f410bb..c9e8089 100644 --- a/shared-types/src/lib/suggestion.types.ts +++ b/shared-types/src/lib/suggestion.types.ts @@ -1,104 +1,110 @@ -import type { CreateGameDto } from "./game.types"; -import type { CreateBookDto } from "./book.types"; -import type { CreateMusicDto } from "./music.types"; +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + import type { CreateArtDto } from "./art.types"; -import type { CreateShowDto } from "./show.types"; +import type { CreateBookDto } from "./book.types"; +import type { CreateGameDto } from "./game.types"; import type { CreateMangaDto } from "./manga.types"; +import type { CreateMusicDto } from "./music.types"; +import type { CreateShowDto } from "./show.types"; -export enum SuggestionEntity { - GAME = "GAME", - BOOK = "BOOK", - MUSIC = "MUSIC", - ART = "ART", - SHOW = "SHOW", - MANGA = "MANGA", +enum SuggestionEntity { + game = "GAME", + book = "BOOK", + music = "MUSIC", + art = "ART", + show = "SHOW", + manga = "MANGA", } -export enum SuggestionStatus { - UNREVIEWED = "UNREVIEWED", - ACCEPTED = "ACCEPTED", - DECLINED = "DECLINED", +enum SuggestionStatus { + unreviewed = "UNREVIEWED", + accepted = "ACCEPTED", + declined = "DECLINED", } -export interface SuggestionUser { - id: string; - username: string; - avatar?: string; +interface SuggestionUser { + id: string; + username: string; + avatar?: string; inDiscord: boolean; - isVip: boolean; - isMod: boolean; - isStaff: boolean; + isVip: boolean; + isMod: boolean; + isStaff: boolean; } -export interface Suggestion { - id: string; - userId: string; - user: SuggestionUser; - entityType: SuggestionEntity; - status: SuggestionStatus; +interface Suggestion { + id: string; + userId: string; + user: SuggestionUser; + entityType: SuggestionEntity; + status: SuggestionStatus; declineReason?: string; - title: string; - gameData?: Omit; - bookData?: Omit; - musicData?: Omit; - artData?: CreateArtDto; - showData?: Omit; - mangaData?: Omit; - createdAt: Date; - updatedAt: Date; + title: string; + gameData?: Omit; + bookData?: Omit; + musicData?: Omit; + artData?: CreateArtDto; + showData?: Omit; + mangaData?: Omit; + createdAt: Date; + updatedAt: Date; } -export interface CreateGameSuggestionDto { - entityType: SuggestionEntity.GAME; - title: string; - platform?: string; - notes?: string; +interface CreateGameSuggestionDto { + entityType: SuggestionEntity.game; + title: string; + platform?: string; + notes?: string; coverImage?: string; } -export interface CreateBookSuggestionDto { - entityType: SuggestionEntity.BOOK; - title: string; - author: string; - isbn?: string; - notes?: string; +interface CreateBookSuggestionDto { + entityType: SuggestionEntity.book; + title: string; + author: string; + isbn?: string; + notes?: string; coverImage?: string; } -export interface CreateMusicSuggestionDto { - entityType: SuggestionEntity.MUSIC; - title: string; - artist: string; - type: string; - notes?: string; - coverArt?: string; +interface CreateMusicSuggestionDto { + entityType: SuggestionEntity.music; + title: string; + artist: string; + type: string; + notes?: string; + coverArt?: string; } -export interface CreateArtSuggestionDto { - entityType: SuggestionEntity.ART; - title: string; - artist: string; +interface CreateArtSuggestionDto { + entityType: SuggestionEntity.art; + title: string; + artist: string; description?: string; - imageUrl: string; + imageUrl: string; } -export interface CreateShowSuggestionDto { - entityType: SuggestionEntity.SHOW; - title: string; - type: string; - notes?: string; +interface CreateShowSuggestionDto { + entityType: SuggestionEntity.show; + title: string; + type: string; + notes?: string; coverImage?: string; } -export interface CreateMangaSuggestionDto { - entityType: SuggestionEntity.MANGA; - title: string; - author: string; - notes?: string; +interface CreateMangaSuggestionDto { + entityType: SuggestionEntity.manga; + title: string; + author: string; + notes?: string; coverImage?: string; } -export type CreateSuggestionDto = +type CreateSuggestionDto = | CreateGameSuggestionDto | CreateBookSuggestionDto | CreateMusicSuggestionDto @@ -106,22 +112,37 @@ export type CreateSuggestionDto = | CreateShowSuggestionDto | CreateMangaSuggestionDto; -export interface DeclineSuggestionDto { +interface DeclineSuggestionDto { reason?: string; } -export interface AcceptWithEditsDto { - title?: string; - platform?: string; - author?: string; - artist?: string; - isbn?: string; - type?: string; - notes?: string; +interface AcceptWithEditsDto { + title?: string; + platform?: string; + author?: string; + artist?: string; + isbn?: string; + type?: string; + notes?: string; description?: string; - coverImage?: string; - coverArt?: string; - imageUrl?: string; - tags?: string[]; - links?: Array<{ label: string; url: string }>; + coverImage?: string; + coverArt?: string; + imageUrl?: string; + tags?: Array; + links?: Array<{ label: string; url: string }>; } + +export { SuggestionEntity, SuggestionStatus }; +export type { + AcceptWithEditsDto, + CreateArtSuggestionDto, + CreateBookSuggestionDto, + CreateGameSuggestionDto, + CreateMangaSuggestionDto, + CreateMusicSuggestionDto, + CreateShowSuggestionDto, + CreateSuggestionDto, + DeclineSuggestionDto, + Suggestion, + SuggestionUser, +}; diff --git a/shared-types/test/art.types.spec.ts b/shared-types/test/art.types.spec.ts new file mode 100644 index 0000000..fe0993a --- /dev/null +++ b/shared-types/test/art.types.spec.ts @@ -0,0 +1,110 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import type { Art, CreateArtDto, UpdateArtDto } from "../src/lib/art.types"; + +describe("art Types", () => { + describe("art interface", () => { + it("should accept valid art object with minimal fields", () => { + const art: Art = { + artist: "Jane Doe", + createdAt: new Date(), + dateAdded: new Date(), + id: "art123", + imageUrl: "https://example.com/sunset.jpg", + links: [], + tags: [], + title: "Beautiful Sunset", + updatedAt: new Date(), + }; + + expect(art.description).toBeUndefined(); + expect(art.tags).toEqual([]); + }); + + it("should accept valid art object with all fields", () => { + const fullArt: Art = { + artist: "John Smith", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + description: "A breathtaking view of the mountains", + id: "art456", + imageUrl: "https://example.com/mountains.jpg", + links: [ + { title: "Artist Portfolio", url: "https://artist.com" }, + { title: "Instagram", url: "https://instagram.com/artist" }, + ], + tags: [ "landscape", "nature", "mountains" ], + title: "Mountain Landscape", + updatedAt: new Date("2024-01-02"), + }; + + expect(fullArt.description).toBe("A breathtaking view of the mountains"); + expect(fullArt.tags).toHaveLength(3); + expect(fullArt.links).toHaveLength(2); + }); + }); + + describe("createArtDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateArtDto = { + artist: "New Artist", + imageUrl: "https://example.com/art.jpg", + title: "New Artwork", + }; + + expect(createDto.description).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateArtDto = { + artist: "Famous Artist", + description: "Detailed description", + imageUrl: "https://example.com/complete.jpg", + links: [ { title: "Website", url: "https://website.com" } ], + tags: [ "tag1", "tag2" ], + title: "Complete Artwork", + }; + + expect(fullCreateDto.tags).toEqual([ "tag1", "tag2" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateArtDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateArtDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates", () => { + const partialUpdate: UpdateArtDto = { + tags: [ "new-tag" ], + title: "Updated Title", + }; + + expect(partialUpdate.title).toBe("Updated Title"); + expect(partialUpdate.artist).toBeUndefined(); + expect(partialUpdate.tags).toEqual([ "new-tag" ]); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateArtDto = { + artist: "Different Artist", + description: "New description", + imageUrl: "https://example.com/new-image.jpg", + links: [ { title: "New Link", url: "https://newlink.com" } ], + tags: [ "updated", "tags" ], + title: "Completely New Title", + }; + + expect(fullUpdate.title).toBe("Completely New Title"); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/audit.types.spec.ts b/shared-types/test/audit.types.spec.ts new file mode 100644 index 0000000..b9e436e --- /dev/null +++ b/shared-types/test/audit.types.spec.ts @@ -0,0 +1,129 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { + AuditAction, + AuditCategory, + type AuditLog, + type AuditLogFilters, + type AuditLogUser, +} from "../src/lib/audit.types"; + +describe("audit Types", () => { + describe("auditAction enum", () => { + it("should have all expected action values", () => { + expect(AuditAction.login).toBe("LOGIN"); + expect(AuditAction.logout).toBe("LOGOUT"); + expect(AuditAction.loginFailed).toBe("LOGIN_FAILED"); + expect(AuditAction.commentCreate).toBe("COMMENT_CREATE"); + expect(AuditAction.commentUpdate).toBe("COMMENT_UPDATE"); + expect(AuditAction.commentDelete).toBe("COMMENT_DELETE"); + expect(AuditAction.entryCreate).toBe("ENTRY_CREATE"); + expect(AuditAction.entryUpdate).toBe("ENTRY_UPDATE"); + expect(AuditAction.entryDelete).toBe("ENTRY_DELETE"); + expect(AuditAction.like).toBe("LIKE"); + expect(AuditAction.unlike).toBe("UNLIKE"); + expect(AuditAction.userBan).toBe("USER_BAN"); + expect(AuditAction.userUnban).toBe("USER_UNBAN"); + expect(AuditAction.rateLimitExceeded).toBe("RATE_LIMIT_EXCEEDED"); + expect(AuditAction.csrfValidationFailed).toBe("CSRF_VALIDATION_FAILED"); + expect(AuditAction.unauthorizedAccess).toBe("UNAUTHORIZED_ACCESS"); + }); + }); + + describe("auditCategory enum", () => { + it("should have all expected category values", () => { + expect(AuditCategory.auth).toBe("AUTH"); + expect(AuditCategory.content).toBe("CONTENT"); + expect(AuditCategory.admin).toBe("ADMIN"); + expect(AuditCategory.security).toBe("SECURITY"); + }); + }); + + describe("auditLogUser interface", () => { + it("should accept valid user objects", () => { + const userWithAvatar: AuditLogUser = { + avatar: "https://example.com/avatar.png", + id: "user123", + username: "testuser", + }; + + const userWithoutAvatar: AuditLogUser = { + id: "user456", + username: "anotheruser", + }; + + expect(userWithAvatar.avatar).toBe("https://example.com/avatar.png"); + expect(userWithoutAvatar.avatar).toBeUndefined(); + }); + }); + + describe("auditLog interface", () => { + it("should accept valid audit log with minimal fields", () => { + const minimalLog: AuditLog = { + action: AuditAction.login, + category: AuditCategory.auth, + createdAt: new Date(), + id: "log123", + success: true, + }; + + expect(minimalLog.userId).toBeUndefined(); + expect(minimalLog.details).toBeUndefined(); + }); + + it("should accept valid audit log with all fields", () => { + const fullLog: AuditLog = { + action: AuditAction.commentDelete, + category: AuditCategory.admin, + createdAt: new Date(), + details: "Admin deleted inappropriate comment", + id: "log456", + resourceId: "comment123", + resourceType: "comment", + success: true, + targetUser: { + id: "user789", + username: "targetuser", + }, + targetUserId: "user789", + user: { + avatar: "https://example.com/avatar.png", + id: "user123", + username: "admin", + }, + userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64)", + userId: "user123", + }; + + expect(fullLog.user?.username).toBe("admin"); + expect(fullLog.targetUser?.username).toBe("targetuser"); + }); + }); + + describe("auditLogFilters interface", () => { + it("should accept empty filters", () => { + const emptyFilters: AuditLogFilters = {}; + expect(emptyFilters).toEqual({}); + }); + + it("should accept filters with all fields", () => { + const fullFilters: AuditLogFilters = { + action: AuditAction.login, + category: AuditCategory.auth, + endDate: new Date("2024-12-31"), + limit: 50, + page: 1, + startDate: new Date("2024-01-01"), + success: true, + userId: "user123", + }; + + expect(fullFilters.page).toBe(1); + expect(fullFilters.limit).toBe(50); + }); + }); +}); diff --git a/shared-types/test/auth.types.spec.ts b/shared-types/test/auth.types.spec.ts new file mode 100644 index 0000000..3354dae --- /dev/null +++ b/shared-types/test/auth.types.spec.ts @@ -0,0 +1,118 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import type { AuthResponse, JwtPayload, User } from "../src/lib/auth.types"; + +describe("auth Types", () => { + describe("user interface", () => { + it("should accept valid user objects", () => { + const userWithAvatar: User = { + avatar: "https://example.com/avatar.png", + discordId: "discord123", + email: "test@example.com", + id: "user123", + inDiscord: true, + isAdmin: true, + isBanned: false, + isMod: true, + isStaff: true, + isVip: false, + username: "testuser", + }; + + const userWithoutAvatar: User = { + discordId: "discord456", + email: "another@example.com", + id: "user456", + inDiscord: false, + isAdmin: false, + isBanned: false, + isMod: false, + isStaff: false, + isVip: true, + username: "anotheruser", + }; + + expect(userWithAvatar.avatar).toBe("https://example.com/avatar.png"); + expect(userWithoutAvatar.avatar).toBeUndefined(); + expect(userWithAvatar.isAdmin).toBeTruthy(); + expect(userWithoutAvatar.isVip).toBeTruthy(); + }); + + it("should handle all boolean flags correctly", () => { + const bannedUser: User = { + discordId: "discord789", + email: "banned@example.com", + id: "banned123", + inDiscord: false, + isAdmin: false, + isBanned: true, + isMod: false, + isStaff: false, + isVip: false, + username: "banneduser", + }; + + expect(bannedUser.isBanned).toBeTruthy(); + expect(bannedUser.isAdmin).toBeFalsy(); + expect(bannedUser.inDiscord).toBeFalsy(); + }); + }); + + describe("jwtPayload interface", () => { + it("should accept JWT payload with required fields", () => { + const payload: JwtPayload = { + email: "test@example.com", + isAdmin: false, + sub: "user123", + username: "testuser", + }; + + expect(payload.sub).toBe("user123"); + expect(payload.iat).toBeUndefined(); + expect(payload.exp).toBeUndefined(); + }); + + it("should accept JWT payload with timestamps", () => { + const now = Math.floor(Date.now() / 1000); + const payloadWithTimestamps: JwtPayload = { + email: "another@example.com", + exp: now + 3600, + iat: now, + isAdmin: true, + sub: "user456", + username: "anotheruser", // 1 hour + }; + + expect(payloadWithTimestamps.iat).toBe(now); + expect(payloadWithTimestamps.exp).toBe(now + 3600); + }); + }); + + describe("authResponse interface", () => { + it("should accept valid auth response", () => { + const authResponse: AuthResponse = { + accessToken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...", + user: { + avatar: "https://example.com/avatar.png", + discordId: "discord123", + email: "test@example.com", + id: "user123", + inDiscord: true, + isAdmin: false, + isBanned: false, + isMod: false, + isStaff: false, + isVip: false, + username: "testuser", + }, + }; + + expect(authResponse.accessToken).toContain("eyJ"); + expect(authResponse.user.username).toBe("testuser"); + }); + }); +}); diff --git a/shared-types/test/book.types.spec.ts b/shared-types/test/book.types.spec.ts new file mode 100644 index 0000000..7d8c813 --- /dev/null +++ b/shared-types/test/book.types.spec.ts @@ -0,0 +1,151 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { BookStatus } from "../src/lib/book.types"; +import type { Book, CreateBookDto, UpdateBookDto } from "../src/lib/book.types"; + +describe("book Types", () => { + describe("bookStatus enum", () => { + it("should have the correct values", () => { + expect(BookStatus.reading).toBe("READING"); + expect(BookStatus.finished).toBe("FINISHED"); + expect(BookStatus.toRead).toBe("TO_READ"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(BookStatus); + expect(values).toHaveLength(4); + expect(values).toContain("READING"); + expect(values).toContain("FINISHED"); + expect(values).toContain("TO_READ"); + expect(values).toContain("RETIRED"); + }); + }); + + describe("book interface", () => { + it("should accept valid book object with minimal fields", () => { + const book: Book = { + author: "F. Scott Fitzgerald", + createdAt: new Date("2024-01-15"), + dateAdded: new Date("2024-01-15"), + id: "book123", + links: [], + status: BookStatus.reading, + tags: [], + title: "The Great Gatsby", + updatedAt: new Date("2024-01-16"), + }; + + expect(book.isbn).toBeUndefined(); + expect(book.dateFinished).toBeUndefined(); + expect(book.rating).toBeUndefined(); + expect(book.notes).toBeUndefined(); + expect(book.coverImage).toBeUndefined(); + }); + + it("should accept valid book object with all fields", () => { + const fullBook: Book = { + author: "George Orwell", + coverImage: "https://example.com/1984-cover.jpg", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + dateFinished: new Date("2024-01-20"), + id: "book456", + isbn: "978-0-452-28423-4", + links: [ + { title: "Goodreads", url: "https://goodreads.com/book/1984" }, + { title: "Wikipedia", url: "https://wikipedia.org/wiki/1984" }, + ], + notes: "A dystopian masterpiece that remains relevant", + rating: 5, + status: BookStatus.finished, + tags: [ "dystopian", "classic", "political" ], + title: "1984", + updatedAt: new Date("2024-01-20"), + }; + + expect(fullBook.isbn).toBe("978-0-452-28423-4"); + expect(fullBook.rating).toBe(5); + expect(fullBook.tags).toHaveLength(3); + expect(fullBook.links).toHaveLength(2); + }); + }); + + describe("createBookDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateBookDto = { + author: "Harper Lee", + status: BookStatus.toRead, + title: "To Kill a Mockingbird", + }; + + expect(createDto.isbn).toBeUndefined(); + expect(createDto.rating).toBeUndefined(); + expect(createDto.notes).toBeUndefined(); + expect(createDto.coverImage).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateBookDto = { + author: "J.R.R. Tolkien", + coverImage: "https://example.com/hobbit-cover.jpg", + isbn: "978-0-547-92822-7", + links: [ { title: "Author Website", url: "https://tolkien.com" } ], + notes: "Starting the journey to Middle-earth", + rating: 4, + status: BookStatus.reading, + tags: [ "fantasy", "adventure", "classic" ], + title: "The Hobbit", + }; + + expect(fullCreateDto.isbn).toBe("978-0-547-92822-7"); + expect(fullCreateDto.rating).toBe(4); + expect(fullCreateDto.tags).toEqual([ "fantasy", "adventure", "classic" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateBookDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateBookDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates including dateFinished", () => { + const partialUpdate: UpdateBookDto = { + dateFinished: new Date("2024-02-01"), + rating: 5, + status: BookStatus.finished, + }; + + expect(partialUpdate.status).toBe(BookStatus.finished); + expect(partialUpdate.dateFinished).toEqual(new Date("2024-02-01")); + expect(partialUpdate.rating).toBe(5); + expect(partialUpdate.title).toBeUndefined(); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateBookDto = { + author: "Different Author", + coverImage: "https://example.com/new-cover.jpg", + dateFinished: new Date("2024-02-15"), + isbn: "978-1-234-56789-0", + links: [ { title: "New Link", url: "https://newlink.com" } ], + notes: "Updated notes after finishing", + rating: 3, + status: BookStatus.finished, + tags: [ "updated", "tags" ], + title: "Updated Title", + }; + + expect(fullUpdate.title).toBe("Updated Title"); + expect(fullUpdate.dateFinished).toEqual(new Date("2024-02-15")); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/comment.types.spec.ts b/shared-types/test/comment.types.spec.ts new file mode 100644 index 0000000..fb40e37 --- /dev/null +++ b/shared-types/test/comment.types.spec.ts @@ -0,0 +1,195 @@ +/** + * @copyright 2026 NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import type { CommentUser, Comment, CreateCommentDto } from "../src/lib/comment.types"; + +describe("comment Types", () => { + describe("commentUser interface", () => { + it("should accept valid user object with minimal fields", () => { + const user: CommentUser = { + id: "user123", + username: "testuser", + }; + + expect(user.avatar).toBeUndefined(); + expect(user.inDiscord).toBeUndefined(); + expect(user.isVip).toBeUndefined(); + expect(user.isMod).toBeUndefined(); + expect(user.isStaff).toBeUndefined(); + }); + + it("should accept valid user object with all fields", () => { + const fullUser: CommentUser = { + avatar: "https://example.com/avatar.png", + id: "user456", + inDiscord: true, + isMod: true, + isStaff: false, + isVip: true, + username: "vipmoduser", + }; + + expect(fullUser.avatar).toBe("https://example.com/avatar.png"); + expect(fullUser.inDiscord).toBeTruthy(); + expect(fullUser.isVip).toBeTruthy(); + expect(fullUser.isMod).toBeTruthy(); + expect(fullUser.isStaff).toBeFalsy(); + }); + }); + + describe("comment interface", () => { + it("should accept valid comment object with minimal fields", () => { + const comment: Comment = { + content: "This is a great book!", + createdAt: new Date("2024-01-15"), + id: "comment123", + updatedAt: new Date("2024-01-15"), + user: { + id: "user123", + username: "bookworm", + }, + userId: "user123", + }; + + expect(comment.rawContent).toBeUndefined(); + expect(comment.gameId).toBeUndefined(); + expect(comment.bookId).toBeUndefined(); + expect(comment.musicId).toBeUndefined(); + expect(comment.artId).toBeUndefined(); + expect(comment.showId).toBeUndefined(); + expect(comment.mangaId).toBeUndefined(); + }); + + it("should accept comment for a book", () => { + const bookComment: Comment = { + bookId: "book123", + content: "

Amazing read!

", + createdAt: new Date("2024-01-20"), + id: "comment456", + rawContent: "Amazing read!", + updatedAt: new Date("2024-01-21"), + user: { + avatar: "https://example.com/reader.png", + id: "user789", + inDiscord: true, + isMod: false, + isStaff: false, + isVip: false, + username: "reader", + }, + userId: "user789", + }; + + expect(bookComment.bookId).toBe("book123"); + expect(bookComment.rawContent).toBe("Amazing read!"); + expect(bookComment.gameId).toBeUndefined(); + }); + + it("should accept comment for a game", () => { + const gameComment: Comment = { + content: "Best game ever!", + createdAt: new Date("2024-02-01"), + gameId: "game789", + id: "comment789", + updatedAt: new Date("2024-02-01"), + user: { + id: "user456", + username: "gamer", + }, + userId: "user456", + }; + + expect(gameComment.gameId).toBe("game789"); + expect(gameComment.bookId).toBeUndefined(); + }); + + it("should accept comment for music", () => { + const musicComment: Comment = { + content: "Beautiful album", + createdAt: new Date("2024-02-10"), + id: "comment999", + musicId: "music123", + updatedAt: new Date("2024-02-10"), + user: { + id: "user111", + username: "musiclover", + }, + userId: "user111", + }; + + expect(musicComment.musicId).toBe("music123"); + }); + + it("should accept comment for art", () => { + const artComment: Comment = { + artId: "art456", + content: "Stunning artwork!", + createdAt: new Date("2024-02-15"), + id: "comment111", + updatedAt: new Date("2024-02-15"), + user: { + id: "user222", + username: "artcritic", + }, + userId: "user222", + }; + + expect(artComment.artId).toBe("art456"); + }); + + it("should accept comment for a show", () => { + const showComment: Comment = { + content: "Great series!", + createdAt: new Date("2024-02-20"), + id: "comment222", + showId: "show789", + updatedAt: new Date("2024-02-20"), + user: { + id: "user333", + username: "tvfan", + }, + userId: "user333", + }; + + expect(showComment.showId).toBe("show789"); + }); + + it("should accept comment for manga", () => { + const mangaComment: Comment = { + content: "Awesome manga!", + createdAt: new Date("2024-02-25"), + id: "comment333", + mangaId: "manga123", + updatedAt: new Date("2024-02-25"), + user: { + id: "user444", + username: "mangareader", + }, + userId: "user444", + }; + + expect(mangaComment.mangaId).toBe("manga123"); + }); + }); + + describe("createCommentDto interface", () => { + it("should accept DTO with content", () => { + const createDto: CreateCommentDto = { + content: "This is my comment", + }; + + expect(createDto.content).toBe("This is my comment"); + }); + + it("should accept DTO with formatted content", () => { + const createDto: CreateCommentDto = { + content: "

This is formatted content!

", + }; + + expect(createDto.content).toBe("

This is formatted content!

"); + }); + }); +}); diff --git a/shared-types/test/common.types.spec.ts b/shared-types/test/common.types.spec.ts new file mode 100644 index 0000000..d5bc3ed --- /dev/null +++ b/shared-types/test/common.types.spec.ts @@ -0,0 +1,37 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import type { Link } from "../src/lib/common.types"; + +describe("common Types", () => { + describe("link interface", () => { + it("should accept valid Link objects", () => { + const validLink: Link = { + title: "Example Website", + url: "https://example.com", + }; + + expect(validLink.title).toBe("Example Website"); + expect(validLink.url).toBe("https://example.com"); + }); + + it("should work with different URL formats", () => { + const links: Array = [ + { title: "HTTP URL", url: "http://example.com" }, + { title: "HTTPS URL", url: "https://example.com" }, + { title: "Relative URL", url: "/path/to/page" }, + { title: "URL with query", url: "https://example.com?query=value" }, + { title: "URL with anchor", url: "https://example.com#section" }, + ]; + + expect(links).toHaveLength(5); + for (const link of links) { + expect(link).toHaveProperty("title"); + expect(link).toHaveProperty("url"); + } + }); + }); +}); diff --git a/shared-types/test/game.types.spec.ts b/shared-types/test/game.types.spec.ts new file mode 100644 index 0000000..3597a65 --- /dev/null +++ b/shared-types/test/game.types.spec.ts @@ -0,0 +1,176 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { GameStatus } from "../src/lib/game.types"; +import type { Game, CreateGameDto, UpdateGameDto } from "../src/lib/game.types"; + +describe("game Types", () => { + describe("gameStatus enum", () => { + it("should have the correct values", () => { + expect(GameStatus.playing).toBe("PLAYING"); + expect(GameStatus.completed).toBe("COMPLETED"); + expect(GameStatus.backlog).toBe("BACKLOG"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(GameStatus); + expect(values).toHaveLength(4); + expect(values).toContain("PLAYING"); + expect(values).toContain("COMPLETED"); + expect(values).toContain("BACKLOG"); + expect(values).toContain("RETIRED"); + }); + }); + + describe("game interface", () => { + it("should accept valid game object with minimal fields", () => { + const game: Game = { + createdAt: new Date("2024-01-15"), + dateAdded: new Date("2024-01-15"), + id: "game123", + links: [], + status: GameStatus.playing, + tags: [], + title: "The Legend of Zelda: Breath of the Wild", + updatedAt: new Date("2024-01-16"), + }; + + expect(game.platform).toBeUndefined(); + expect(game.dateCompleted).toBeUndefined(); + expect(game.rating).toBeUndefined(); + expect(game.notes).toBeUndefined(); + expect(game.coverImage).toBeUndefined(); + }); + + it("should accept valid game object with all fields", () => { + const fullGame: Game = { + coverImage: "https://example.com/hades-cover.jpg", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + dateCompleted: new Date("2024-01-20"), + id: "game456", + links: [ + { title: "Steam", url: "https://store.steampowered.com/app/hades" }, + { title: "Official Site", url: "https://supergiantgames.com/hades" }, + ], + notes: "One of the best roguelikes ever made", + platform: "Nintendo Switch", + rating: 5, + status: GameStatus.completed, + tags: [ "roguelike", "indie", "action", "mythology" ], + title: "Hades", + updatedAt: new Date("2024-01-20"), + }; + + expect(fullGame.platform).toBe("Nintendo Switch"); + expect(fullGame.rating).toBe(5); + expect(fullGame.tags).toHaveLength(4); + expect(fullGame.links).toHaveLength(2); + }); + + it("should accept games on different platforms", () => { + const pcGame: Game = { + createdAt: new Date("2024-02-01"), + dateAdded: new Date("2024-02-01"), + id: "game789", + links: [], + platform: "PC", + status: GameStatus.completed, + tags: [ "puzzle", "first-person" ], + title: "Portal 2", + updatedAt: new Date("2024-02-01"), + }; + + const ps5Game: Game = { + createdAt: new Date("2024-02-05"), + dateAdded: new Date("2024-02-05"), + id: "game999", + links: [], + platform: "PlayStation 5", + status: GameStatus.backlog, + tags: [ "action", "superhero" ], + title: "Spider-Man: Miles Morales", + updatedAt: new Date("2024-02-05"), + }; + + expect(pcGame.platform).toBe("PC"); + expect(ps5Game.platform).toBe("PlayStation 5"); + }); + }); + + describe("createGameDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateGameDto = { + status: GameStatus.backlog, + title: "Elden Ring", + }; + + expect(createDto.platform).toBeUndefined(); + expect(createDto.rating).toBeUndefined(); + expect(createDto.notes).toBeUndefined(); + expect(createDto.coverImage).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateGameDto = { + coverImage: "https://example.com/hollow-knight.jpg", + links: [ { title: "Wiki", url: "https://hollowknight.wiki" } ], + notes: "Beautiful metroidvania with challenging gameplay", + platform: "Nintendo Switch", + rating: 4, + status: GameStatus.playing, + tags: [ "metroidvania", "indie", "platformer" ], + title: "Hollow Knight", + }; + + expect(fullCreateDto.platform).toBe("Nintendo Switch"); + expect(fullCreateDto.rating).toBe(4); + expect(fullCreateDto.tags).toEqual([ "metroidvania", "indie", "platformer" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateGameDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateGameDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates including dateCompleted", () => { + const partialUpdate: UpdateGameDto = { + dateCompleted: new Date("2024-02-10"), + rating: 5, + status: GameStatus.completed, + }; + + expect(partialUpdate.status).toBe(GameStatus.completed); + expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10")); + expect(partialUpdate.rating).toBe(5); + expect(partialUpdate.title).toBeUndefined(); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateGameDto = { + coverImage: "https://example.com/new-cover.jpg", + dateCompleted: new Date("2024-02-15"), + links: [ { title: "New Link", url: "https://newlink.com" } ], + notes: "Updated after completion", + platform: "Xbox Series X", + rating: 3, + status: GameStatus.completed, + tags: [ "updated", "tags" ], + title: "Updated Game Title", + }; + + expect(fullUpdate.title).toBe("Updated Game Title"); + expect(fullUpdate.platform).toBe("Xbox Series X"); + expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15")); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/like.types.spec.ts b/shared-types/test/like.types.spec.ts new file mode 100644 index 0000000..db8f5c6 --- /dev/null +++ b/shared-types/test/like.types.spec.ts @@ -0,0 +1,228 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import type { Like, CreateLikeDto, LikeResponse, LikedItemDto, LikeCountDto } from "../src/lib/like.types"; + +describe("like Types", () => { + describe("like interface", () => { + it("should accept valid like object for a book", () => { + const bookLike: Like = { + createdAt: new Date("2024-01-15"), + entityId: "book456", + entityType: "book", + id: "like123", + userId: "user123", + }; + + expect(bookLike.entityType).toBe("book"); + expect(bookLike.entityId).toBe("book456"); + }); + + it("should accept valid like object for a game", () => { + const gameLike: Like = { + createdAt: new Date("2024-01-20"), + entityId: "game123", + entityType: "game", + id: "like456", + userId: "user789", + }; + + expect(gameLike.entityType).toBe("game"); + expect(gameLike.entityId).toBe("game123"); + }); + + it("should accept likes for all entity types", () => { + const showLike: Like = { + createdAt: new Date("2024-02-01"), + entityId: "show222", + entityType: "show", + id: "like789", + userId: "user111", + }; + + const mangaLike: Like = { + createdAt: new Date("2024-02-05"), + entityId: "manga444", + entityType: "manga", + id: "like999", + userId: "user333", + }; + + const musicLike: Like = { + createdAt: new Date("2024-02-10"), + entityId: "music666", + entityType: "music", + id: "like111", + userId: "user555", + }; + + const artLike: Like = { + createdAt: new Date("2024-02-15"), + entityId: "art888", + entityType: "art", + id: "like222", + userId: "user777", + }; + + expect(showLike.entityType).toBe("show"); + expect(mangaLike.entityType).toBe("manga"); + expect(musicLike.entityType).toBe("music"); + expect(artLike.entityType).toBe("art"); + }); + }); + + describe("createLikeDto type", () => { + it("should pick only entityType and entityId from Like", () => { + const createDto: CreateLikeDto = { + entityId: "book123", + entityType: "book", + }; + + expect(createDto.entityType).toBe("book"); + expect(createDto.entityId).toBe("book123"); + // Verify it only has these two properties + expect(Object.keys(createDto)).toHaveLength(2); + }); + + it("should accept different entity types", () => { + const gameDto: CreateLikeDto = { + entityId: "game456", + entityType: "game", + }; + + const artDto: CreateLikeDto = { + entityId: "art789", + entityType: "art", + }; + + expect(gameDto.entityType).toBe("game"); + expect(artDto.entityType).toBe("art"); + }); + }); + + describe("likeCountDto interface", () => { + it("should accept valid like count object", () => { + const likeCount: LikeCountDto = { + count: 42, + entityId: "book123", + entityType: "book", + }; + + expect(likeCount.count).toBe(42); + expect(likeCount.entityType).toBe("book"); + }); + + it("should accept like counts for different entities", () => { + const gameLikeCount: LikeCountDto = { + count: 15, + entityId: "game456", + entityType: "game", + }; + + const showLikeCount: LikeCountDto = { + count: 0, + entityId: "show789", + entityType: "show", + }; + + expect(gameLikeCount.count).toBe(15); + expect(showLikeCount.count).toBe(0); + }); + }); + + describe("likedItemDto interface", () => { + it("should accept liked item with unknown item type", () => { + const likedBook: LikedItemDto = { + item: { + author: "F. Scott Fitzgerald", + id: "book456", + title: "The Great Gatsby", + // ... other book properties + }, + like: { + createdAt: new Date("2024-01-15"), + entityId: "book456", + entityType: "book", + id: "like123", + userId: "user123", + }, + }; + + expect(likedBook.like.entityType).toBe("book"); + expect(likedBook.item).toBeDefined(); + }); + + it("should accept liked items for different entity types", () => { + const likedGame: LikedItemDto = { + item: { + id: "game123", + platform: "Nintendo Switch", + title: "Hades", + // ... other game properties + }, + like: { + createdAt: new Date("2024-02-01"), + entityId: "game123", + entityType: "game", + id: "like456", + userId: "user789", + }, + }; + + const likedArt: LikedItemDto = { + item: { + artist: "Jane Doe", + id: "art456", + imageUrl: "https://example.com/sunset.jpg", + title: "Beautiful Sunset", + // ... other art properties + }, + like: { + createdAt: new Date("2024-02-10"), + entityId: "art456", + entityType: "art", + id: "like789", + userId: "user999", + }, + }; + + expect(likedGame.like.entityType).toBe("game"); + expect(likedArt.like.entityType).toBe("art"); + }); + }); + + describe("likeResponse interface", () => { + it("should accept response with liked true", () => { + const likedResponse: LikeResponse = { + count: 10, + liked: true, + }; + + expect(likedResponse.liked).toBeTruthy(); + expect(likedResponse.count).toBe(10); + }); + + it("should accept response with liked false", () => { + const notLikedResponse: LikeResponse = { + count: 5, + liked: false, + }; + + expect(notLikedResponse.liked).toBeFalsy(); + expect(notLikedResponse.count).toBe(5); + }); + + it("should accept response with zero count", () => { + const zeroResponse: LikeResponse = { + count: 0, + liked: false, + }; + + expect(zeroResponse.liked).toBeFalsy(); + expect(zeroResponse.count).toBe(0); + }); + }); +}); diff --git a/shared-types/test/manga.types.spec.ts b/shared-types/test/manga.types.spec.ts new file mode 100644 index 0000000..c9180b5 --- /dev/null +++ b/shared-types/test/manga.types.spec.ts @@ -0,0 +1,173 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { MangaStatus } from "../src/lib/manga.types"; +import type { Manga, CreateMangaDto, UpdateMangaDto } from "../src/lib/manga.types"; + +describe("manga Types", () => { + describe("mangaStatus enum", () => { + it("should have the correct values", () => { + expect(MangaStatus.reading).toBe("READING"); + expect(MangaStatus.completed).toBe("COMPLETED"); + expect(MangaStatus.wantToRead).toBe("WANT_TO_READ"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(MangaStatus); + expect(values).toHaveLength(4); + expect(values).toContain("READING"); + expect(values).toContain("COMPLETED"); + expect(values).toContain("WANT_TO_READ"); + expect(values).toContain("RETIRED"); + }); + }); + + describe("manga interface", () => { + it("should accept valid manga object with minimal fields", () => { + const manga: Manga = { + author: "Tsugumi Ohba", + createdAt: new Date("2024-01-15"), + dateAdded: new Date("2024-01-15"), + id: "manga123", + links: [], + status: MangaStatus.reading, + tags: [], + title: "Death Note", + updatedAt: new Date("2024-01-16"), + }; + + expect(manga.dateCompleted).toBeUndefined(); + expect(manga.rating).toBeUndefined(); + expect(manga.notes).toBeUndefined(); + expect(manga.coverImage).toBeUndefined(); + }); + + it("should accept valid manga object with all fields", () => { + const fullManga: Manga = { + author: "Eiichiro Oda", + coverImage: "https://example.com/onepiece-cover.jpg", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + dateCompleted: undefined, + id: "manga456", + links: [ + { title: "MyAnimeList", url: "https://myanimelist.net/manga/13" }, + { title: "Official Site", url: "https://one-piece.com" }, + ], + + notes: "Epic adventure that keeps getting better", + + // Still ongoing + rating: 5, + + status: MangaStatus.reading, + + tags: [ "adventure", "shounen", "pirates", "long-running" ], + title: "One Piece", + updatedAt: new Date("2024-02-01"), + }; + + expect(fullManga.author).toBe("Eiichiro Oda"); + expect(fullManga.rating).toBe(5); + expect(fullManga.tags).toHaveLength(4); + expect(fullManga.links).toHaveLength(2); + }); + + it("should accept completed manga", () => { + const completedManga: Manga = { + author: "Hiromu Arakawa", + coverImage: "https://example.com/fma-cover.jpg", + createdAt: new Date("2023-12-01"), + dateAdded: new Date("2023-12-01"), + dateCompleted: new Date("2024-01-30"), + id: "manga789", + links: [], + notes: "Perfect from start to finish", + rating: 5, + status: MangaStatus.completed, + tags: [ "shounen", "adventure", "alchemy" ], + title: "Fullmetal Alchemist", + updatedAt: new Date("2024-01-30"), + }; + + expect(completedManga.status).toBe(MangaStatus.completed); + expect(completedManga.dateCompleted).toEqual(new Date("2024-01-30")); + }); + }); + + describe("createMangaDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateMangaDto = { + author: "Hajime Isayama", + status: MangaStatus.wantToRead, + title: "Attack on Titan", + }; + + expect(createDto.rating).toBeUndefined(); + expect(createDto.notes).toBeUndefined(); + expect(createDto.coverImage).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateMangaDto = { + author: "Kohei Horikoshi", + coverImage: "https://example.com/mha-cover.jpg", + links: [ { title: "Wiki", url: "https://mha.wiki" } ], + notes: "Great superhero manga with unique powers", + rating: 4, + status: MangaStatus.reading, + tags: [ "shounen", "superhero", "school" ], + title: "My Hero Academia", + }; + + expect(fullCreateDto.author).toBe("Kohei Horikoshi"); + expect(fullCreateDto.rating).toBe(4); + expect(fullCreateDto.tags).toEqual([ "shounen", "superhero", "school" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateMangaDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateMangaDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates including dateCompleted", () => { + const partialUpdate: UpdateMangaDto = { + dateCompleted: new Date("2024-02-10"), + rating: 4, + status: MangaStatus.completed, + }; + + expect(partialUpdate.status).toBe(MangaStatus.completed); + expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10")); + expect(partialUpdate.rating).toBe(4); + expect(partialUpdate.title).toBeUndefined(); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateMangaDto = { + author: "Different Author", + coverImage: "https://example.com/new-manga-cover.jpg", + dateCompleted: new Date("2024-02-15"), + links: [ { title: "New Link", url: "https://newlink.com" } ], + notes: "Updated after finishing the series", + rating: 3, + status: MangaStatus.completed, + tags: [ "updated", "tags" ], + title: "Updated Manga Title", + }; + + expect(fullUpdate.title).toBe("Updated Manga Title"); + expect(fullUpdate.author).toBe("Different Author"); + expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15")); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/music.types.spec.ts b/shared-types/test/music.types.spec.ts new file mode 100644 index 0000000..f381edc --- /dev/null +++ b/shared-types/test/music.types.spec.ts @@ -0,0 +1,201 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { MusicStatus, MusicType } from "../src/lib/music.types"; +import type { Music, CreateMusicDto, UpdateMusicDto } from "../src/lib/music.types"; + +describe("music Types", () => { + describe("musicType enum", () => { + it("should have the correct values", () => { + expect(MusicType.album).toBe("ALBUM"); + expect(MusicType.single).toBe("SINGLE"); + expect(MusicType.ep).toBe("EP"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(MusicType); + expect(values).toHaveLength(3); + expect(values).toContain("ALBUM"); + expect(values).toContain("SINGLE"); + expect(values).toContain("EP"); + }); + }); + + describe("musicStatus enum", () => { + it("should have the correct values", () => { + expect(MusicStatus.listening).toBe("LISTENING"); + expect(MusicStatus.completed).toBe("COMPLETED"); + expect(MusicStatus.wantToListen).toBe("WANT_TO_LISTEN"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(MusicStatus); + expect(values).toHaveLength(4); + expect(values).toContain("LISTENING"); + expect(values).toContain("COMPLETED"); + expect(values).toContain("WANT_TO_LISTEN"); + expect(values).toContain("RETIRED"); + }); + }); + + describe("music interface", () => { + it("should accept valid music object with minimal fields", () => { + const music: Music = { + artist: "Pink Floyd", + createdAt: new Date("2024-01-15"), + dateAdded: new Date("2024-01-15"), + id: "music123", + links: [], + status: MusicStatus.listening, + tags: [], + title: "Dark Side of the Moon", + type: MusicType.album, + updatedAt: new Date("2024-01-16"), + }; + + expect(music.dateCompleted).toBeUndefined(); + expect(music.rating).toBeUndefined(); + expect(music.notes).toBeUndefined(); + expect(music.coverArt).toBeUndefined(); + }); + + it("should accept valid music object with all fields", () => { + const fullMusic: Music = { + artist: "Pink Floyd", + coverArt: "https://example.com/the-wall-cover.jpg", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + dateCompleted: new Date("2024-01-20"), + id: "music456", + links: [ + { title: "Spotify", url: "https://spotify.com/album/the-wall" }, + { title: "Apple Music", url: "https://music.apple.com/album/the-wall" }, + ], + notes: "A rock opera masterpiece", + rating: 5, + status: MusicStatus.completed, + tags: [ "progressive rock", "concept album", "classic" ], + title: "The Wall", + type: MusicType.album, + updatedAt: new Date("2024-01-20"), + }; + + expect(fullMusic.artist).toBe("Pink Floyd"); + expect(fullMusic.rating).toBe(5); + expect(fullMusic.tags).toHaveLength(3); + expect(fullMusic.links).toHaveLength(2); + }); + + it("should accept different music types", () => { + const single: Music = { + artist: "The Weeknd", + createdAt: new Date("2024-02-01"), + dateAdded: new Date("2024-02-01"), + id: "music789", + links: [], + status: MusicStatus.completed, + tags: [ "pop", "synthwave" ], + title: "Blinding Lights", + type: MusicType.single, + updatedAt: new Date("2024-02-01"), + }; + + const ep: Music = { + artist: "The Weeknd", + createdAt: new Date("2024-02-05"), + dateAdded: new Date("2024-02-05"), + id: "music999", + links: [], + status: MusicStatus.wantToListen, + tags: [ "r&b", "dark" ], + title: "My Dear Melancholy,", + type: MusicType.ep, + updatedAt: new Date("2024-02-05"), + }; + + expect(single.type).toBe(MusicType.single); + expect(ep.type).toBe(MusicType.ep); + }); + }); + + describe("createMusicDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateMusicDto = { + artist: "Fleetwood Mac", + status: MusicStatus.wantToListen, + title: "Rumours", + type: MusicType.album, + }; + + expect(createDto.rating).toBeUndefined(); + expect(createDto.notes).toBeUndefined(); + expect(createDto.coverArt).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateMusicDto = { + artist: "The Weeknd", + coverArt: "https://example.com/after-hours.jpg", + links: [ { title: "YouTube", url: "https://youtube.com/album/after-hours" } ], + notes: "Dark synthwave vibes", + rating: 4, + status: MusicStatus.listening, + tags: [ "synthwave", "pop", "r&b" ], + title: "After Hours", + type: MusicType.album, + }; + + expect(fullCreateDto.artist).toBe("The Weeknd"); + expect(fullCreateDto.type).toBe(MusicType.album); + expect(fullCreateDto.rating).toBe(4); + expect(fullCreateDto.tags).toEqual([ "synthwave", "pop", "r&b" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateMusicDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateMusicDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates including dateCompleted", () => { + const partialUpdate: UpdateMusicDto = { + dateCompleted: new Date("2024-02-10"), + rating: 5, + status: MusicStatus.completed, + }; + + expect(partialUpdate.status).toBe(MusicStatus.completed); + expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10")); + expect(partialUpdate.rating).toBe(5); + expect(partialUpdate.title).toBeUndefined(); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateMusicDto = { + artist: "Different Artist", + coverArt: "https://example.com/new-cover.jpg", + dateCompleted: new Date("2024-02-15"), + links: [ { title: "New Link", url: "https://newlink.com" } ], + notes: "Updated after listening", + rating: 3, + status: MusicStatus.completed, + tags: [ "updated", "tags" ], + title: "Updated Album Title", + type: MusicType.ep, + }; + + expect(fullUpdate.title).toBe("Updated Album Title"); + expect(fullUpdate.artist).toBe("Different Artist"); + expect(fullUpdate.type).toBe(MusicType.ep); + expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15")); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/show.types.spec.ts b/shared-types/test/show.types.spec.ts new file mode 100644 index 0000000..39f3eea --- /dev/null +++ b/shared-types/test/show.types.spec.ts @@ -0,0 +1,195 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { ShowStatus, ShowType } from "../src/lib/show.types"; +import type { Show, CreateShowDto, UpdateShowDto } from "../src/lib/show.types"; + +describe("show Types", () => { + describe("showType enum", () => { + it("should have the correct values", () => { + expect(ShowType.tvSeries).toBe("TV_SERIES"); + expect(ShowType.anime).toBe("ANIME"); + expect(ShowType.film).toBe("FILM"); + expect(ShowType.documentary).toBe("DOCUMENTARY"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(ShowType); + expect(values).toHaveLength(4); + expect(values).toContain("TV_SERIES"); + expect(values).toContain("ANIME"); + expect(values).toContain("FILM"); + expect(values).toContain("DOCUMENTARY"); + }); + }); + + describe("showStatus enum", () => { + it("should have the correct values", () => { + expect(ShowStatus.watching).toBe("WATCHING"); + expect(ShowStatus.completed).toBe("COMPLETED"); + expect(ShowStatus.wantToWatch).toBe("WANT_TO_WATCH"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(ShowStatus); + expect(values).toHaveLength(4); + expect(values).toContain("WATCHING"); + expect(values).toContain("COMPLETED"); + expect(values).toContain("WANT_TO_WATCH"); + expect(values).toContain("RETIRED"); + }); + }); + + describe("show interface", () => { + it("should accept valid show object with minimal fields", () => { + const show: Show = { + createdAt: new Date("2024-01-15"), + dateAdded: new Date("2024-01-15"), + id: "show123", + links: [], + status: ShowStatus.watching, + tags: [], + title: "Breaking Bad", + type: ShowType.tvSeries, + updatedAt: new Date("2024-01-16"), + }; + + expect(show.dateCompleted).toBeUndefined(); + expect(show.rating).toBeUndefined(); + expect(show.notes).toBeUndefined(); + expect(show.coverImage).toBeUndefined(); + }); + + it("should accept valid show object with all fields", () => { + const fullShow: Show = { + coverImage: "https://example.com/aot-cover.jpg", + createdAt: new Date("2024-01-01"), + dateAdded: new Date("2024-01-01"), + dateCompleted: new Date("2024-01-20"), + id: "show456", + links: [ + { title: "MyAnimeList", url: "https://myanimelist.net/anime/16498" }, + { title: "Crunchyroll", url: "https://crunchyroll.com/attack-on-titan" }, + ], + notes: "Incredible story with amazing animation", + rating: 5, + status: ShowStatus.completed, + tags: [ "action", "dark fantasy", "shounen" ], + title: "Attack on Titan", + type: ShowType.anime, + updatedAt: new Date("2024-01-20"), + }; + + expect(fullShow.type).toBe(ShowType.anime); + expect(fullShow.rating).toBe(5); + expect(fullShow.tags).toHaveLength(3); + expect(fullShow.links).toHaveLength(2); + }); + + it("should accept different show types", () => { + const film: Show = { + createdAt: new Date("2024-02-01"), + dateAdded: new Date("2024-02-01"), + id: "show789", + links: [], + rating: 5, + status: ShowStatus.completed, + tags: [ "sci-fi", "thriller" ], + title: "Inception", + type: ShowType.film, + updatedAt: new Date("2024-02-01"), + }; + + const documentary: Show = { + createdAt: new Date("2024-02-05"), + dateAdded: new Date("2024-02-05"), + id: "show999", + links: [], + status: ShowStatus.wantToWatch, + tags: [ "nature", "wildlife" ], + title: "Planet Earth II", + type: ShowType.documentary, + updatedAt: new Date("2024-02-05"), + }; + + expect(film.type).toBe(ShowType.film); + expect(documentary.type).toBe(ShowType.documentary); + }); + }); + + describe("createShowDto interface", () => { + it("should accept DTO with required fields only", () => { + const createDto: CreateShowDto = { + status: ShowStatus.wantToWatch, + title: "Stranger Things", + type: ShowType.tvSeries, + }; + + expect(createDto.rating).toBeUndefined(); + expect(createDto.notes).toBeUndefined(); + expect(createDto.coverImage).toBeUndefined(); + expect(createDto.tags).toBeUndefined(); + expect(createDto.links).toBeUndefined(); + }); + + it("should accept DTO with all fields", () => { + const fullCreateDto: CreateShowDto = { + coverImage: "https://example.com/death-note.jpg", + links: [ { title: "Netflix", url: "https://netflix.com/death-note" } ], + notes: "Psychological thriller with great plot", + rating: 4, + status: ShowStatus.watching, + tags: [ "psychological", "thriller", "supernatural" ], + title: "Death Note", + type: ShowType.anime, + }; + + expect(fullCreateDto.type).toBe(ShowType.anime); + expect(fullCreateDto.rating).toBe(4); + expect(fullCreateDto.tags).toEqual([ "psychological", "thriller", "supernatural" ]); + expect(fullCreateDto.links).toHaveLength(1); + }); + }); + + describe("updateShowDto type", () => { + it("should accept empty update DTO", () => { + const emptyUpdate: UpdateShowDto = {}; + expect(emptyUpdate).toEqual({}); + }); + + it("should accept partial updates including dateCompleted", () => { + const partialUpdate: UpdateShowDto = { + dateCompleted: new Date("2024-02-10"), + rating: 5, + status: ShowStatus.completed, + }; + + expect(partialUpdate.status).toBe(ShowStatus.completed); + expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10")); + expect(partialUpdate.rating).toBe(5); + expect(partialUpdate.title).toBeUndefined(); + }); + + it("should accept full update", () => { + const fullUpdate: UpdateShowDto = { + coverImage: "https://example.com/new-show-cover.jpg", + dateCompleted: new Date("2024-02-15"), + links: [ { title: "New Link", url: "https://newlink.com" } ], + notes: "Updated after watching", + rating: 3, + status: ShowStatus.completed, + tags: [ "updated", "tags" ], + title: "Updated Show Title", + type: ShowType.documentary, + }; + + expect(fullUpdate.title).toBe("Updated Show Title"); + expect(fullUpdate.type).toBe(ShowType.documentary); + expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15")); + expect(fullUpdate.links).toHaveLength(1); + }); + }); +}); diff --git a/shared-types/test/suggestion.types.spec.ts b/shared-types/test/suggestion.types.spec.ts new file mode 100644 index 0000000..17e0525 --- /dev/null +++ b/shared-types/test/suggestion.types.spec.ts @@ -0,0 +1,440 @@ +/** + * @copyright NHCarrigan + * @license Naomi's Public License + * @author Naomi Carrigan + */ + +import { GameStatus, BookStatus, MangaStatus, MusicStatus, MusicType, ShowStatus, ShowType } from "../src"; +import { SuggestionEntity, SuggestionStatus } from "../src/lib/suggestion.types"; +import type { + Suggestion, + SuggestionUser, + CreateSuggestionDto, + DeclineSuggestionDto, + CreateGameSuggestionDto, + CreateBookSuggestionDto, + CreateMusicSuggestionDto, + CreateArtSuggestionDto, + CreateShowSuggestionDto, + CreateMangaSuggestionDto, + AcceptWithEditsDto, +} from "../src/lib/suggestion.types"; + +describe("suggestion Types", () => { + describe("suggestionEntity enum", () => { + it("should have the correct values", () => { + expect(SuggestionEntity.game).toBe("GAME"); + expect(SuggestionEntity.book).toBe("BOOK"); + expect(SuggestionEntity.music).toBe("MUSIC"); + expect(SuggestionEntity.art).toBe("ART"); + expect(SuggestionEntity.show).toBe("SHOW"); + expect(SuggestionEntity.manga).toBe("MANGA"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(SuggestionEntity); + expect(values).toHaveLength(6); + expect(values).toContain("GAME"); + expect(values).toContain("BOOK"); + expect(values).toContain("MUSIC"); + expect(values).toContain("ART"); + expect(values).toContain("SHOW"); + expect(values).toContain("MANGA"); + }); + }); + + describe("suggestionStatus enum", () => { + it("should have the correct values", () => { + expect(SuggestionStatus.unreviewed).toBe("UNREVIEWED"); + expect(SuggestionStatus.accepted).toBe("ACCEPTED"); + expect(SuggestionStatus.declined).toBe("DECLINED"); + }); + + it("should have all expected enum values", () => { + const values = Object.values(SuggestionStatus); + expect(values).toHaveLength(3); + expect(values).toContain("UNREVIEWED"); + expect(values).toContain("ACCEPTED"); + expect(values).toContain("DECLINED"); + }); + }); + + describe("suggestionUser interface", () => { + it("should accept valid user object", () => { + const user: SuggestionUser = { + avatar: "https://example.com/avatar.png", + id: "user123", + inDiscord: true, + isMod: false, + isStaff: false, + isVip: false, + username: "suggester", + }; + + expect(user.inDiscord).toBeTruthy(); + expect(user.isVip).toBeFalsy(); + }); + + it("should accept user without avatar", () => { + const user: SuggestionUser = { + id: "user456", + inDiscord: true, + isMod: false, + isStaff: true, + isVip: true, + username: "vipuser", + }; + + expect(user.avatar).toBeUndefined(); + expect(user.isVip).toBeTruthy(); + expect(user.isStaff).toBeTruthy(); + }); + }); + + describe("suggestion interface", () => { + it("should accept game suggestion", () => { + const gameSuggestion: Suggestion = { + createdAt: new Date("2024-01-15"), + entityType: SuggestionEntity.game, + gameData: { + coverImage: "https://example.com/hades.jpg", + notes: "Amazing roguelike", + platform: "Nintendo Switch", + status: GameStatus.backlog, + title: "Hades", + }, + id: "sug123", + status: SuggestionStatus.unreviewed, + title: "Hades", + updatedAt: new Date("2024-01-15"), + user: { + id: "user123", + inDiscord: true, + isMod: false, + isStaff: false, + isVip: false, + username: "gamer", + }, + userId: "user123", + }; + + expect(gameSuggestion.entityType).toBe(SuggestionEntity.game); + expect(gameSuggestion.gameData).toBeDefined(); + expect(gameSuggestion.bookData).toBeUndefined(); + }); + + it("should accept book suggestion", () => { + const bookSuggestion: Suggestion = { + bookData: { + author: "George Orwell", + isbn: "978-0-452-28423-4", + notes: "Dystopian classic", + status: BookStatus.toRead, + title: "1984", + }, + createdAt: new Date("2024-01-20"), + entityType: SuggestionEntity.book, + id: "sug456", + status: SuggestionStatus.accepted, + title: "1984", + updatedAt: new Date("2024-01-21"), + user: { + id: "user456", + inDiscord: false, + isMod: false, + isStaff: false, + isVip: true, + username: "reader", + }, + userId: "user456", + }; + + expect(bookSuggestion.entityType).toBe(SuggestionEntity.book); + expect(bookSuggestion.bookData).toBeDefined(); + expect(bookSuggestion.gameData).toBeUndefined(); + }); + + it("should accept declined suggestion with reason", () => { + const declinedSuggestion: Suggestion = { + createdAt: new Date("2024-02-01"), + declineReason: "Already in the library", + entityType: SuggestionEntity.music, + id: "sug789", + musicData: { + artist: "Pink Floyd", + status: MusicStatus.wantToListen, + title: "Dark Side of the Moon", + type: MusicType.album, + }, + status: SuggestionStatus.declined, + title: "Dark Side of the Moon", + updatedAt: new Date("2024-02-02"), + user: { + id: "user789", + inDiscord: true, + isMod: false, + isStaff: false, + isVip: false, + username: "suggester", + }, + userId: "user789", + }; + + expect(declinedSuggestion.status).toBe(SuggestionStatus.declined); + expect(declinedSuggestion.declineReason).toBe("Already in the library"); + }); + + it("should accept art suggestion", () => { + const artSuggestion: Suggestion = { + artData: { + artist: "Jane Doe", + description: "A stunning sunset painting", + imageUrl: "https://example.com/sunset.jpg", + title: "Beautiful Sunset", + }, + createdAt: new Date("2024-02-10"), + entityType: SuggestionEntity.art, + id: "sug999", + status: SuggestionStatus.unreviewed, + title: "Beautiful Sunset", + updatedAt: new Date("2024-02-10"), + user: { + id: "user999", + inDiscord: true, + isMod: true, + isStaff: false, + isVip: false, + username: "artlover", + }, + userId: "user999", + }; + + expect(artSuggestion.entityType).toBe(SuggestionEntity.art); + expect(artSuggestion.artData).toBeDefined(); + }); + + it("should accept show and manga suggestions", () => { + const showSuggestion: Suggestion = { + createdAt: new Date("2024-02-15"), + entityType: SuggestionEntity.show, + id: "sug111", + showData: { + status: ShowStatus.wantToWatch, + title: "Breaking Bad", + type: ShowType.tvSeries, + }, + status: SuggestionStatus.unreviewed, + title: "Breaking Bad", + updatedAt: new Date("2024-02-15"), + user: { + id: "user111", + inDiscord: false, + isMod: false, + isStaff: true, + isVip: false, + username: "tvfan", + }, + userId: "user111", + }; + + const mangaSuggestion: Suggestion = { + createdAt: new Date("2024-02-20"), + entityType: SuggestionEntity.manga, + id: "sug222", + mangaData: { + author: "Eiichiro Oda", + status: MangaStatus.reading, + title: "One Piece", + }, + status: SuggestionStatus.accepted, + title: "One Piece", + updatedAt: new Date("2024-02-21"), + user: { + id: "user222", + inDiscord: true, + isMod: true, + isStaff: true, + isVip: true, + username: "mangareader", + }, + userId: "user222", + }; + + expect(showSuggestion.entityType).toBe(SuggestionEntity.show); + expect(mangaSuggestion.entityType).toBe(SuggestionEntity.manga); + }); + }); + + describe("createSuggestionDto types", () => { + it("should accept game suggestion DTO", () => { + const gameDto: CreateGameSuggestionDto = { + coverImage: "https://example.com/hollow.jpg", + entityType: SuggestionEntity.game, + notes: "Great metroidvania", + platform: "PC", + title: "Hollow Knight", + }; + + expect(gameDto.entityType).toBe(SuggestionEntity.game); + expect(gameDto.platform).toBe("PC"); + }); + + it("should accept book suggestion DTO", () => { + const bookDto: CreateBookSuggestionDto = { + author: "J.R.R. Tolkien", + coverImage: "https://example.com/hobbit.jpg", + entityType: SuggestionEntity.book, + isbn: "978-0-547-92822-7", + notes: "Fantasy classic", + title: "The Hobbit", + }; + + expect(bookDto.entityType).toBe(SuggestionEntity.book); + expect(bookDto.author).toBe("J.R.R. Tolkien"); + }); + + it("should accept music suggestion DTO", () => { + const musicDto: CreateMusicSuggestionDto = { + artist: "Pink Floyd", + coverArt: "https://example.com/wall.jpg", + entityType: SuggestionEntity.music, + notes: "Rock opera", + title: "The Wall", + type: "ALBUM", + }; + + expect(musicDto.entityType).toBe(SuggestionEntity.music); + expect(musicDto.type).toBe("ALBUM"); + }); + + it("should accept art suggestion DTO", () => { + const artDto: CreateArtSuggestionDto = { + artist: "Vincent van Gogh", + description: "Famous painting", + entityType: SuggestionEntity.art, + imageUrl: "https://example.com/starry.jpg", + title: "Starry Night", + }; + + expect(artDto.entityType).toBe(SuggestionEntity.art); + expect(artDto.imageUrl).toBe("https://example.com/starry.jpg"); + }); + + it("should accept show suggestion DTO", () => { + const showDto: CreateShowSuggestionDto = { + coverImage: "https://example.com/office.jpg", + entityType: SuggestionEntity.show, + notes: "Comedy series", + title: "The Office", + type: "TV_SERIES", + }; + + expect(showDto.entityType).toBe(SuggestionEntity.show); + expect(showDto.type).toBe("TV_SERIES"); + }); + + it("should accept manga suggestion DTO", () => { + const mangaDto: CreateMangaSuggestionDto = { + author: "Tsugumi Ohba", + coverImage: "https://example.com/deathnote.jpg", + entityType: SuggestionEntity.manga, + notes: "Psychological thriller", + title: "Death Note", + }; + + expect(mangaDto.entityType).toBe(SuggestionEntity.manga); + expect(mangaDto.author).toBe("Tsugumi Ohba"); + }); + + it("should work with union type", () => { + const suggestions: Array = [ + { + entityType: SuggestionEntity.game, + title: "Game Title", + }, + { + author: "Author Name", + entityType: SuggestionEntity.book, + title: "Book Title", + }, + ]; + + expect(suggestions).toHaveLength(2); + expect(suggestions[0].entityType).toBe(SuggestionEntity.game); + expect(suggestions[1].entityType).toBe(SuggestionEntity.book); + }); + }); + + describe("declineSuggestionDto interface", () => { + it("should accept empty decline DTO", () => { + const declineDto: DeclineSuggestionDto = {}; + expect(declineDto.reason).toBeUndefined(); + }); + + it("should accept decline DTO with reason", () => { + const declineDto: DeclineSuggestionDto = { + reason: "Already exists in the library", + }; + expect(declineDto.reason).toBe("Already exists in the library"); + }); + }); + + describe("acceptWithEditsDto interface", () => { + it("should accept empty edits DTO", () => { + const editsDto: AcceptWithEditsDto = {}; + expect(editsDto).toEqual({}); + }); + + it("should accept edits for book fields", () => { + const editsDto: AcceptWithEditsDto = { + author: "Corrected Author", + coverImage: "https://example.com/new-cover.jpg", + isbn: "978-0-123-45678-9", + links: [ { label: "Goodreads", url: "https://goodreads.com" } ], + notes: "Updated notes", + tags: [ "fiction", "classic" ], + title: "Corrected Title", + }; + + expect(editsDto.title).toBe("Corrected Title"); + expect(editsDto.author).toBe("Corrected Author"); + expect(editsDto.tags).toHaveLength(2); + }); + + it("should accept edits for music fields", () => { + const editsDto: AcceptWithEditsDto = { + artist: "Artist Name", + coverArt: "https://example.com/album.jpg", + title: "Album Title", + type: "ALBUM", + }; + + expect(editsDto.artist).toBe("Artist Name"); + expect(editsDto.type).toBe("ALBUM"); + expect(editsDto.coverArt).toBe("https://example.com/album.jpg"); + }); + + it("should accept edits for game fields", () => { + const editsDto: AcceptWithEditsDto = { + coverImage: "https://example.com/game.jpg", + notes: "Action RPG", + platform: "PlayStation 5", + title: "Game Title", + }; + + expect(editsDto.platform).toBe("PlayStation 5"); + }); + + it("should accept edits for art fields", () => { + const editsDto: AcceptWithEditsDto = { + artist: "Artist Name", + description: "Beautiful artwork", + imageUrl: "https://example.com/art.jpg", + title: "Art Title", + }; + + expect(editsDto.description).toBe("Beautiful artwork"); + expect(editsDto.imageUrl).toBe("https://example.com/art.jpg"); + }); + }); +}); diff --git a/shared-types/tsconfig.json b/shared-types/tsconfig.json index a44d9be..dc2fc72 100644 --- a/shared-types/tsconfig.json +++ b/shared-types/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../tsconfig.base.json", "compilerOptions": { + "outDir": "../dist/out-tsc", "module": "commonjs", "forceConsistentCasingInFileNames": true, "strict": true, @@ -10,11 +11,6 @@ "noFallthroughCasesInSwitch": true, "noPropertyAccessFromIndexSignature": true }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ] + "include": ["src/**/*.ts", "test/**/*.ts"], + "exclude": ["test/**/*.spec.ts"] } diff --git a/shared-types/tsconfig.spec.json b/shared-types/tsconfig.spec.json new file mode 100644 index 0000000..fb586cc --- /dev/null +++ b/shared-types/tsconfig.spec.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "types": ["jest", "node"] + }, + "include": ["test/**/*.spec.ts"] +} \ No newline at end of file diff --git a/tsconfig.base.json b/tsconfig.base.json index f55bb1c..797b9ca 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,5 +18,5 @@ "@library/shared-types": ["shared-types/src/index.ts"] } }, - "exclude": ["node_modules", "tmp"] + "exclude": ["node_modules", "tmp", "**/test/**/*.spec.ts"] }