diff --git a/backend/handlers/today/today_test.go b/backend/handlers/today/today_test.go
index e8e0e0d..7dae6a8 100644
--- a/backend/handlers/today/today_test.go
+++ b/backend/handlers/today/today_test.go
@@ -693,7 +693,7 @@ func TestGetCurrentNext_WithMultipleDataPoints(t *testing.T) {
 		INSERT INTO bookings (user_id, start_time, status)
 		VALUES ($1, $2, 'completed')
 		RETURNING id
-	`, user1ID, now.Add(-2*time.Hour)).Scan(&booking1ID)
+	`, user1ID, now.Add(-30*time.Minute)).Scan(&booking1ID)
 	if err != nil {
 		t.Fatalf("failed to create booking 1: %v", err)
 	}
@@ -723,16 +723,21 @@ func TestGetCurrentNext_WithMultipleDataPoints(t *testing.T) {
 	var booking2ID string
 	err = tx.QueryRow(ctx, `
 		INSERT INTO bookings (user_id, start_time, status)
-		VALUES ($1, $2, 'in_progress')
+		VALUES ($1, $2, 'completed')
 		RETURNING id
-	`, user2ID, now.Add(-3*time.Hour)).Scan(&booking2ID)
+	`, user2ID, now.Add(-15*time.Minute)).Scan(&booking2ID)
 	if err != nil {
 		t.Fatalf("failed to create booking 2: %v", err)
 	}
 	addBookingService(t, ctx, tx, booking2ID, svcID)
 
+	// Commit the transaction so the handler (which manages its own db.Conn tx) can see the data.
+	if err := tx.(interface{ Commit(context.Context) error }).Commit(context.Background()); err != nil {
+		t.Fatalf("failed to commit test data: %v", err)
+	}
+
 	req := httptest.NewRequest(http.MethodGet, "/api/admin/today/current-next", nil)
-	req = req.WithContext(ctx)
+	req = req.WithContext(context.Background())
 	rr := httptest.NewRecorder()
 	GetCurrentAndNextHandler(rr, req)
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0a3e712..64ec623 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -31,7 +31,7 @@
 				"@types/node": "^26.1.1",
 				"bits-ui": "^2.16.1",
 				"clsx": "^2.1.1",
-				"eslint": "^9.22.0",
+				"eslint": "^9.39.5",
 				"eslint-config-prettier": "^10.0.1",
 				"eslint-plugin-svelte": "^3.0.0",
 				"globals": "^17.3.0",
@@ -214,9 +214,9 @@
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "3.3.5",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz",
-			"integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==",
+			"version": "3.3.6",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz",
+			"integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -226,7 +226,7 @@
 				"globals": "^14.0.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.1",
+				"js-yaml": "^4.3.0",
 				"minimatch": "^3.1.5",
 				"strip-json-comments": "^3.1.1"
 			},
@@ -2014,9 +2014,9 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.39.4",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
-			"integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
+			"version": "9.39.5",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz",
+			"integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2025,8 +2025,8 @@
 				"@eslint/config-array": "^0.21.2",
 				"@eslint/config-helpers": "^0.4.2",
 				"@eslint/core": "^0.17.0",
-				"@eslint/eslintrc": "^3.3.5",
-				"@eslint/js": "9.39.4",
+				"@eslint/eslintrc": "^3.3.6",
+				"@eslint/js": "9.39.5",
 				"@eslint/plugin-kit": "^0.4.1",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
@@ -2166,19 +2166,6 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/@eslint/js": {
-			"version": "9.39.4",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
-			"integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://eslint.org/donate"
-			}
-		},
 		"node_modules/esm-env": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 15b9c0b..c1266ae 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -30,7 +30,7 @@
 		"@types/node": "^26.1.1",
 		"bits-ui": "^2.16.1",
 		"clsx": "^2.1.1",
-		"eslint": "^9.22.0",
+		"eslint": "^9.39.5",
 		"eslint-config-prettier": "^10.0.1",
 		"eslint-plugin-svelte": "^3.0.0",
 		"globals": "^17.3.0",