From 84be23571d0e52f28abe52371939ce551e998760 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 15 Feb 2026 17:36:13 +0900 Subject: feat(deck): add progress bar showing review/total ratio on deck list Add totalCardCount and reviewCardCount to deck API responses and display a progress bar on the home page for each deck with cards. Co-Authored-By: Claude Opus 4.6 --- src/server/repositories/card.test.ts | 2 ++ src/server/repositories/card.ts | 22 ++++++++++++++++++ src/server/repositories/types.ts | 2 ++ src/server/routes/cards.test.ts | 2 ++ src/server/routes/decks.test.ts | 2 ++ src/server/routes/decks.ts | 43 +++++++++++++++++++++++++++--------- src/server/routes/study.test.ts | 2 ++ 7 files changed, 65 insertions(+), 10 deletions(-) (limited to 'src/server') diff --git a/src/server/repositories/card.test.ts b/src/server/repositories/card.test.ts index b959709..8630e19 100644 --- a/src/server/repositories/card.test.ts +++ b/src/server/repositories/card.test.ts @@ -116,6 +116,8 @@ function createMockCardRepo(): CardRepository { findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), + countTotalCards: vi.fn(), + countReviewStateCards: vi.fn(), }; } diff --git a/src/server/repositories/card.ts b/src/server/repositories/card.ts index 223050a..a2b0972 100644 --- a/src/server/repositories/card.ts +++ b/src/server/repositories/card.ts @@ -230,6 +230,28 @@ export const cardRepository: CardRepository = { return result[0]?.count ?? 0; }, + async countTotalCards(deckId: string): Promise { + const result = await db + .select({ count: sql`count(*)::int` }) + .from(cards) + .where(and(eq(cards.deckId, deckId), isNull(cards.deletedAt))); + return result[0]?.count ?? 0; + }, + + async countReviewStateCards(deckId: string): Promise { + const result = await db + .select({ count: sql`count(*)::int` }) + .from(cards) + .where( + and( + eq(cards.deckId, deckId), + isNull(cards.deletedAt), + eq(cards.state, CardState.Review), + ), + ); + return result[0]?.count ?? 0; + }, + async findDueCardsWithNoteData( deckId: string, now: Date, diff --git a/src/server/repositories/types.ts b/src/server/repositories/types.ts index b70b247..7e0819a 100644 --- a/src/server/repositories/types.ts +++ b/src/server/repositories/types.ts @@ -146,6 +146,8 @@ export interface CardRepository { findDueCards(deckId: string, now: Date): Promise; countDueCards(deckId: string, now: Date): Promise; countNewCards(deckId: string): Promise; + countTotalCards(deckId: string): Promise; + countReviewStateCards(deckId: string): Promise; findDueCardsWithNoteData( deckId: string, now: Date, diff --git a/src/server/routes/cards.test.ts b/src/server/routes/cards.test.ts index cd0493c..57df729 100644 --- a/src/server/routes/cards.test.ts +++ b/src/server/routes/cards.test.ts @@ -30,6 +30,8 @@ function createMockCardRepo(): CardRepository { findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), + countTotalCards: vi.fn(), + countReviewStateCards: vi.fn(), }; } diff --git a/src/server/routes/decks.test.ts b/src/server/routes/decks.test.ts index a1412d2..009c8a5 100644 --- a/src/server/routes/decks.test.ts +++ b/src/server/routes/decks.test.ts @@ -32,6 +32,8 @@ function createMockCardRepo(): CardRepository { findDueCards: vi.fn(), countDueCards: vi.fn().mockResolvedValue(0), countNewCards: vi.fn().mockResolvedValue(0), + countTotalCards: vi.fn().mockResolvedValue(0), + countReviewStateCards: vi.fn().mockResolvedValue(0), findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), diff --git a/src/server/routes/decks.ts b/src/server/routes/decks.ts index dcf758a..069b933 100644 --- a/src/server/routes/decks.ts +++ b/src/server/routes/decks.ts @@ -30,11 +30,20 @@ export function createDecksRouter(deps: DeckDependencies) { const now = new Date(); const decksWithDueCount = await Promise.all( decks.map(async (deck) => { - const [dueCardCount, newCardCount] = await Promise.all([ - cardRepo.countDueCards(deck.id, now), - cardRepo.countNewCards(deck.id), - ]); - return { ...deck, dueCardCount, newCardCount }; + const [dueCardCount, newCardCount, totalCardCount, reviewCardCount] = + await Promise.all([ + cardRepo.countDueCards(deck.id, now), + cardRepo.countNewCards(deck.id), + cardRepo.countTotalCards(deck.id), + cardRepo.countReviewStateCards(deck.id), + ]); + return { + ...deck, + dueCardCount, + newCardCount, + totalCardCount, + reviewCardCount, + }; }), ); return c.json({ decks: decksWithDueCount }, 200); @@ -61,12 +70,26 @@ export function createDecksRouter(deps: DeckDependencies) { } const now = new Date(); - const [dueCardCount, newCardCount] = await Promise.all([ - cardRepo.countDueCards(deck.id, now), - cardRepo.countNewCards(deck.id), - ]); + const [dueCardCount, newCardCount, totalCardCount, reviewCardCount] = + await Promise.all([ + cardRepo.countDueCards(deck.id, now), + cardRepo.countNewCards(deck.id), + cardRepo.countTotalCards(deck.id), + cardRepo.countReviewStateCards(deck.id), + ]); - return c.json({ deck: { ...deck, dueCardCount, newCardCount } }, 200); + return c.json( + { + deck: { + ...deck, + dueCardCount, + newCardCount, + totalCardCount, + reviewCardCount, + }, + }, + 200, + ); }) .put( "/:id", diff --git a/src/server/routes/study.test.ts b/src/server/routes/study.test.ts index 84bf3a7..0f2fbe7 100644 --- a/src/server/routes/study.test.ts +++ b/src/server/routes/study.test.ts @@ -30,6 +30,8 @@ function createMockCardRepo(): CardRepository { findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), + countTotalCards: vi.fn(), + countReviewStateCards: vi.fn(), }; } -- cgit v1.3-1-g0d28