Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/_storybook/views/PracticeHub.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { HomeView } from "@/views/home/ui/HomeView";
import {
MyPageContent,
MyPageMaterialRows,
MyPageHistoryRows,
MyPageStatistics,
} from "@/views/my-page/ui/MyPageContent";
import { RolePlayEditorClient } from "@/views/role-play/ui/editor/RolePlayEditorClient";
import { MemorizationEditorClient } from "@/views/memorization/ui/editor/MemorizationEditorClient";
Expand Down Expand Up @@ -171,7 +171,14 @@ function Walkthrough({
<MyPageContent
roleplay={<MyPageMaterialRows items={roleplay} />}
memorization={<MyPageMaterialRows items={memorization} />}
history={<MyPageHistoryRows sessions={sessions} />}
statistics={
<MyPageStatistics
Comment on lines +174 to +175

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update the stale my-page interaction stories

Replacing the history fixture with statistics makes the existing Flow and HistoryReturn play functions fail: lines 386–387 still expect the removed “최근 학습 기록” heading and no sidebar, while line 486 still queries the removed “최근 학습 기록 전체 보기” link. Any Storybook interaction-test run that reaches these stories will fail, so update those assertions and navigation steps to match the new statistics/sidebar UI.

Useful? React with 👍 / 👎.

stats={{
total: 2,
weeks: [{ startsOn: "2026-10-12", roleplay: 1, memorization: 0, grammar: 1 }],
}}
/>
}
/>
);
else if (path === "/sessions")
Expand Down Expand Up @@ -376,8 +383,10 @@ export const Flow: Story = {
name: "마이페이지",
}),
);
await expect(c.getByRole("heading", { name: "최근 학습 기록" })).toBeVisible();
await expect(c.queryByRole("complementary")).not.toBeInTheDocument();
await expect(c.getByRole("heading", { name: "연습 통계" })).toBeVisible();
await expect(
within(c.getByRole("complementary")).getByRole("link", { name: "마이페이지" }),
).toHaveAttribute("aria-current", "page");
await userEvent.click(c.getByRole("link", { name: "Echo 홈" }));
await expect(c.getByRole("heading", { name: "오늘은 어떻게 연습할까요?" })).toBeVisible();
},
Expand Down Expand Up @@ -476,7 +485,9 @@ export const HistoryReturn: Story = {
render: () => <Walkthrough initialPath="/my-page" />,
play: async ({ canvasElement }) => {
const c = within(canvasElement);
await userEvent.click(c.getByRole("link", { name: "최근 학습 기록 전체 보기" }));
await userEvent.click(
within(c.getByRole("complementary")).getByRole("link", { name: "학습 기록" }),
);
await expect(c.getByRole("link", { name: "뒤로가기" })).toHaveAttribute("href", "/my-page");
await userEvent.click(c.getByRole("link", { name: "뒤로가기" }));
await expect(c.getByRole("heading", { name: "마이페이지" })).toBeVisible();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { describe, it, expect, jest, beforeAll } from "@jest/globals";
import type { GrammarPracticeLauncherProps } from "@/features/grammar-practice";
import { render, screen, fireEvent, waitFor } from "@testing-library/react";
import { GrammarPracticeLauncher } from "@/features/grammar-practice";

import { recallSession } from "@/_tests/features/grammar-recall/fixture";

jest.mock("next/cache", () => ({ revalidateTag: jest.fn() }));

let GrammarPracticeLauncher: typeof import("@/features/grammar-practice").GrammarPracticeLauncher;

describe("grammar practice launch", () => {
let sequence = 0;

beforeAll(() => {
beforeAll(async () => {
({ GrammarPracticeLauncher } = await import("@/features/grammar-practice"));
Object.defineProperty(crypto, "randomUUID", {
value: () => `00000000-0000-4000-8000-${String(++sequence).padStart(12, "0")}`,

Expand Down
49 changes: 49 additions & 0 deletions src/_tests/features/grammar-practice/grammarSessionActions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jest.mock("server-only", () => ({}));
jest.mock("@/shared/lib/supabase/server", () => ({ createSupabaseServerClient: jest.fn() }));

jest.mock("@/shared/lib/logging/pino", () => ({ recordOperationEvent: jest.fn() }));
jest.mock("next/cache", () => ({ revalidateTag: jest.fn() }));

let createSupabaseServerClient: typeof CreateClient;

Expand Down Expand Up @@ -40,3 +41,51 @@ describe("연습 액션 오류 계약", () => {
expect(await startGrammarSession({})).toEqual({ ok: false, code: "FAILED" });
});
});

describe("어법 연습 완료 후 통계 캐시", () => {
it("완료 성공일 때 현재 사용자 통계를 무효화한다", async () => {
const { completeGrammarSession } =
await import("@/features/grammar-practice/services/actions/grammarSessionActions");
const { revalidateTag } = await import("next/cache");
jest.mocked(createSupabaseServerClient).mockResolvedValue({
auth: { getUser: async () => ({ data: { user: { id: "owner" } }, error: null }) },
} as never);
const complete = jest
.spyOn(GrammarSessionRepository.prototype, "complete")
.mockResolvedValue({} as never);

expect(
(
await completeGrammarSession({
id: "00000000-0000-4000-8000-000000000001",
expectedVersion: 1,
})
).ok,
).toBe(true);
expect(revalidateTag).toHaveBeenCalledWith("my-page-practice-stats:owner", { expire: 0 });
complete.mockRestore();
});

it("완료 실패일 때 통계를 무효화하지 않는다", async () => {
const { completeGrammarSession } =
await import("@/features/grammar-practice/services/actions/grammarSessionActions");
const { revalidateTag } = await import("next/cache");
jest.mocked(createSupabaseServerClient).mockResolvedValue({
auth: { getUser: async () => ({ data: { user: { id: "owner" } }, error: null }) },
} as never);
const complete = jest
.spyOn(GrammarSessionRepository.prototype, "complete")
.mockRejectedValue(new Error("failed"));

expect(
(
await completeGrammarSession({
id: "00000000-0000-4000-8000-000000000001",
expectedVersion: 1,
})
).ok,
).toBe(false);
expect(revalidateTag).not.toHaveBeenCalled();
complete.mockRestore();
});
});
186 changes: 186 additions & 0 deletions src/_tests/views/my-page/MyPageStatistics.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
/** @jest-environment node */
import { describe, expect, it, jest } from "@jest/globals";
import { createElement } from "react";
import { renderToStaticMarkup } from "react-dom/server";

jest.mock("@/features/logout/ui/Profile", () => ({ Profile: () => null }));
jest.mock("server-only", () => ({}));
jest.mock("@/shared/lib/supabase/server", () => ({ createSupabaseServerClient: jest.fn() }));
jest.mock("@supabase/supabase-js", () => ({ createClient: jest.fn() }));
jest.mock("next/cache", () => ({
unstable_cache: jest.fn((read: () => unknown) => read),
}));

type Completion = {
kind: "roleplay" | "memorization" | "grammar";
completedAt: string;
};
type WeeklyCount = {
startsOn: string;
roleplay: number;
memorization: number;
grammar: number;
};

function summarize(completions: Completion[], now: Date) {
const stats = jest.requireActual<{
summarizePracticeStats: (
completions: Completion[],
now: Date,
) => { total: number; weeks: WeeklyCount[] };
}>("@/views/my-page/services/server/summarizePracticeStats");
return stats.summarizePracticeStats(completions, now);
}

const now = new Date("2026-10-12T03:00:00.000Z"); // 10월 12일 12:00 KST

describe("my-page practice statistics", () => {
it("counts only the most recent 30 Korean calendar days by week and practice type", () => {
const stats = summarize(
[
{ kind: "roleplay", completedAt: "2026-09-12T14:59:59.000Z" },
{ kind: "roleplay", completedAt: "2026-09-12T15:00:00.000Z" },
{ kind: "memorization", completedAt: "2026-09-13T15:00:00.000Z" },
{ kind: "grammar", completedAt: "2026-10-11T15:00:00.000Z" },
{ kind: "grammar", completedAt: "2026-10-12T03:00:00.000Z" },
{ kind: "grammar", completedAt: "2026-10-12T03:00:01.000Z" },
],
now,
);

expect(stats.total).toBe(4);
expect(stats.weeks.find((week) => week.startsOn === "2026-09-07")).toMatchObject({
roleplay: 1,
memorization: 0,
grammar: 0,
});
expect(stats.weeks.find((week) => week.startsOn === "2026-09-14")).toMatchObject({
roleplay: 0,
memorization: 1,
grammar: 0,
});
expect(stats.weeks.find((week) => week.startsOn === "2026-10-12")).toMatchObject({
roleplay: 0,
memorization: 0,
grammar: 2,
});
});

it("returns an explicit zero state for an owner without completed sessions", () => {
const stats = summarize([], now);
expect(stats.total).toBe(0);
expect(stats.weeks.length).toBeGreaterThan(0);
expect(
stats.weeks.every((week) => week.roleplay + week.memorization + week.grammar === 0),
).toBe(true);
});

it("빈 통계에는 연습 시작 링크를, 조회 실패에는 알림을 보여준다", async () => {
const { MyPageStatistics } = await import("@/views/my-page/ui/MyPageContent");
const empty = renderToStaticMarkup(
createElement(MyPageStatistics, { stats: summarize([], now) }),
);
const failed = renderToStaticMarkup(createElement(MyPageStatistics, { stats: null }));

expect(empty).toContain('href="/home"');
expect(empty).toContain("최근 30일 동안 완료한 연습이 없어요");
expect(failed).toContain('role="alert"');
expect(failed).toContain("통계를 불러오지 못했어요");
});

it("shows the sidebar and grammar entry on my-page without recent history", async () => {
const { EditorialShell } = await import("@/widgets/app-shell/ui/EditorialShell");
const { MyPageView } = await import("@/views/my-page/ui/MyPageView");
const shell = renderToStaticMarkup(
createElement(EditorialShell, {
pathname: "/my-page",
children: createElement("p", null, "본문"),
}),
);
const content = renderToStaticMarkup(createElement(MyPageView));

expect(shell).toContain("<aside");
expect(shell.split("</aside>")[0]).toMatch(/aria-current="page" href="\/my-page"/);
expect(shell).toContain('href="/grammar"');
expect(content).toContain('href="/grammar"');
expect(content).toContain("연습 통계");
expect(content).not.toContain("최근 학습 기록");
});
});

describe("my-page statistics lookup", () => {
async function setup(error: Error | null = null) {
const { createClient } = await import("@supabase/supabase-js");
const { createSupabaseServerClient } = await import("@/shared/lib/supabase/server");
const filters: { table: string; column: string; value: string }[] = [];
const tables: string[] = [];
const query = (table: string) => ({
select: () => query(table),
eq: (column: string, value: string) => {
filters.push({ table, column, value });
return query(table);
},
gte: () => query(table),
lte: () => query(table),
order: () => query(table),
range: async () => ({
data: error
? null
: [{ id: "record", completed_at: new Date(Date.now() - 1000).toISOString() }],
error,
}),
});
const client = {
from: (table: string) => {
tables.push(table);
return query(table);
},
};
jest.mocked(createClient).mockReturnValue(client as never);
jest.mocked(createSupabaseServerClient).mockResolvedValue({
auth: {
getUser: async () => ({ data: { user: { id: "owner" } }, error: null }),
getSession: async () => ({
data: { session: { user: { id: "owner" }, access_token: "owner-token" } },
error: null,
}),
},
} as unknown as Awaited<ReturnType<typeof createSupabaseServerClient>>);
process.env.NEXT_PUBLIC_SUPABASE_URL = "https://example.supabase.co";
process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY = "publishable-key";
return { filters, tables, createClient };
}

it("uses the same owner and bearer token for all three completed-session reads", async () => {
const { filters, tables, createClient } = await setup();
const { getPracticeStats } = await import("@/views/my-page/services/server/getPracticeStats");

await expect(getPracticeStats()).resolves.toMatchObject({ total: 3 });
expect(tables).toEqual(["roleplay_sessions", "memorization_sessions", "grammar_sessions"]);
expect(filters).toEqual(
expect.arrayContaining([
{ table: "roleplay_sessions", column: "user_id", value: "owner" },
{ table: "memorization_sessions", column: "user_id", value: "owner" },
{ table: "grammar_sessions", column: "owner_id", value: "owner" },
]),
);
const { unstable_cache } = await import("next/cache");
expect(unstable_cache).toHaveBeenCalledWith(
expect.any(Function),
expect.any(Array),
expect.objectContaining({ tags: ["my-page-practice-stats:owner"] }),
);
expect(createClient).toHaveBeenCalledWith(
"https://example.supabase.co",
"publishable-key",
expect.objectContaining({ global: { headers: { Authorization: "Bearer owner-token" } } }),
);
});

it("returns an error state when any completion read fails", async () => {
await setup(new Error("database unavailable"));
const { getPracticeStats } = await import("@/views/my-page/services/server/getPracticeStats");

await expect(getPracticeStats()).resolves.toBeNull();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { z } from "zod";
import { createSupabaseServerClient } from "@/shared/lib/supabase/server";
import { observeOperation } from "@/shared/lib/logging/observeOperation";
import { recordOperationEvent } from "@/shared/lib/logging/pino";
import { invalidatePracticeStats } from "@/shared/lib/query/practiceStatsCache";
import {
GrammarSessionRepository,
GrammarSessionError,
Expand All @@ -16,7 +17,7 @@ import type { GrammarSessionResult } from "../../models/interface";

async function executeSessionAction(
operation: string,
execute: (repository: GrammarSessionRepositoryPort) => Promise<GrammarSession>,
execute: (repository: GrammarSessionRepositoryPort, ownerId: string) => Promise<GrammarSession>,
): Promise<GrammarSessionResult> {
try {
return await observeOperation({
Expand All @@ -30,7 +31,10 @@ async function executeSessionAction(

if (error || !data.user) throw new GrammarSessionError("UNAUTHORIZED");

return { ok: true as const, data: await execute(new GrammarSessionRepository(supabase)) };
return {
ok: true as const,
data: await execute(new GrammarSessionRepository(supabase), data.user.id),
};
},
});
} catch (error) {
Expand Down Expand Up @@ -59,7 +63,9 @@ export async function saveGrammarSessionAnswers(input: unknown): Promise<Grammar
}

export async function completeGrammarSession(input: unknown): Promise<GrammarSessionResult> {
return executeSessionAction("grammar.session.complete", (repository) =>
repository.complete(completeGrammarSessionSchema.parse(input)),
);
return executeSessionAction("grammar.session.complete", async (repository, ownerId) => {
const session = await repository.complete(completeGrammarSessionSchema.parse(input));
invalidatePracticeStats(ownerId);
return session;
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/** @jest-environment node */
import { beforeEach, describe, expect, it, jest } from "@jest/globals";

jest.mock("server-only", () => ({}));
jest.mock("next/cache", () => ({ revalidateTag: jest.fn() }));

beforeEach(() => {
jest.clearAllMocks();
});

describe("롤플레잉 녹음 완료 후 통계 캐시", () => {
it("RPC 완료 성공일 때 현재 사용자 통계를 무효화한다", async () => {
const { completeRoleplayRecording } = await import("../completeRoleplayRecording");
const { revalidateTag } = await import("next/cache");
const response = await completeRoleplayRecording(
{ rpc: async () => ({ error: null }) } as never,
"owner",
"session",
);

expect(response.status).toBe(200);
expect(revalidateTag).toHaveBeenCalledWith("my-page-practice-stats:owner", { expire: 0 });
});

it("RPC 실패일 때 통계를 무효화하지 않는다", async () => {
const { completeRoleplayRecording } = await import("../completeRoleplayRecording");
const { revalidateTag } = await import("next/cache");
const response = await completeRoleplayRecording(
{ rpc: async () => ({ error: { code: "P0001", message: "failed" } }) } as never,
"owner",
"session",
);

expect(response.status).toBeGreaterThanOrEqual(400);
expect(revalidateTag).not.toHaveBeenCalled();
});
});
Loading
Loading