diff --git a/src/_tests/shared/lib/supabase/getAuthenticatedUser.test.ts b/src/_tests/shared/lib/supabase/getAuthenticatedUser.test.ts index 202c482..e2ef4a0 100644 --- a/src/_tests/shared/lib/supabase/getAuthenticatedUser.test.ts +++ b/src/_tests/shared/lib/supabase/getAuthenticatedUser.test.ts @@ -6,6 +6,9 @@ jest.mock("next/navigation", () => ({ notFound: () => { throw new Error("NEXT_NOT_FOUND"); }, + redirect: (url: string) => { + throw new Error(`NEXT_REDIRECT:${url}`); + }, })); describe("공용 사용자 인증 확인", () => { @@ -28,4 +31,27 @@ describe("공용 사용자 인증 확인", () => { } as never), ).rejects.toThrow("NEXT_NOT_FOUND"); }); + + it.each([ + { user: null, error: null }, + { user: { id: "owner" }, error: { message: "invalid token" } }, + ])("새 로그인 가드는 인증 실패 시 /login으로 이동한다: $error", async ({ user, error }) => { + const { requireUserOrRedirect } = await import("@/features/login/server"); + const getUser = jest.fn(async () => ({ data: { user }, error })); + + await expect(requireUserOrRedirect({ auth: { getUser } } as never)).rejects.toThrow( + "NEXT_REDIRECT:/login", + ); + expect(getUser).toHaveBeenCalledTimes(1); + }); + + it("새 로그인 가드는 인증된 사용자의 ID를 반환한다", async () => { + const { requireUserOrRedirect } = await import("@/features/login/server"); + const getUser = jest.fn(async () => ({ data: { user: { id: "owner" } }, error: null })); + + await expect(requireUserOrRedirect({ auth: { getUser } } as never)).resolves.toEqual({ + id: "owner", + }); + expect(getUser).toHaveBeenCalledTimes(1); + }); }); diff --git a/src/_tests/views/grammar-library/GrammarLibraryPage.test.tsx b/src/_tests/views/grammar-library/GrammarLibraryPage.test.tsx index 877ddb4..438ad6d 100644 --- a/src/_tests/views/grammar-library/GrammarLibraryPage.test.tsx +++ b/src/_tests/views/grammar-library/GrammarLibraryPage.test.tsx @@ -1,8 +1,11 @@ /** @jest-environment node */ import { describe, it, expect, jest, beforeEach } from "@jest/globals"; +import { createElement } from "react"; +import { renderToStaticMarkup } from "react-dom/server"; import type { GrammarNoteRepository } from "@/entities/grammar-note"; +jest.mock("server-only", () => ({})); jest.mock("@/shared/lib/supabase/server", () => ({ createSupabaseServerClient: jest.fn() })); jest.mock("@/shared/lib/logging/pino", () => ({ recordOperationEvent: jest.fn() })); @@ -21,10 +24,11 @@ describe("grammar list route", () => { const { createSupabaseServerClient } = await import("@/shared/lib/supabase/server"); jest.spyOn(GrammarNoteRepository.prototype, "findMany").mockImplementation(findMany); + findMany.mockClear(); jest.mocked(createSupabaseServerClient).mockResolvedValue({ auth: { getUser: async () => ({ data: { user: { id: "owner" } }, error: null }) }, } as unknown as Awaited>); - findMany.mockResolvedValue({ items: [], total: 41, page: 999, pageSize: 20 }); + findMany.mockResolvedValue({ items: [], total: 41, page: 999, pageSize: 10 }); }); it("redirects an out-of-range page to last valid page with search preserved", async () => { @@ -32,9 +36,100 @@ describe("grammar list route", () => { await import("@/views/grammar-library/ui/GrammarLibraryContent"); await expect(GrammarLibraryContent({ query: { page: 999, query: "verb" } })).rejects.toThrow( - "redirect:/grammar?q=verb&page=3", + "redirect:/grammar?q=verb&page=5", ); - expect(findMany).toHaveBeenCalledWith({ page: 999, pageSize: 20, query: "verb" }); + expect(findMany).toHaveBeenCalledWith({ page: 999, pageSize: 10, query: "verb" }); + }); + + it("loads ten notes through the named server service", async () => { + const { getGrammarLibraryPage } = + await import("@/views/grammar-library/services/server/getGrammarLibraryPage"); + const query = { page: 2, query: "verb" }; + const notePage = { items: [], total: 11, page: 2, pageSize: 10 }; + findMany.mockResolvedValueOnce(notePage); + + await expect(getGrammarLibraryPage(query)).resolves.toEqual(notePage); + expect(findMany).toHaveBeenCalledWith({ ...query, pageSize: 10 }); + }); + + it("returns a list error only when the authenticated lookup fails", async () => { + const { getGrammarLibraryPage } = + await import("@/views/grammar-library/services/server/getGrammarLibraryPage"); + findMany.mockRejectedValueOnce(new Error("database unavailable")); + + await expect(getGrammarLibraryPage({ page: 1, query: "verb" })).resolves.toBeNull(); + }); + + it("keeps the retry UI inside the list when the lookup fails", async () => { + const { GrammarLibraryContent } = + await import("@/views/grammar-library/ui/GrammarLibraryContent"); + findMany.mockRejectedValueOnce(new Error("database unavailable")); + + const html = renderToStaticMarkup( + await GrammarLibraryContent({ query: { page: 1, query: "verb" } }), + ); + expect(html).toContain("어법 노트를 불러오지 못했습니다"); + expect(html).toContain('href="/grammar?q=verb"'); + }); + + it("redirects an unauthenticated list visit before querying notes", async () => { + const { createSupabaseServerClient } = await import("@/shared/lib/supabase/server"); + jest.mocked(createSupabaseServerClient).mockResolvedValueOnce({ + auth: { getUser: async () => ({ data: { user: null }, error: null }) }, + } as unknown as Awaited>); + const { GrammarLibraryContent } = + await import("@/views/grammar-library/ui/GrammarLibraryContent"); + + await expect(GrammarLibraryContent({ query: { page: 1, query: "" } })).rejects.toThrow( + "redirect:/login", + ); + expect(findMany).not.toHaveBeenCalled(); + }); + + it("renders the title and search before the note list resolves", async () => { + const { default: GrammarLibraryPage } = await import("@/app/(protected)/grammar/(list)/page"); + const html = renderToStaticMarkup( + await GrammarLibraryPage({ searchParams: Promise.resolve({ q: "verb" }) }), + ); + + expect(html).toContain("어법 노트"); + expect(html).toContain('name="q"'); + expect(html).toContain('value="verb"'); + expect(html).toContain("어법 노트를 불러오는 중"); + expect(html).not.toContain("0개의 어법 노트"); + }); + + it("keeps filtered page links and makes each note card the navigation target", async () => { + const { GrammarNoteList } = await import("@/views/grammar-library/ui/GrammarNoteList"); + const html = renderToStaticMarkup( + createElement(GrammarNoteList, { + data: { + items: [ + { + id: "11111111-1111-4111-8111-111111111111", + ownerId: "22222222-2222-4222-8222-222222222222", + version: 1, + createdAt: "2026-10-12T00:00:00Z", + updatedAt: "2026-10-12T00:00:00Z", + title: "Verb phrase", + sentence: "I have been reading.", + tags: ["verb"], + }, + ], + total: 11, + page: 1, + pageSize: 10, + }, + query: "verb", + }), + ); + + expect(html).toContain( + 'href="/grammar/11111111-1111-4111-8111-111111111111?returnTo=%2Fgrammar%3Fq%3Dverb"', + ); + expect(html).toContain('href="/grammar?q=verb&page=2"'); + expect(html).not.toContain(">→"); + expect(html).toContain("active:scale"); }); it("normalizes an invalid URL before rendering valid links", async () => { diff --git a/src/_tests/views/grammar-library/libraryQuery.test.ts b/src/_tests/views/grammar-library/libraryQuery.test.ts index 8d7e46d..01e2923 100644 --- a/src/_tests/views/grammar-library/libraryQuery.test.ts +++ b/src/_tests/views/grammar-library/libraryQuery.test.ts @@ -20,4 +20,10 @@ describe("grammar library URL", () => { page: 2, query: "verb", })); + + it("keeps the search term in page links and starts a new search on page one", () => { + const query = parseGrammarLibraryQuery({ q: " verb phrase ", page: "2" }); + expect(grammarLibraryHref(query)).toBe("/grammar?q=verb+phrase&page=2"); + expect(grammarLibraryHref({ ...query, page: 1 })).toBe("/grammar?q=verb+phrase"); + }); }); diff --git a/src/app/(protected)/grammar/(list)/page.tsx b/src/app/(protected)/grammar/(list)/page.tsx index 8a50782..5a49d5c 100644 --- a/src/app/(protected)/grammar/(list)/page.tsx +++ b/src/app/(protected)/grammar/(list)/page.tsx @@ -1,4 +1,6 @@ import { Suspense } from "react"; +import Link from "next/link"; +import Form from "next/form"; import { redirect } from "next/navigation"; import { GrammarLibrarySkeleton, @@ -6,6 +8,7 @@ import { grammarLibraryHref, } from "@/views/grammar-library"; import { GrammarLibraryContent } from "@/views/grammar-library/ui/GrammarLibraryContent"; +import { BackNavigation } from "@/shared/components/ui/back-navigation/BackNavigation"; interface Props { searchParams: Promise<{ page?: string | string[]; q?: string | string[] }>; @@ -21,10 +24,50 @@ export default async function GrammarLibraryPage({ searchParams }: Props) { ) redirect(grammarLibraryHref(query)); - // 검색어/페이지 변경도 새 데이터가 준비될 때까지 해당 목록의 스켈레톤을 보여준다. return ( - }> - - +
+ +
+
+

GRAMMAR PRACTICE

+

어법 노트

+

배운 어법을 문장으로 기억하세요.

+
+ + 새 노트 작성 → + +
+
+ + + +
+ + +
+ } + > + + + ); } diff --git a/src/features/login/server.ts b/src/features/login/server.ts index 4a69aa8..a274612 100644 --- a/src/features/login/server.ts +++ b/src/features/login/server.ts @@ -1,3 +1,3 @@ import "server-only"; -export { requireUser } from "./services/requireUser"; +export { requireUser, requireUserOrRedirect } from "./services/requireUser"; diff --git a/src/features/login/services/requireUser.ts b/src/features/login/services/requireUser.ts index 78a8a82..0f97926 100644 --- a/src/features/login/services/requireUser.ts +++ b/src/features/login/services/requireUser.ts @@ -1,5 +1,5 @@ import { getAuthenticatedUser } from "@/shared/lib/supabase/getAuthenticatedUser"; -import { notFound } from "next/navigation"; +import { notFound, redirect } from "next/navigation"; // shared import type { createSupabaseServerClient } from "@/shared/lib/supabase/server"; @@ -18,3 +18,13 @@ export const requireUser = async ( return { id: user.id as UserId }; }; + +export const requireUserOrRedirect = async ( + supabase: Awaited>, +) => { + const user = await getAuthenticatedUser(supabase); + + if (!user) redirect("/login"); + + return { id: user.id as UserId }; +}; diff --git a/src/views/grammar-library/services/server/getGrammarLibraryPage.ts b/src/views/grammar-library/services/server/getGrammarLibraryPage.ts new file mode 100644 index 0000000..52d9b56 --- /dev/null +++ b/src/views/grammar-library/services/server/getGrammarLibraryPage.ts @@ -0,0 +1,20 @@ +import "server-only"; + +import { GrammarNoteRepository } from "@/entities/grammar-note"; +import { requireUserOrRedirect } from "@/features/login/server"; +import { observeOperation } from "@/shared/lib/logging/observeOperation"; +import { recordOperationEvent } from "@/shared/lib/logging/pino"; +import { createSupabaseServerClient } from "@/shared/lib/supabase/server"; +import type { GrammarLibraryQuery } from "../../models/interface"; + +export async function getGrammarLibraryPage(query: GrammarLibraryQuery) { + const supabase = await createSupabaseServerClient(); + await requireUserOrRedirect(supabase); + + return observeOperation({ + operation: "grammar.list", + resourceId: "grammar-library", + recordEvent: recordOperationEvent, + execute: () => new GrammarNoteRepository(supabase).findMany({ ...query, pageSize: 10 }), + }).catch(() => null); +} diff --git a/src/views/grammar-library/ui/GrammarLibraryContent.tsx b/src/views/grammar-library/ui/GrammarLibraryContent.tsx index c3ffa4a..b560cd3 100644 --- a/src/views/grammar-library/ui/GrammarLibraryContent.tsx +++ b/src/views/grammar-library/ui/GrammarLibraryContent.tsx @@ -1,31 +1,27 @@ import { redirect } from "next/navigation"; -import { GrammarNoteRepository } from "@/entities/grammar-note"; -import { createSupabaseServerClient } from "@/shared/lib/supabase/server"; -import { observeOperation } from "@/shared/lib/logging/observeOperation"; -import { recordOperationEvent } from "@/shared/lib/logging/pino"; import type { GrammarLibraryQuery } from "../models/interface"; import { grammarLibraryHref } from "../services/libraryQuery"; -import { GrammarLibraryView } from "./GrammarLibraryView"; +import { getGrammarLibraryPage } from "../services/server/getGrammarLibraryPage"; +import { GrammarNoteList } from "./GrammarNoteList"; export async function GrammarLibraryContent({ query }: { query: GrammarLibraryQuery }) { - const supabase = await createSupabaseServerClient(); - const { - data: { user }, - error, - } = await supabase.auth.getUser(); + const notePage = await getGrammarLibraryPage(query); - if (error || !user) redirect("/login"); - - const data = await observeOperation({ - operation: "grammar.list", - resourceId: "grammar-library", - recordEvent: recordOperationEvent, - - execute: () => new GrammarNoteRepository(supabase).findMany({ ...query, pageSize: 20 }), - }); - const page = Math.min(query.page, Math.max(1, Math.ceil(data.total / data.pageSize))); + if (!notePage) { + return ( +
+

+ 어법 노트를 불러오지 못했습니다. 잠시 후 다시 시도해주세요. +

+ + 다시 불러오기 + +
+ ); + } + const page = Math.min(query.page, Math.max(1, Math.ceil(notePage.total / notePage.pageSize))); if (page !== query.page) redirect(grammarLibraryHref({ ...query, page })); - return ; + return ; } diff --git a/src/views/grammar-library/ui/GrammarNoteList.tsx b/src/views/grammar-library/ui/GrammarNoteList.tsx index de247cd..6bf59f4 100644 --- a/src/views/grammar-library/ui/GrammarNoteList.tsx +++ b/src/views/grammar-library/ui/GrammarNoteList.tsx @@ -8,7 +8,7 @@ export function GrammarNoteList({ data, query }: GrammarNoteListProps) { const pages = Math.max(1, Math.ceil(data.total / data.pageSize)); return ( -
+

{data.total}개의 어법 노트

{data.items.length === 0 ? (
@@ -27,17 +27,9 @@ export function GrammarNoteList({ data, query }: GrammarNoteListProps) {
  • -
    -

    {note.title}

    - - → - -
    +

    {note.title}

    {note.sentence}

    {note.tags.map((tag) => (