✨ Enable to use url slug in workbook page (#2020)

Author: KATO-Hiro

src/routes/workbooks/[slug]/+page.server.ts

@@ -1,29 +1,32 @@
 import { error, type Actions } from '@sveltejs/kit';
 
-import { getLoggedInUser, isAdmin, canRead } from '$lib/utils/authorship';
 import { Roles } from '$lib/types/user';
-import { getWorkbookWithAuthor, parseWorkBookId } from '$lib/utils/workbook';
-import * as taskResultsCrud from '$lib/services/task_results';
 import type { TaskResult } from '$lib/types/task';
-import { BAD_REQUEST, FORBIDDEN } from '$lib/constants/http-response-status-codes';
+
+import * as taskResultsCrud from '$lib/services/task_results';
 import * as action from '$lib/actions/update_task_result';
 
+import { getLoggedInUser, isAdmin, canRead } from '$lib/utils/authorship';
+import { getWorkbookWithAuthor, findWorkBookIdFrom } from '$lib/utils/workbook';
+import { BAD_REQUEST, FORBIDDEN } from '$lib/constants/http-response-status-codes';
+
 export async function load({ locals, params }) {
   const loggedInUser = await getLoggedInUser(locals);
   const loggedInAsAdmin = isAdmin(loggedInUser?.role as Roles);
-  const workBookId = parseWorkBookId(params.slug);
+  const slug = params.slug.toLowerCase();
+  const workBookId = await findWorkBookIdFrom(slug);
 
   if (workBookId === null) {
     error(BAD_REQUEST, '不正な問題集idです。');
   }
 
-  const workbookWithAuthor = await getWorkbookWithAuthor(params.slug);
+  const workbookWithAuthor = await getWorkbookWithAuthor(slug);
   const workBook = workbookWithAuthor.workBook;
   const isPublished = workBook.isPublished;
   const authorId = workBook.authorId;
 
   if (loggedInUser && !canRead(isPublished, loggedInUser.id, authorId)) {
-    error(FORBIDDEN, `問題集id: ${params.slug} にアクセスする権限がありません。`);
+    error(FORBIDDEN, `問題集id: ${slug} にアクセスする権限がありません。`);
   }
 
   const taskResults: Map<string, TaskResult> = await taskResultsCrud.getTaskResultsByTaskId(

src/routes/workbooks/edit/[slug]/+page.server.ts

@@ -1,4 +1,4 @@
-import { redirect, error } from '@sveltejs/kit';
+import { redirect, error, fail } from '@sveltejs/kit';
 import { superValidate } from 'sveltekit-superforms/server';
 import { zod } from 'sveltekit-superforms/adapters';
 
@@ -10,15 +10,16 @@ import {
   TEMPORARY_REDIRECT,
   INTERNAL_SERVER_ERROR,
 } from '$lib/constants/http-response-status-codes';
-import { getWorkbookWithAuthor, parseWorkBookId } from '$lib/utils/workbook';
+import { getWorkbookWithAuthor, findWorkBookIdFrom } from '$lib/utils/workbook';
 import { workBookSchema } from '$lib/zod/schema';
 import * as tasksCrud from '$lib/services/tasks';
 import * as workBooksCrud from '$lib/services/workbooks';
 
 export async function load({ locals, params }) {
   const loggedInUser = await getLoggedInUser(locals);
   const loggedInAsAdmin = isAdmin(loggedInUser?.role as Roles);
-  const workBookWithAuthor = await getWorkbookWithAuthor(params.slug);
+  const slug = params.slug.toLowerCase();
+  const workBookWithAuthor = await getWorkbookWithAuthor(slug);
 
   const form = await superValidate(null, zod(workBookSchema));
   form.data = { ...form.data, ...workBookWithAuthor.workBook };
@@ -40,7 +41,7 @@ export async function load({ locals, params }) {
   ) {
     return {
       status: FORBIDDEN,
-      message: `問題集id: ${params.slug}にアクセスする権限がありません。`,
+      message: `問題集id: ${slug}にアクセスする権限がありません。`,
       form,
       loggedInAsAdmin: loggedInAsAdmin,
       ...workBookWithAuthor,
@@ -74,7 +75,8 @@ export const actions = {
     }
 
     const workBook = form.data;
-    const workBookId = parseWorkBookId(params.slug);
+    const slug = params.slug.toLowerCase();
+    const workBookId = await findWorkBookIdFrom(slug);
 
     if (workBookId === null) {
       error(BAD_REQUEST, '不正な問題集idです。');
@@ -84,10 +86,13 @@ export const actions = {
       await workBooksCrud.updateWorkBook(workBookId, { ...workBook, id: workBookId });
     } catch (e) {
       console.error(`Failed to update WorkBook with id ${workBookId}:`, e);
-      error(
-        INTERNAL_SERVER_ERROR,
-        `問題集id: ${workBookId} の更新に失敗しました。しばらくしてから、もう一度試してください。`,
-      );
+
+      return fail(INTERNAL_SERVER_ERROR, {
+        form: {
+          ...form,
+          message: `問題集: ${workBookId} の更新に失敗しました。しばらくしてから、もう一度試してください。`,
+        },
+      });
     }
 
     redirect(TEMPORARY_REDIRECT, '/workbooks');