Adding api request using z schema Closes #61

src/lib/services/noteService.ts

@@ -22,7 +22,8 @@ export async function updateNote(note: Note): Promise<Note> {
 		where: { id: note.id },
 		data: {
 			...note,
-			boardId: note.boardId!
+			boardId: note.boardId!,
+			updatedAt: new Date()
 		}
 	});
 }

src/lib/types.ts

@@ -19,6 +19,14 @@ export const NoteSchema = EntitySchema.extend({
 
 export type Note = z.infer<typeof NoteSchema>;
 
+export const NotePatchInputSchema = z.object({
+	text: z.string(),
+	textPlain: z.string(),
+	colour: z.string().nullable()
+});
+
+export type NotePatchInput = z.infer<typeof NotePatchInputSchema>;
+
 export const BoardSchema = EntitySchema.extend({
 	userId: z.string(),
 	notes: z.array(NoteSchema),

src/routes/api/notes/+server.ts

@@ -3,9 +3,16 @@ import { json, type RequestHandler } from '@sveltejs/kit';
 import { getUserById, isBoardOwner } from '$lib/services/userService';
 import { createNote } from '$lib/services/noteService';
 import { updateBoard } from '$lib/services/boardService';
+import { NoteCreateInputSchema } from '$lib/types';
 
 export const POST: RequestHandler = async ({ locals, request }) => {
-	const { id, boardId, text, textPlain, colour = null } = await request.json();
+	const changes = await request.json();
+	const parseResult = NoteCreateInputSchema.safeParse(changes);
+	if (!parseResult.success) {
+		return json({ message: 'Unable to parse NoteCreateInputSchema' }, { status: 400 });
+	}
+
+	const { id, boardId, text, textPlain, colour } = parseResult.data;
 	const userId = locals.user.id!;
 	const user = await getUserById(userId, { boards: true, notes: false });
 	if (!user) {

src/routes/api/notes/[id]/+server.ts

@@ -2,6 +2,7 @@ import { json, type RequestHandler } from '@sveltejs/kit';
 
 import { updateBoard } from '$lib/services/boardService';
 import { getNoteById, updateNote, deleteNote } from '$lib/services/noteService';
+import { NotePatchInputSchema } from '$lib/types';
 import { getUserById, isBoardOwner } from '$lib/services/userService';
 
 export const GET: RequestHandler = async ({ locals, params }) => {
@@ -37,8 +38,13 @@ export const PATCH: RequestHandler = async ({ locals, params, request }) => {
 		return json(null, { status: 404 });
 	}
 
-	// todo: validate body (using joi)
 	const changes = await request.json();
+	const parseResult = NotePatchInputSchema.safeParse(changes);
+	if (!parseResult.success) {
+		parseResult.error.errors.forEach((e) => console.error(e));
+		return json({ message: 'Unable to parse NoteSchema' }, { status: 400 });
+	}
+
 	const user = await getUserById(userId, { boards: true, notes: false });
 	if (!user) {
 		return json(null, { status: 404 });
@@ -50,8 +56,7 @@ export const PATCH: RequestHandler = async ({ locals, params, request }) => {
 
 	const updatedNote = await updateNote({
 		...note,
-		...changes,
-		updatedAt: new Date()
+		...parseResult.data
 	});
 
 	return json(updatedNote);

src/routes/my-board/+page.svelte

@@ -8,7 +8,14 @@
 	import { MaybeType, tryFetch } from '$lib/fetch';
 	import { generateId } from '$lib/identityGenerator';
 	import { getOrderedNotes, reorderNotes, updateNote } from '$lib/notes';
-	import type { BoardPatch, Note, NoteOrdered, User } from '$lib/types';
+	import type {
+		BoardPatch,
+		NoteCreateInput,
+		NotePatchInput,
+		Note,
+		NoteOrdered,
+		User
+	} from '$lib/types';
 
 	const auth = withAuth();
 	const { getToken } = auth;
@@ -42,7 +49,7 @@
 
 	async function handleCreate() {
 		const id = generateId('nid');
-		const newNote: Note = { id, text: '', textPlain: '', boardId, colour: null };
+		const newNote: NoteCreateInput = { id, text: '', textPlain: '', boardId, colour: null };
 		localNotes = [...localNotes, { ...newNote, order: localNotes.length }];
 		localNoteOrder = [...localNoteOrder, id];
 
@@ -74,11 +81,15 @@
 		}
 
 		localNotes = [...updateNote(localNotes, note)];
-		const { order, boardId, ...restNoteProps } = note;
+		const notePatch: NotePatchInput = {
+			colour: note.colour,
+			text: note.text,
+			textPlain: note.textPlain
+		};
 
 		const { type } = await tryFetch<Note>(
 			`/api/notes/${note.id}`,
-			{ method: 'PATCH', body: JSON.stringify(restNoteProps) },
+			{ method: 'PATCH', body: JSON.stringify(notePatch) },
 			{ getBearerToken: getToken }
 		);