diff --git a/src/_storybook/views/PracticeHub.stories.tsx b/src/_storybook/views/PracticeHub.stories.tsx index 50a9f6bb..aeb58a99 100644 --- a/src/_storybook/views/PracticeHub.stories.tsx +++ b/src/_storybook/views/PracticeHub.stories.tsx @@ -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"; @@ -171,7 +171,14 @@ function Walkthrough({ } memorization={} - history={} + statistics={ + + } /> ); else if (path === "/sessions") @@ -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(); }, @@ -476,7 +485,9 @@ export const HistoryReturn: Story = { render: () => , 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(); diff --git a/src/_tests/features/grammar-practice/GrammarPracticeLauncher.test.tsx b/src/_tests/features/grammar-practice/GrammarPracticeLauncher.test.tsx index 5d3b6624..7938ec7c 100644 --- a/src/_tests/features/grammar-practice/GrammarPracticeLauncher.test.tsx +++ b/src/_tests/features/grammar-practice/GrammarPracticeLauncher.test.tsx @@ -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")}`, diff --git a/src/_tests/features/grammar-practice/grammarSessionActions.test.ts b/src/_tests/features/grammar-practice/grammarSessionActions.test.ts index e0f0d58f..02b856ac 100644 --- a/src/_tests/features/grammar-practice/grammarSessionActions.test.ts +++ b/src/_tests/features/grammar-practice/grammarSessionActions.test.ts @@ -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; @@ -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(); + }); +}); diff --git a/src/_tests/views/my-page/MyPageStatistics.test.tsx b/src/_tests/views/my-page/MyPageStatistics.test.tsx new file mode 100644 index 00000000..8f0f831b --- /dev/null +++ b/src/_tests/views/my-page/MyPageStatistics.test.tsx @@ -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("")[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>); + 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(); + }); +}); diff --git a/src/features/grammar-practice/services/actions/grammarSessionActions.ts b/src/features/grammar-practice/services/actions/grammarSessionActions.ts index 5b19b3bb..b6c45fa5 100644 --- a/src/features/grammar-practice/services/actions/grammarSessionActions.ts +++ b/src/features/grammar-practice/services/actions/grammarSessionActions.ts @@ -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, @@ -16,7 +17,7 @@ import type { GrammarSessionResult } from "../../models/interface"; async function executeSessionAction( operation: string, - execute: (repository: GrammarSessionRepositoryPort) => Promise, + execute: (repository: GrammarSessionRepositoryPort, ownerId: string) => Promise, ): Promise { try { return await observeOperation({ @@ -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) { @@ -59,7 +63,9 @@ export async function saveGrammarSessionAnswers(input: unknown): Promise { - 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; + }); } diff --git a/src/features/recording-storage/services/server/__tests__/completeRoleplayRecording.test.ts b/src/features/recording-storage/services/server/__tests__/completeRoleplayRecording.test.ts new file mode 100644 index 00000000..068b4097 --- /dev/null +++ b/src/features/recording-storage/services/server/__tests__/completeRoleplayRecording.test.ts @@ -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(); + }); +}); diff --git a/src/features/recording-storage/services/server/completeRoleplayRecording.ts b/src/features/recording-storage/services/server/completeRoleplayRecording.ts index c680a569..b553f2a3 100644 --- a/src/features/recording-storage/services/server/completeRoleplayRecording.ts +++ b/src/features/recording-storage/services/server/completeRoleplayRecording.ts @@ -1,4 +1,5 @@ import "server-only"; +import { invalidatePracticeStats } from "@/shared/lib/query/practiceStatsCache"; import type { RoleplayRecordingContext } from "../../models/roleplayRecording"; import { recordingRpcFailureResponse } from "./recordingRpcFailure"; @@ -11,5 +12,7 @@ export async function completeRoleplayRecording( p_user_id: userId, p_session_id: sessionId, }); - return error ? recordingRpcFailureResponse(error) : Response.json({ completed: true }); + if (error) return recordingRpcFailureResponse(error); + invalidatePracticeStats(userId); + return Response.json({ completed: true }); } diff --git a/src/shared/lib/query/practiceStatsCache.ts b/src/shared/lib/query/practiceStatsCache.ts new file mode 100644 index 00000000..b7e9e88a --- /dev/null +++ b/src/shared/lib/query/practiceStatsCache.ts @@ -0,0 +1,13 @@ +import "server-only"; + +import { revalidateTag } from "next/cache"; + +export const practiceStatsTag = (ownerId: string) => `my-page-practice-stats:${ownerId}`; + +export function invalidatePracticeStats(ownerId: string) { + try { + revalidateTag(practiceStatsTag(ownerId), { expire: 0 }); + } catch (error) { + console.error("연습 통계 캐시 무효화 실패", error); + } +} diff --git a/src/views/my-page/models/errors.ts b/src/views/my-page/models/errors.ts new file mode 100644 index 00000000..5e691dc2 --- /dev/null +++ b/src/views/my-page/models/errors.ts @@ -0,0 +1,7 @@ +import { CustomError } from "@/shared/errors/CustomError"; + +export class PracticeStatsLoadError extends CustomError { + constructor(cause: unknown) { + super("STATS-001", "연습 통계를 불러오지 못했습니다.", { cause }); + } +} diff --git a/src/views/my-page/models/interface.ts b/src/views/my-page/models/interface.ts index 36d40ade..ff8997cc 100644 --- a/src/views/my-page/models/interface.ts +++ b/src/views/my-page/models/interface.ts @@ -1,5 +1,4 @@ import type { ReactNode } from "react"; -import type { GetLatestStudySession } from "@/widgets/latest-sessions/models/studySession"; export interface MyPageMaterialItem { id: string; @@ -10,10 +9,27 @@ export interface MyPageMaterialItem { } export type MaterialKind = "roleplay" | "memorization"; +export interface PracticeCompletion { + kind: MaterialKind | "grammar"; + completedAt: string; +} +export interface PracticeCompletionSource { + kind: PracticeCompletion["kind"]; + table: "roleplay_sessions" | "memorization_sessions" | "grammar_sessions"; +} +export interface PracticeStats { + total: number; + weeks: { + startsOn: string; + roleplay: number; + memorization: number; + grammar: number; + }[]; +} export interface MyPageContentProps { roleplay: ReactNode; memorization: ReactNode; - history: ReactNode; + statistics: ReactNode; } export interface MyPageSectionHeadingProps { id: string; @@ -23,6 +39,3 @@ export interface MyPageSectionHeadingProps { export interface MyPageMaterialRowsProps { items: readonly MyPageMaterialItem[]; } -export interface MyPageHistoryRowsProps { - sessions: readonly GetLatestStudySession[]; -} diff --git a/src/views/my-page/services/server/getPracticeStats.ts b/src/views/my-page/services/server/getPracticeStats.ts new file mode 100644 index 00000000..43a3210d --- /dev/null +++ b/src/views/my-page/services/server/getPracticeStats.ts @@ -0,0 +1,49 @@ +import "server-only"; + +import { createClient } from "@supabase/supabase-js"; +import { unstable_cache } from "next/cache"; +import { redirect } from "next/navigation"; +import { requireUserOrRedirect } from "@/features/login/server"; +import { createSupabaseServerClient } from "@/shared/lib/supabase/server"; +import type { Database } from "@/shared/lib/supabase/database.types"; +import { practiceStatsTag } from "@/shared/lib/query/practiceStatsCache"; +import type { PracticeStats } from "../../models/interface"; +import { loadPracticeCompletions } from "./loadPracticeCompletions"; +import { koreanDay, summarizePracticeStats } from "./summarizePracticeStats"; + +export async function getPracticeStats(): Promise { + const supabase = await createSupabaseServerClient(); + const owner = await requireUserOrRedirect(supabase); + const { + data: { session }, + error, + } = await supabase.auth.getSession(); + if (error || !session || session.user.id !== owner.id) redirect("/login"); + + const url = process.env.NEXT_PUBLIC_SUPABASE_URL; + const key = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY; + if (!url || !key) throw new Error("Supabase configuration is missing"); + + const now = new Date(); + const todayKst = koreanDay(now); + const from = `${koreanDay(new Date(now.getTime() - 29 * 24 * 60 * 60 * 1000))}T00:00:00+09:00`; + + const read = unstable_cache( + async () => { + const client = createClient(url, key, { + auth: { persistSession: false, autoRefreshToken: false }, + global: { headers: { Authorization: `Bearer ${session.access_token}` } }, + }); + return loadPracticeCompletions(client, owner.id, from, now.toISOString()); + }, + ["my-page-practice-stats", owner.id, todayKst], + { revalidate: 60, tags: [practiceStatsTag(owner.id)] }, + ); + + try { + return summarizePracticeStats(await read(), now); + } catch (error) { + console.error("연습 통계 조회 실패", error); + return null; + } +} diff --git a/src/views/my-page/services/server/loadPracticeCompletions.ts b/src/views/my-page/services/server/loadPracticeCompletions.ts new file mode 100644 index 00000000..8b47bb6e --- /dev/null +++ b/src/views/my-page/services/server/loadPracticeCompletions.ts @@ -0,0 +1,56 @@ +import "server-only"; + +import type { SupabaseClient } from "@supabase/supabase-js"; +import type { Database } from "@/shared/lib/supabase/database.types"; +import type { PracticeCompletion, PracticeCompletionSource } from "../../models/interface"; +import { PracticeStatsLoadError } from "../../models/errors"; + +const sources: readonly PracticeCompletionSource[] = [ + { kind: "roleplay", table: "roleplay_sessions" }, + { kind: "memorization", table: "memorization_sessions" }, + { kind: "grammar", table: "grammar_sessions" }, +]; + +function ownerQuery( + client: SupabaseClient, + source: PracticeCompletionSource, + ownerId: string, +) { + switch (source.table) { + case "roleplay_sessions": + return client.from("roleplay_sessions").select("id,completed_at").eq("user_id", ownerId); + case "memorization_sessions": + return client.from("memorization_sessions").select("id,completed_at").eq("user_id", ownerId); + case "grammar_sessions": + return client.from("grammar_sessions").select("id,completed_at").eq("owner_id", ownerId); + } +} + +export async function loadPracticeCompletions( + client: SupabaseClient, + ownerId: string, + from: string, + to: string, +): Promise { + const pages = await Promise.all( + sources.map(async (source) => { + const completions: PracticeCompletion[] = []; + for (let offset = 0; ; offset += 1000) { + const { data, error } = await ownerQuery(client, source, ownerId) + .eq("status", "completed") + .gte("completed_at", from) + .lte("completed_at", to) + .order("completed_at", { ascending: true }) + .order("id", { ascending: true }) + .range(offset, offset + 999); + if (error) throw new PracticeStatsLoadError(error); + for (const row of data ?? []) { + if (row.completed_at) + completions.push({ kind: source.kind, completedAt: row.completed_at }); + } + if (!data || data.length < 1000) return completions; + } + }), + ); + return pages.flat(); +} diff --git a/src/views/my-page/services/server/summarizePracticeStats.ts b/src/views/my-page/services/server/summarizePracticeStats.ts new file mode 100644 index 00000000..b4ed6d62 --- /dev/null +++ b/src/views/my-page/services/server/summarizePracticeStats.ts @@ -0,0 +1,54 @@ +import type { PracticeCompletion, PracticeStats } from "../../models/interface"; + +const dayMs = 24 * 60 * 60 * 1000; +const koreanDateFormatter = new Intl.DateTimeFormat("en-US", { + timeZone: "Asia/Seoul", + year: "numeric", + month: "2-digit", + day: "2-digit", +}); + +export function koreanDay(date: Date) { + const parts = Object.fromEntries( + koreanDateFormatter.formatToParts(date).map(({ type, value }) => [type, value]), + ); + return `${parts.year}-${parts.month}-${parts.day}`; +} + +function weekStart(day: string) { + const date = new Date(`${day}T00:00:00Z`); + date.setUTCDate(date.getUTCDate() - ((date.getUTCDay() + 6) % 7)); + return date.toISOString().slice(0, 10); +} + +export function summarizePracticeStats( + completions: PracticeCompletion[], + now: Date, +): PracticeStats { + const todayKst = koreanDay(now); + const start = koreanDay(new Date(now.getTime() - 29 * dayMs)); + const weeks = new Map(); + + for ( + let time = Date.parse(`${start}T00:00:00Z`); + time <= Date.parse(`${todayKst}T00:00:00Z`); + time += dayMs + ) { + const startsOn = weekStart(new Date(time).toISOString().slice(0, 10)); + if (!weeks.has(startsOn)) + weeks.set(startsOn, { startsOn, roleplay: 0, memorization: 0, grammar: 0 }); + } + + let total = 0; + for (const completion of completions) { + const timestamp = Date.parse(completion.completedAt); + if (!Number.isFinite(timestamp) || timestamp > now.getTime()) continue; + const day = koreanDay(new Date(timestamp)); + if (day < start || day > todayKst) continue; + const week = weeks.get(weekStart(day)); + if (!week) continue; + week[completion.kind] += 1; + total += 1; + } + return { total, weeks: [...weeks.values()] }; +} diff --git a/src/views/my-page/ui/MyPageContent.tsx b/src/views/my-page/ui/MyPageContent.tsx index 276e05d7..9d6d325d 100644 --- a/src/views/my-page/ui/MyPageContent.tsx +++ b/src/views/my-page/ui/MyPageContent.tsx @@ -1,19 +1,16 @@ import Link from "next/link"; -import { ArrowRight, ChevronRight } from "lucide-react"; +import { ArrowRight, ChartNoAxesCombined, ChevronRight, CircleAlert } from "lucide-react"; import type { MyPageContentProps, MyPageSectionHeadingProps, MyPageMaterialRowsProps, - MyPageHistoryRowsProps, + PracticeStats, } from "@/views/my-page/models/interface"; -const emptyClassName = - "flex min-h-41 items-center text-[14px] leading-[1.7] text-practice-subtle group-data-history:min-h-30"; -const historyRowClassName = - "group/history grid min-h-15 grid-cols-[16.5%_20%_1fr_178px_20px] items-center gap-0 border-b border-practice-line text-[16px] [&>svg]:text-practice-subtle max-md:grid-cols-[1fr_auto_18px] max-md:gap-x-2.5 max-md:gap-y-2 max-md:py-4 max-md:[&>svg]:col-start-3 max-md:[&>svg]:row-start-2"; +const emptyClassName = "flex min-h-41 items-center text-[14px] leading-[1.7] text-practice-subtle"; -export function MyPageContent({ roleplay, memorization, history }: MyPageContentProps) { +export function MyPageContent({ roleplay, memorization, statistics }: MyPageContentProps) { return (
@@ -31,14 +28,14 @@ export function MyPageContent({ roleplay, memorization, history }: MyPageContent 녹음 관리
-
-
+
+
{roleplay}
{memorization}
+
+ +

저장한 어법 노트를 살펴보고 연습을 시작해보세요.

+
-
- - {history} +
+

+ 연습 통계 +

+ {statistics}
); @@ -58,7 +67,7 @@ export function MyPageContent({ roleplay, memorization, history }: MyPageContent function SectionHeading({ id, title, href }: MyPageSectionHeadingProps) { return ( -
+

아직 학습 기록이 없어요. 첫 연습을 시작해보세요.

; +export function MyPageStatistics({ stats }: { stats: PracticeStats | null }) { + if (!stats) + return ( +
+ +
+

통계를 불러오지 못했어요

+

잠시 후 다시 시도해 주세요.

+
+
+ ); + if (stats.total === 0) + return ( +
+ +
+

+ 최근 30일 동안 완료한 연습이 없어요 +

+ + 연습 시작하기 + +
+
+ ); + return ( -
    - {sessions.map((session) => { - const content = ( - <> - -

    - {session.title} -

    - - {session.sessionType === "role-playing" ? "롤플레잉" : "문단 암기"} - - - {states[session.sessionState]} - - {session.href && !session.disabled && } - - ); - return ( -
  • - {session.href && !session.disabled ? ( - - {content} - - ) : ( -
    - {content} -
    - )} -
  • - ); - })} -
+
+

+ 최근 30일 완료 {stats.total}회 +

+
+ + + + + + + + + + + + {stats.weeks.map((week) => ( + + + + + + + ))} + +
최근 30일 주별 연습 완료 횟수
+ 시작 주 + + 롤플레잉 + + 문장 암기 + + 어법 연습 +
+ {week.startsOn} + {week.roleplay}{week.memorization}{week.grammar}
+
+
); } diff --git a/src/views/my-page/ui/MyPageView.tsx b/src/views/my-page/ui/MyPageView.tsx index 12ac01a5..30d50256 100644 --- a/src/views/my-page/ui/MyPageView.tsx +++ b/src/views/my-page/ui/MyPageView.tsx @@ -1,11 +1,11 @@ import type { MaterialKind } from "../models/interface"; import { Suspense } from "react"; import { getMyPageMaterials } from "@/views/my-page/services/server/getMyPageMaterials"; -import { getLatestStudySessions } from "@/widgets/latest-sessions/services/server/getLatestStudySessions"; +import { getPracticeStats } from "@/views/my-page/services/server/getPracticeStats"; import { MyPageContent, MyPageMaterialRows, - MyPageHistoryRows, + MyPageStatistics, MyPageRowsLoading, } from "./MyPageContent"; @@ -22,9 +22,9 @@ export function MyPageView() { } - history={ + statistics={ }> - + } /> @@ -33,6 +33,6 @@ export function MyPageView() { async function RecentMaterials({ type }: { type: MaterialKind }) { return ; } -async function RecentHistory() { - return ; +async function PracticeStatistics() { + return ; } diff --git a/src/widgets/app-shell/ui/EditorialShell.tsx b/src/widgets/app-shell/ui/EditorialShell.tsx index 942a4a07..f85ff963 100644 --- a/src/widgets/app-shell/ui/EditorialShell.tsx +++ b/src/widgets/app-shell/ui/EditorialShell.tsx @@ -11,10 +11,14 @@ import { PracticeMobileMenu } from "./PracticeMobileMenu"; export function EditorialShell({ children, initials, pathname }: EditorialShellProps) { const { inPractice, base, mode, page } = getShellRoute(pathname); + const isMyPage = pathname === "/my-page"; + const showSidebar = inPractice || isMyPage; + const navigationBase = isMyPage ? "/grammar" : base; + const navigationMode = isMyPage ? "어법 연습" : mode; return (
본문으로 이동 - {inPractice && ( + {showSidebar && ( )}
- {inPractice ? ( + {showSidebar ? ( <> - +
- {mode} + {navigationMode} / - {page} + {isMyPage ? "마이페이지" : page}
) : ( diff --git a/src/widgets/app-shell/ui/PracticeNavigation.tsx b/src/widgets/app-shell/ui/PracticeNavigation.tsx index 9f5b7c9c..478f991f 100644 --- a/src/widgets/app-shell/ui/PracticeNavigation.tsx +++ b/src/widgets/app-shell/ui/PracticeNavigation.tsx @@ -44,6 +44,7 @@ export function PracticeNavigation({ pathname, base, mode, onNavigate }: Practic key={href} href={href} className="relative flex min-h-11 items-center gap-2.75 px-3 text-[13px] text-practice-subtle hover:text-practice-ink aria-[current=page]:font-medium aria-[current=page]:text-practice-ink aria-[current=page]:after:absolute aria-[current=page]:after:right-1 aria-[current=page]:after:h-0.5 aria-[current=page]:after:w-4 aria-[current=page]:after:bg-practice-accent" + aria-current={pathname === href ? "page" : undefined} onClick={onNavigate} >