diff --git a/app/api/songbooks/[songBookId]/route.ts b/app/api/songbooks/[songBookId]/route.ts index 036d758..5db3239 100644 --- a/app/api/songbooks/[songBookId]/route.ts +++ b/app/api/songbooks/[songBookId]/route.ts @@ -1,6 +1,11 @@ import { NextResponse } from "next/server"; import { getSongBookById, updateSongBook, deleteSongBook } from "@/lib/db/songbook"; -// import { parseInt } from "@/lib/helper/checkvar"; + +interface RouteParams { + params: Promise<{ + songBookId: string; + }>; +}; /** * @openapi @@ -28,12 +33,12 @@ import { getSongBookById, updateSongBook, deleteSongBook } from "@/lib/db/songbo */ -export async function GET(request: Request, { params }) { +export async function GET(_request: Request, { params }: RouteParams) { try { const { songBookId } = await params; - const res = await getSongBookById(songBookId); + const res = await getSongBookById(parseInt(songBookId)); if (!res.success) { @@ -81,11 +86,11 @@ export async function GET(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function PATCH(request: Request, { params }) { +export async function PATCH(request: Request, { params }: RouteParams) { try { const { songBookId } = await params; const data = await request.json(); - const res = await updateSongBook(songBookId, data); + const res = await updateSongBook(parseInt(songBookId), data); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); @@ -126,10 +131,10 @@ export async function PATCH(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function DELETE(request: Request, { params }) { +export async function DELETE(_request: Request, { params }: RouteParams) { try { const { songBookId } = await params; - const res = await deleteSongBook(songBookId); + const res = await deleteSongBook(parseInt(songBookId)); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); diff --git a/app/api/songbooks/[songBookId]/songs/[songId]/route.ts b/app/api/songbooks/[songBookId]/songs/[songId]/route.ts index b1e1891..058356f 100644 --- a/app/api/songbooks/[songBookId]/songs/[songId]/route.ts +++ b/app/api/songbooks/[songBookId]/songs/[songId]/route.ts @@ -1,6 +1,12 @@ import { NextResponse } from "next/server"; import { addSongToBook, updateSongInBook, removeSongFromBook } from "@/lib/db/songbooksongs"; -// import { parseInt } from "@/lib/helper/checkvar"; + +interface RouteParams { + params: Promise<{ + songBookId: string; + songId: string; + }>; +}; /** * @openapi @@ -45,13 +51,13 @@ import { addSongToBook, updateSongInBook, removeSongFromBook } from "@/lib/db/so * 500: * description: Serverfehler */ -export async function POST(request: Request, { params }) { +export async function POST(request: Request, { params }: RouteParams) { try { const { songBookId, songId } = await params; const data = await request.json(); - const res = await addSongToBook(songId, songBookId, data.number); + const res = await addSongToBook(parseInt(songId), parseInt(songBookId), String(data.number)); if (!res.success) { @@ -114,11 +120,11 @@ export async function POST(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function PATCH(request: Request, { params }) { +export async function PATCH(request: Request, { params }: RouteParams) { try { const { songBookId, songId } = await params; const data = await request.json(); - const res = await updateSongInBook(songId, songBookId, data); + const res = await updateSongInBook(parseInt(songId), parseInt(songBookId), data); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); @@ -165,11 +171,11 @@ export async function PATCH(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function DELETE(request: Request, { params }) { +export async function DELETE(_request: Request, { params }: RouteParams) { try { const { songBookId, songId } = await params; - const res = await removeSongFromBook(songId, songBookId); + const res = await removeSongFromBook(parseInt(songId), parseInt(songBookId)); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); diff --git a/app/api/songbooks/[songBookId]/songs/route.ts b/app/api/songbooks/[songBookId]/songs/route.ts index 9b81836..b6640a3 100644 --- a/app/api/songbooks/[songBookId]/songs/route.ts +++ b/app/api/songbooks/[songBookId]/songs/route.ts @@ -1,6 +1,11 @@ import { NextResponse } from "next/server"; import { getSongByNumber } from "@/lib/db/songbooksongs"; +interface RouteParams { + params: Promise<{ + songBookId: string; + }>; +}; /** * @openapi @@ -26,14 +31,14 @@ import { getSongByNumber } from "@/lib/db/songbooksongs"; * 500: * description: Serverfehler */ -export async function GET(request: Request, { params }) { +export async function GET(request: Request, { params }: RouteParams) { try { const { songBookId } = await params; const { searchParams } = new URL(request.url); const number = searchParams.get("number") || searchParams.get("n"); if(number){ - const res = await getSongByNumber(songBookId, number); + const res = await getSongByNumber(parseInt(songBookId), number); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); diff --git a/app/api/songs/[songId]/route.ts b/app/api/songs/[songId]/route.ts index e123553..d4cd497 100644 --- a/app/api/songs/[songId]/route.ts +++ b/app/api/songs/[songId]/route.ts @@ -1,7 +1,11 @@ import { NextResponse } from "next/server"; import { getSongById, updateSong, deleteSong } from "@/lib/db/song"; -// import { parseInt } from "@/lib/helper/checkvar"; +interface RouteParams { + params: Promise<{ + songId: string; + }>; +}; /** * @openapi @@ -27,10 +31,10 @@ import { getSongById, updateSong, deleteSong } from "@/lib/db/song"; * 500: * description: Serverfehler */ -export async function GET(request: Request, { params }) { +export async function GET(_request: Request, { params }: RouteParams) { try { const { songId } = await params; - const res = await getSongById(songId); + const res = await getSongById(parseInt(songId)); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); @@ -77,11 +81,11 @@ export async function GET(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function PATCH(request: Request, { params }) { +export async function PATCH(request: Request, { params }: RouteParams) { try { const { songId } = await params; const data = await request.json(); - const res = await updateSong(songId, data); + const res = await updateSong(parseInt(songId), data); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); @@ -122,10 +126,10 @@ export async function PATCH(request: Request, { params }) { * 500: * description: Serverfehler */ -export async function DELETE(request: Request, { params }) { +export async function DELETE(_request: Request, { params }: RouteParams) { try { const { songId } = await params; - const res = await deleteSong(songId); + const res = await deleteSong(parseInt(songId)); if (!res.success) { return NextResponse.json({ message: res.error }, { status: res.status }); diff --git a/app/api/stream/route.ts b/app/api/stream/route.ts index e7ba38b..8922136 100644 --- a/app/api/stream/route.ts +++ b/app/api/stream/route.ts @@ -1,8 +1,6 @@ // @wikiCategory: Stream import { NextResponse } from "next/server"; -import { getSongById } from "@/lib/db/song"; -import { getSongBookById } from "@/lib/db/songbook"; let currentSong = { @@ -58,8 +56,9 @@ export async function POST(request: Request) { number }; - const payload = JSON.stringify(currentSong); - clients.forEach((send) => send(payload)); + clients.forEach((controller) => { + controller.enqueue(`data: ${JSON.stringify(currentSong)}\n\n`); + }); return NextResponse.json({ success: true , currentSong }, { status: 200 }); } catch (error) { diff --git a/lib/db/response.ts b/lib/db/response.ts new file mode 100644 index 0000000..55af0e9 --- /dev/null +++ b/lib/db/response.ts @@ -0,0 +1,42 @@ +export interface Song { + id: number; + title: string; +} + +export interface SongBook { + id: number; + title: string; + language?: string; +} + +export interface SongDetailed { + song: { + id: number; + title: string; + songBooks?:{songNumber: number; book:SongBook}[] + + }; +} + +export type APIResponse = +| { success: true; status: number; data: T } +| { success: false; status: number; error: string }; + +export type GetSongsResponse = APIResponse; +export type GetSongDetailedResponse = +| { + success: true; + status: number; + song: SongDetailed + } +| { success: false; status: number; error: string }; + +export type GetSongsDelailedResponse = +| { + success: true; + status: number; + songs: SongDetailed[] +} +| { success: false; status: number; error: string }; + +export type CreateSongsResponse = APIResponse; diff --git a/lib/db/song.ts b/lib/db/song.ts index 48eff59..5ec761f 100644 --- a/lib/db/song.ts +++ b/lib/db/song.ts @@ -1,7 +1,14 @@ import { prisma } from "@/lib/db/prisma"; import { parseInt } from "@/lib/helper/checkvar"; +import type * as API from "./response"; // For Error checking use this import: import { Prisma } from "@prisma/client"; +interface Response { + success: boolean; + status: number; + songs?: []; + error?: string; +} /** * GetSongs @@ -9,7 +16,7 @@ import { parseInt } from "@/lib/helper/checkvar"; * * @returns {"success": boolean, "status": number, "songs": [{"id":number, "title": string},...]} */ -export async function getSongs() { +export async function getSongs(): Promise { try{ const songs = await prisma.song.findMany({ select: { @@ -35,7 +42,7 @@ export async function getSongs() { * @param id - ID indicatin the song * @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}} */ -export async function getSongById(rawId: number) { +export async function getSongById(rawId: number): Promise { try{ const id = parseInt(rawId); if (!id) { @@ -78,13 +85,13 @@ export async function getSongById(rawId: number) { * * @param query - The search term for the song title. * @param limit - Max number of songs returned for performance (default: 20). - * @returns @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}} + * @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}} */ -export async function searchSongsByTitle(query: string, limit: number = 20) { +export async function searchSongsByTitle(query: string, limit: number = 20): Promise { try { const cleanQuery = query.trim(); if (!cleanQuery) { - return { success: true, songBooks: [] }; + return { success: true, status: 200, songs: [] }; } const songs = await prisma.song.findMany({ @@ -124,7 +131,7 @@ export async function searchSongsByTitle(query: string, limit: number = 20) { * @param data - object with title * @returns {"success": boolean, "status": number, "song": {"id":number, "title": string}} */ -export async function createSong(data: { title: string }) { +export async function createSong(data: { title: string }): Promise { try{ if(!data.title){ return { success: false, status: 400, error: "Field 'title' is required" }; @@ -164,7 +171,7 @@ export async function createSong(data: { title: string }) { export async function updateSong( rawId: number, data: { title?: string } -) { +): Promise { try { const id = parseInt(rawId); if (!id) { @@ -213,7 +220,7 @@ export async function updateSong( * @param id - ID indicatin the song * @returns {"success": boolean, "status": number, "song": {"id": number, "title": string}} */ -export async function deleteSong(rawId: number) { +export async function deleteSong(rawId: number): Promise { try { const id = parseInt(rawId); if (!id) { diff --git a/lib/helper/checkvar.ts b/lib/helper/checkvar.ts index ccdedd3..33308c3 100644 --- a/lib/helper/checkvar.ts +++ b/lib/helper/checkvar.ts @@ -1,6 +1,6 @@ -export function parseInt(rawInteger){ +export function parseInt(rawInteger: number){ const integer = Number.parseInt(rawInteger); if (Number.isNaN(integer) || !Number.isInteger(integer)) {