feat: character list page

Author: KUN1007

app/api/character/all/route.ts

@@ -3,11 +3,12 @@ import { NextRequest, NextResponse } from 'next/server'
 import { prisma } from '~/prisma/index'
 import { getCharSchema } from '~/validations/char'
 import { kunParseGetQuery } from '~/app/api/utils/parseQuery'
+import type { PatchCharacter } from '~/types/api/character'
 
 export const getChar = async (input: z.infer<typeof getCharSchema>) => {
   const { page, limit } = input
   const offset = (page - 1) * limit
-  const [chars, total] = await Promise.all([
+  const [data, total] = await Promise.all([
     prisma.patch_char.findMany({
       take: limit,
       skip: offset,
@@ -25,12 +26,29 @@ export const getChar = async (input: z.infer<typeof getCharSchema>) => {
     }),
     prisma.patch_char.count()
   ])
+
+  const chars: PatchCharacter[] = data.map((c) => ({
+    id: c.id,
+    image: c.image,
+    gender: c.gender,
+    role: c.role,
+    roles: c.roles,
+    name: {
+      'zh-cn': c.name_zh_cn,
+      'ja-jp': c.name_ja_jp,
+      'en-us': c.name_en_us
+    }
+  }))
+
   return { chars, total }
 }
 
 export const GET = async (req: NextRequest) => {
   const input = kunParseGetQuery(req, getCharSchema)
-  if (typeof input === 'string') return NextResponse.json(input)
+  if (typeof input === 'string') {
+    return NextResponse.json(input)
+  }
+
   const response = await getChar(input)
   return NextResponse.json(response)
 }

app/api/character/route.ts

@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { prisma } from '~/prisma'
 import { kunParseGetQuery } from '../utils/parseQuery'
+import type { PatchCharacterDetail } from '~/types/api/character'
 
 const characterIdSchema = z.object({ characterId: z.coerce.number().min(1) })
 
@@ -12,7 +13,9 @@ export const getCharacterById = async (
   const char = await prisma.patch_char.findUnique({
     where: { id: characterId }
   })
-  if (!char) return '未找到角色'
+  if (!char) {
+    return '未找到角色'
+  }
 
   const aliases = await prisma.patch_char_alias
     .findMany({ where: { patch_char_id: characterId }, select: { name: true } })
@@ -24,7 +27,9 @@ export const getCharacterById = async (
   })
   const patches = patchRelations.map((pr) => ({
     id: pr.patch.id,
-    name: pr.patch.name,
+    name_zh_cn: pr.patch.name_zh_cn,
+    name_ja_jp: pr.patch.name_ja_jp,
+    name_en_us: pr.patch.name_en_us,
     banner: pr.patch.banner
   }))
 
@@ -34,12 +39,16 @@ export const getCharacterById = async (
     gender: char.gender,
     role: char.role,
     roles: char.roles,
-    name_zh_cn: char.name_zh_cn,
-    name_ja_jp: char.name_ja_jp,
-    name_en_us: char.name_en_us,
-    description_zh_cn: char.description_zh_cn,
-    description_ja_jp: char.description_ja_jp,
-    description_en_us: char.description_en_us,
+    name: {
+      'zh-cn': char.name_zh_cn,
+      'ja-jp': char.name_ja_jp,
+      'en-us': char.name_en_us
+    },
+    description: {
+      'zh-cn': char.description_zh_cn,
+      'ja-jp': char.description_ja_jp,
+      'en-us': char.description_en_us
+    },
     birthday: char.birthday,
     height: char.height,
     weight: char.weight,
@@ -50,15 +59,24 @@ export const getCharacterById = async (
     age: char.age,
     infobox: char.infobox,
     alias: aliases,
-    patches
-  }
+    patches: patches.map((p) => ({
+      id: p.id,
+      name: {
+        'zh-cn': p.name_zh_cn,
+        'ja-jp': p.name_ja_jp,
+        'en-us': p.name_en_us
+      },
+      banner: p.banner
+    }))
+  } satisfies PatchCharacterDetail
 }
 
 export const GET = async (req: NextRequest) => {
   const input = kunParseGetQuery(req, characterIdSchema)
   if (typeof input === 'string') {
     return NextResponse.json(input)
   }
+
   const res = await getCharacterById(input)
   return NextResponse.json(res)
 }

app/api/character/search/route.ts

@@ -3,10 +3,11 @@ import { NextRequest, NextResponse } from 'next/server'
 import { prisma } from '~/prisma/index'
 import { searchCharSchema } from '~/validations/char'
 import { kunParsePostBody } from '~/app/api/utils/parseQuery'
+import type { PatchCharacter } from '~/types/api/character'
 
 export const searchChar = async (input: z.infer<typeof searchCharSchema>) => {
   const { query } = input
-  const chars = await prisma.patch_char.findMany({
+  const data = await prisma.patch_char.findMany({
     where: {
       OR: query.map((term) => ({
         OR: [
@@ -29,6 +30,20 @@ export const searchChar = async (input: z.infer<typeof searchCharSchema>) => {
       name_en_us: true
     }
   })
+
+  const chars: PatchCharacter[] = data.map((c) => ({
+    id: c.id,
+    image: c.image,
+    gender: c.gender,
+    role: c.role,
+    roles: c.roles,
+    name: {
+      'zh-cn': c.name_zh_cn,
+      'ja-jp': c.name_ja_jp,
+      'en-us': c.name_en_us
+    }
+  }))
+
   return chars
 }
 

app/api/patch/detail/route.ts

@@ -127,11 +127,6 @@ export const getPatchDetail = async (
           'ja-jp': c.name_ja_jp,
           'en-us': c.name_en_us
         },
-        description: {
-          'zh-cn': c.description_zh_cn,
-          'ja-jp': c.description_ja_jp,
-          'en-us': c.description_en_us
-        },
         infobox: c.infobox
       })),
     person: patch.person_rel
@@ -144,11 +139,6 @@ export const getPatchDetail = async (
           'zh-cn': p.name_zh_cn,
           'ja-jp': p.name_ja_jp,
           'en-us': p.name_en_us
-        },
-        description: {
-          'zh-cn': p.description_zh_cn,
-          'ja-jp': p.description_ja_jp,
-          'en-us': p.description_en_us
         }
       })),
     created: String(patch.created),

app/api/patch/get.ts

@@ -50,7 +50,11 @@ export const getPatchById = async (
       'ja-jp': patch.name_ja_jp,
       'en-us': patch.name_en_us
     },
-    introduction: patch.introduction,
+    introductionMarkdown: {
+      'zh-cn': patch.introduction_zh_cn,
+      'ja-jp': patch.introduction_ja_jp,
+      'en-us': patch.introduction_en_us
+    },
     banner: patch.banner,
     status: patch.status,
     view: patch.view,
@@ -63,6 +67,7 @@ export const getPatchById = async (
     resourceUpdateTime: patch.resource_update_time,
     content_limit: patch.content_limit,
     cover: patch.cover,
+    released: patch.released,
     user: {
       id: patch.user.id,
       name: patch.user.name,

app/api/patch/introduction/route.ts

@@ -9,7 +9,7 @@ export const revalidate = 5
 export const metadata: Metadata = kunMetadata
 
 export default async function CharIndex() {
-  const response = await kunGetActions({ page: 1, limit: 100 })
+  const response = await kunGetActions({ page: 1, limit: 72 })
   if (typeof response === 'string') {
     return <ErrorComponent error={response} />
   }

app/character/page.tsx

@@ -5,7 +5,6 @@ import { z } from 'zod'
 import { verifyHeaderCookie } from '~/utils/actions/verifyHeaderCookie'
 import { safeParseSchema } from '~/utils/actions/safeParseSchema'
 import { getPatchById } from '~/app/api/patch/get'
-import { getPatchIntroduction } from '~/app/api/patch/introduction/route'
 import { getPatchDetail } from '~/app/api/patch/detail/route'
 import { getPatchContributor } from '~/app/api/patch/contributor/route'
 import { updatePatchViews } from '~/app/api/patch/views/put'
@@ -28,18 +27,6 @@ export const kunGetPatchActions = cache(
   }
 )
 
-export const kunGetPatchIntroductionActions = cache(
-  async (params: z.infer<typeof patchIdSchema>) => {
-    const input = safeParseSchema(patchIdSchema, params)
-    if (typeof input === 'string') {
-      return input
-    }
-
-    const response = await getPatchIntroduction(input)
-    return response
-  }
-)
-
 export const kunGetContributorActions = cache(
   async (params: z.infer<typeof patchIdSchema>) => {
     const input = safeParseSchema(patchIdSchema, params)

app/patch/[id]/actions.ts

@@ -1,9 +1,5 @@
 import { ErrorComponent } from '~/components/error/ErrorComponent'
-import {
-  kunGetPatchActions,
-  kunGetPatchIntroductionActions,
-  kunUpdatePatchViewsActions
-} from './actions'
+import { kunGetPatchActions, kunUpdatePatchViewsActions } from './actions'
 import { PatchContainer } from '~/components/patch/Container'
 import { verifyHeaderCookie } from '~/utils/actions/verifyHeaderCookie'
 
@@ -23,7 +19,6 @@ export default async function Kun({ params, children }: Props) {
     kunGetPatchActions({
       patchId: Number(id)
     }),
-    kunGetPatchIntroductionActions({ patchId: Number(id) }),
     kunUpdatePatchViewsActions({ patchId: Number(id) })
   ])
   if (typeof patch === 'string') {
@@ -37,7 +32,7 @@ export default async function Kun({ params, children }: Props) {
   const payload = await verifyHeaderCookie()
 
   return (
-    <PatchContainer patch={patch} intro={intro} uid={payload?.uid}>
+    <PatchContainer patch={patch} uid={payload?.uid}>
       {children}
     </PatchContainer>
   )