Add where clause in cancel_request stored procedure early exit

motis-project · Feb 24, 2025 · 24369d2 · 24369d2
1 parent b52bf40
commit 24369d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/migrations/2024-07-01.js b/migrations/2024-07-01.js
@@ -435,6 +435,7 @@ BEGIN
 		SELECT communicated_time
 		FROM request r
 		JOIN event e ON r.id = e.request
+		WHERE r.id = p_request_id
 		ORDER BY e.communicated_time ASC
 		LIMIT 1
 	) <= p_now THEN

diff --git a/src/lib/server/db/cancelRequest.test.ts b/src/lib/server/db/cancelRequest.test.ts
@@ -25,8 +25,8 @@ describe('tests for cancelling requests', () => {
 		const e1 = await setEvent(r, Date.now() + 7200, true, 1, 1);
 		const e2 = await setEvent(r, Date.now() + 7200, false, 1, 1);
 		const r2 = (await setRequest(t!.id, u.id, '')).id;
-		await setEvent(r2, 0, true, 1, 1);
-		await setEvent(r2, 0, false, 1, 1);
+		await setEvent(r2, Date.now() + 7200, true, 1, 1);
+		await setEvent(r2, Date.now() + 7200, false, 1, 1);
 
 		await cancelRequest(r, u.id);
 		const events = await selectEvents();

diff --git a/src/lib/testHelpers.ts b/src/lib/testHelpers.ts
@@ -108,7 +108,7 @@ export const setEvent = async (
 				address: '',
 				cancelled: false
 			})
-			.returning('id')
+			.returning('event.id')
 			.executeTakeFirstOrThrow()
 	).id;
 };