Merge pull request #5 from codex/fix-scheduling-contract-conflicts

fix: enforce room type scheduling rules

src/routes/dashboard/clients/[id]/bookings/+page.server.ts

@@ -9,6 +9,8 @@ import { archiveSchema } from '$lib/schemas/shared.schema';
 import { bookingCreateSchema, bookingEditSchema } from '$lib/schemas/bookings.schema';
 import type { Actions, PageServerLoad } from './$types';
 
+const bookingRoomType = 'meeting_room';
+
 async function loadOptions(organizationId: string) {
 	const [clientRows, roomRows, serviceRows] = await Promise.all([
 		db
@@ -19,7 +21,13 @@ async function loadOptions(organizationId: string) {
 		db
 			.select({ id: rooms.id, name: rooms.name })
 			.from(rooms)
-			.where(and(eq(rooms.organizationId, organizationId), isNull(rooms.archivedAt)))
+			.where(
+				and(
+					eq(rooms.organizationId, organizationId),
+					eq(rooms.type, bookingRoomType),
+					isNull(rooms.archivedAt)
+				)
+			)
 			.orderBy(asc(rooms.name)),
 		db
 			.select({ id: services.id, name: services.name })
@@ -38,6 +46,23 @@ async function loadOptions(organizationId: string) {
 	};
 }
 
+async function isValidBookingRoom(organizationId: string, roomId: string) {
+	const [room] = await db
+		.select({ id: rooms.id })
+		.from(rooms)
+		.where(
+			and(
+				eq(rooms.id, roomId),
+				eq(rooms.organizationId, organizationId),
+				eq(rooms.type, bookingRoomType),
+				isNull(rooms.archivedAt)
+			)
+		)
+		.limit(1);
+
+	return Boolean(room);
+}
+
 export const load: PageServerLoad = async ({ locals, params }) => {
 	const { activeOrganizationId } = await loadOrganizationContext(locals);
 	const records = await db
@@ -93,6 +118,10 @@ export const actions: Actions = {
 
 		if (!form.valid) return message(form, 'Check the highlighted fields.', { status: 400 });
 
+		if (!(await isValidBookingRoom(activeOrganizationId, form.data.roomId))) {
+			return setError(form, 'roomId', 'Select a valid meeting room.');
+		}
+
 		const conflict = await findBookingRoomConflict({
 			organizationId: activeOrganizationId,
 			roomId: form.data.roomId,
@@ -133,6 +162,10 @@ export const actions: Actions = {
 
 		if (!form.valid) return message(form, 'Check the highlighted fields.', { status: 400 });
 
+		if (!(await isValidBookingRoom(activeOrganizationId, form.data.roomId))) {
+			return setError(form, 'roomId', 'Select a valid meeting room.');
+		}
+
 		const conflict = await findBookingRoomConflict({
 			organizationId: activeOrganizationId,
 			roomId: form.data.roomId,

src/routes/dashboard/clients/[id]/contracts/+page.server.ts

@@ -13,6 +13,8 @@ import {
 } from '$lib/schemas/contracts.schema';
 import type { Actions, PageServerLoad } from './$types';
 
+const contractRoomTypes = ['private_office', 'coworking_desk'] as const;
+
 async function loadOptions(organizationId: string) {
 	const [roomRows, serviceRows] = await Promise.all([
 		db
@@ -26,7 +28,7 @@ async function loadOptions(organizationId: string) {
 			.where(
 				and(
 					eq(rooms.organizationId, organizationId),
-					inArray(rooms.type, ['private_office', 'coworking_desk']),
+					inArray(rooms.type, contractRoomTypes),
 					isNull(rooms.archivedAt)
 				)
 			)
@@ -155,7 +157,7 @@ async function selectionError(
 				and(
 					inArray(rooms.id, uniqueRoomIds),
 					eq(rooms.organizationId, organizationId),
-					inArray(rooms.type, ['private_office', 'coworking_desk']),
+					inArray(rooms.type, contractRoomTypes),
 					isNull(rooms.archivedAt)
 				)
 			);
@@ -371,6 +373,14 @@ export const actions: Actions = {
 				.select({ roomId: contractRooms.roomId })
 				.from(contractRooms)
 				.where(eq(contractRooms.contractId, form.data.id));
+			const invalidSelection = await selectionError(
+				activeOrganizationId,
+				roomLinks.map((link) => link.roomId),
+				''
+			);
+			if (invalidSelection) {
+				return message(form, invalidSelection.message, { status: 400 });
+			}
 			const conflict = await findActiveContractRoomConflict({
 				organizationId: activeOrganizationId,
 				roomIds: roomLinks.map((link) => link.roomId),

src/routes/dashboard/invoices/[id]/+page.svelte

@@ -215,7 +215,7 @@
 	{#if data.invoice.notes}
 		<section class="rounded-lg border border-border p-4">
 			<h2 class="text-sm font-semibold">Notes</h2>
-			<p class="mt-2 whitespace-pre-wrap text-sm text-muted-foreground">{data.invoice.notes}</p>
+			<p class="mt-2 text-sm whitespace-pre-wrap text-muted-foreground">{data.invoice.notes}</p>
 		</section>
 	{/if}
 </div>