refactor: add fields to search condition

N-Laboratory · May 17, 2023 · 23add20 · 23add20 · vercel · May 17, 2023
1 parent b4092a1
commit 23add20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/app/api/list/route.ts b/src/app/api/list/route.ts
@@ -25,7 +25,9 @@ export const POST = async (request: NextRequest) => {
 
   const keyword = htmlspecialchars(result.data.keyword.trim())
   const articleList =
-    keyword == '' ? await getArticleList() : await getArticleListByKeyword(keyword)
+    keyword == ''
+      ? await getArticleList('id,title,overview,svgPath,createdDate')
+      : await getArticleListByKeyword(keyword, 'id,title,overview,svgPath,createdDate')
   if (!articleList) {
     return NextResponse.json({ articleListPerPage }, { status: 500 })
   }

diff --git a/src/app/articles/[id]/page.tsx b/src/app/articles/[id]/page.tsx
@@ -14,7 +14,7 @@ import { notFound } from 'next/navigation'
 
 // Dynamic Route使用時にSSGでビルドする
 export async function generateStaticParams() {
-  const response = await getArticleList()
+  const response = await getArticleList('id')
   const articleList = response?.contents
 
   return !articleList

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -11,7 +11,7 @@ export const metadata = {
 
 const Home = async () => {
   let hasError = false
-  const articleList = await getArticleList().catch(() => {
+  const articleList = await getArticleList('id,title,overview,svgPath,createdDate').catch(() => {
     hasError = true
   })
 

diff --git a/src/libs/microcms/client.ts b/src/libs/microcms/client.ts
@@ -33,11 +33,15 @@ export const getArticle = async (id: string) => {
   return article
 }
 
-export const getArticleList = async () => {
+export const getArticleList = async (filedNames?: string) => {
   const articleList = await client
     .get<ArticleList>({
       endpoint: 'article',
-      queries: { limit: 100, clearCache: 'true' } as CustomMicroCMSQueries,
+      queries: {
+        limit: 100,
+        clearCache: 'true',
+        fields: filedNames ?? '',
+      } as CustomMicroCMSQueries,
     })
     .then((res) => res)
     .catch((err) => {
@@ -46,11 +50,16 @@ export const getArticleList = async () => {
   return articleList
 }
 
-export const getArticleListByKeyword = async (keyword: string) => {
+export const getArticleListByKeyword = async (keyword: string, filedNames?: string) => {
   const articleList = await client
     .getList<Article>({
       endpoint: 'article',
-      queries: { q: keyword, limit: 100, clearCache: 'true' } as CustomMicroCMSQueries,
+      queries: {
+        q: keyword,
+        limit: 100,
+        clearCache: 'true',
+        fields: filedNames ?? '',
+      } as CustomMicroCMSQueries,
     })
     .then((res) => res)
     .catch((err) => {