wip

Author: felixguendling

e2e/driver.test.ts

@@ -2,12 +2,16 @@ import { test, expect } from '@playwright/test';
 import { TAXI_OWNER, execSQL, login } from './utils';
 import { sql } from 'kysely';
 
+
+const fromTime = new Date("2026-09-30T00:00:00.000Z").getTime();
+const toTime = new Date("2026-09-30T23:59:59.000Z").getTime();
+
 test('Get tours', async ({ page }) => {
 	await login(page, TAXI_OWNER);
 
 	const response = await page
 		.context()
-		.request.get('/api/driver/tour?fromTime=1790726400000&toTime=1790812799000');
+		.request.get(`/api/driver/tour?fromTime=${fromTime}&toTime=${toTime}`);
 	expect(response.status()).toBe(200);
 
 	const responseBody = await response.json();
@@ -38,7 +42,7 @@ test('Set ticket checked', async ({ page }) => {
 
 	const toursResponse = await page
 		.context()
-		.request.get('/api/driver/tour?fromTime=1790726400000&toTime=1790812799000');
+		.request.get(`/api/driver/tour?fromTime=${fromTime}&toTime=${toTime}`);
 	expect(toursResponse.status()).toBe(200);
 
 	const tours = await toursResponse.json();
@@ -76,7 +80,7 @@ test('Set tour fare', async ({ page }) => {
 
 	const toursResponse = await page
 		.context()
-		.request.get('/api/driver/tour?fromTime=1790726400000&toTime=1790812799000');
+		.request.get(`/api/driver/tour?fromTime=${fromTime}&toTime=${toTime}`);
 	expect(toursResponse.status()).toBe(200);
 
 	const tours = await toursResponse.json();

src/routes/api/driver/fare/+server.ts

@@ -1,12 +1,13 @@
 import { db } from '$lib/server/db';
 import { readInt } from '$lib/server/util/readForm.js';
+import { error } from '@sveltejs/kit';
 
 export const PUT = async ({ url }) => {
 	const tourId = readInt(url.searchParams.get('tourId'));
 	const fare = readInt(url.searchParams.get('fare'));
 
 	if (isNaN(fare) || isNaN(tourId)) {
-		return new Response(null, { status: 400 });
+		error(400, { message: 'Invalid fare or tourId parameter' });
 	}
 
 	const result = await db
@@ -16,7 +17,7 @@ export const PUT = async ({ url }) => {
 		.executeTakeFirst();
 
 	if (result.numUpdatedRows === BigInt(0)) {
-		return new Response(null, { status: 404 });
+		error(404, { message: 'Tour not found' });
 	}
 
 	return new Response(null, { status: 204 });

src/routes/api/driver/ticket/+server.ts

@@ -1,12 +1,13 @@
 import { db } from '$lib/server/db';
 import { readInt } from '$lib/server/util/readForm.js';
+import { error } from '@sveltejs/kit';
 
 export const PUT = async ({ url }) => {
 	const requestId = readInt(url.searchParams.get('requestId'));
 	const ticketCode = url.searchParams.get('ticketCode');
 
 	if (typeof ticketCode !== 'string' || isNaN(requestId)) {
-		return new Response(null, { status: 400 });
+		error(400, { message: 'Invalid ticketCode parameter' });
 	}
 
 	const result = await db
@@ -17,7 +18,7 @@ export const PUT = async ({ url }) => {
 		.executeTakeFirst();
 
 	if (result.numUpdatedRows === BigInt(0)) {
-		return new Response(null, { status: 404 });
+		error(404, { message: 'Request not found or invalid ticket code' });
 	}
 
 	return new Response(null, { status: 204 });

src/routes/api/driver/tour/+server.ts

@@ -1,14 +1,14 @@
 import { getTours } from '$lib/server/db/getTours';
 import { readInt } from '$lib/server/util/readForm.js';
-import { json } from '@sveltejs/kit';
+import { error, json } from '@sveltejs/kit';
 
 export const GET = async ({ locals, url }) => {
 	const companyId = locals.session!.companyId!;
 	const fromTime = readInt(url.searchParams.get('fromTime'));
 	const toTime = readInt(url.searchParams.get('toTime'));
 
 	if (isNaN(fromTime) || isNaN(toTime)) {
-		return new Response(null, { status: 400 });
+		error(400, { message: 'Invalid time range' });
 	}
 
 	return json(await getTours(false, companyId, [fromTime, toTime]));