From cea7703ac440c38636ce2abd5baab35a23d05843 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 15 Feb 2026 16:45:35 +0900 Subject: feat(deck): display new card count on deck detail page Add newCardCount alongside Total and Due stats in the deck detail view, queried from cards with state=New via a new countNewCards repository method. Co-Authored-By: Claude Opus 4.6 --- src/client/atoms/decks.ts | 1 + src/client/pages/DeckCardsPage.test.tsx | 1 + src/client/pages/DeckDetailPage.test.tsx | 1 + src/client/pages/DeckDetailPage.tsx | 14 ++++++++++++-- src/client/pages/HomePage.test.tsx | 4 ++++ src/server/repositories/card.test.ts | 1 + src/server/repositories/card.ts | 14 ++++++++++++++ src/server/repositories/types.ts | 1 + src/server/routes/cards.test.ts | 1 + src/server/routes/decks.test.ts | 1 + src/server/routes/decks.ts | 14 ++++++++++---- src/server/routes/study.test.ts | 1 + 12 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/client/atoms/decks.ts b/src/client/atoms/decks.ts index 5a4d44e..a0e569f 100644 --- a/src/client/atoms/decks.ts +++ b/src/client/atoms/decks.ts @@ -7,6 +7,7 @@ export interface Deck { name: string; description: string | null; dueCardCount: number; + newCardCount: number; createdAt: string; updatedAt: string; } diff --git a/src/client/pages/DeckCardsPage.test.tsx b/src/client/pages/DeckCardsPage.test.tsx index 7c3c184..91b0b28 100644 --- a/src/client/pages/DeckCardsPage.test.tsx +++ b/src/client/pages/DeckCardsPage.test.tsx @@ -73,6 +73,7 @@ const mockDeck = { name: "Japanese Vocabulary", description: "Common Japanese words", dueCardCount: 0, + newCardCount: 0, createdAt: "2024-01-01T00:00:00Z", updatedAt: "2024-01-01T00:00:00Z", }; diff --git a/src/client/pages/DeckDetailPage.test.tsx b/src/client/pages/DeckDetailPage.test.tsx index 9dcb152..0b9216b 100644 --- a/src/client/pages/DeckDetailPage.test.tsx +++ b/src/client/pages/DeckDetailPage.test.tsx @@ -60,6 +60,7 @@ const mockDeck = { name: "Japanese Vocabulary", description: "Common Japanese words", dueCardCount: 0, + newCardCount: 0, createdAt: "2024-01-01T00:00:00Z", updatedAt: "2024-01-01T00:00:00Z", }; diff --git a/src/client/pages/DeckDetailPage.tsx b/src/client/pages/DeckDetailPage.tsx index bb8d42a..0a02051 100644 --- a/src/client/pages/DeckDetailPage.tsx +++ b/src/client/pages/DeckDetailPage.tsx @@ -33,11 +33,17 @@ function DeckStats({ deckId }: { deckId: string }) { return (
-
+

Total

{cards.length}

+
+

New

+

+ {deck.newCardCount} +

+

Due

@@ -77,7 +83,11 @@ function DeckContent({ -

+
+
+
+
+
diff --git a/src/client/pages/HomePage.test.tsx b/src/client/pages/HomePage.test.tsx index 179c649..3d15777 100644 --- a/src/client/pages/HomePage.test.tsx +++ b/src/client/pages/HomePage.test.tsx @@ -93,6 +93,7 @@ const mockDecks = [ name: "Japanese Vocabulary", description: "Common Japanese words", dueCardCount: 5, + newCardCount: 0, createdAt: "2024-01-01T00:00:00Z", updatedAt: "2024-01-01T00:00:00Z", }, @@ -101,6 +102,7 @@ const mockDecks = [ name: "Spanish Verbs", description: null, dueCardCount: 0, + newCardCount: 0, createdAt: "2024-01-02T00:00:00Z", updatedAt: "2024-01-02T00:00:00Z", }, @@ -253,6 +255,7 @@ describe("HomePage", () => { name: "No Description Deck", description: null, dueCardCount: 0, + newCardCount: 0, createdAt: "2024-01-01T00:00:00Z", updatedAt: "2024-01-01T00:00:00Z", }; @@ -332,6 +335,7 @@ describe("HomePage", () => { name: "New Deck", description: "A new deck", dueCardCount: 0, + newCardCount: 0, createdAt: "2024-01-03T00:00:00Z", updatedAt: "2024-01-03T00:00:00Z", }; diff --git a/src/server/repositories/card.test.ts b/src/server/repositories/card.test.ts index b492fd7..b959709 100644 --- a/src/server/repositories/card.test.ts +++ b/src/server/repositories/card.test.ts @@ -112,6 +112,7 @@ function createMockCardRepo(): CardRepository { softDeleteByNoteId: vi.fn(), findDueCards: vi.fn(), countDueCards: vi.fn(), + countNewCards: vi.fn(), findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), diff --git a/src/server/repositories/card.ts b/src/server/repositories/card.ts index 0f1ef79..223050a 100644 --- a/src/server/repositories/card.ts +++ b/src/server/repositories/card.ts @@ -216,6 +216,20 @@ export const cardRepository: CardRepository = { return result[0]?.count ?? 0; }, + async countNewCards(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.New), + ), + ); + 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 71cb811..b70b247 100644 --- a/src/server/repositories/types.ts +++ b/src/server/repositories/types.ts @@ -145,6 +145,7 @@ export interface CardRepository { softDeleteByNoteId(noteId: string): Promise; findDueCards(deckId: string, now: Date): Promise; countDueCards(deckId: string, now: Date): Promise; + countNewCards(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 a063c95..cd0493c 100644 --- a/src/server/routes/cards.test.ts +++ b/src/server/routes/cards.test.ts @@ -26,6 +26,7 @@ function createMockCardRepo(): CardRepository { softDeleteByNoteId: vi.fn(), findDueCards: vi.fn(), countDueCards: vi.fn(), + countNewCards: vi.fn(), findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), diff --git a/src/server/routes/decks.test.ts b/src/server/routes/decks.test.ts index f686024..a1412d2 100644 --- a/src/server/routes/decks.test.ts +++ b/src/server/routes/decks.test.ts @@ -31,6 +31,7 @@ function createMockCardRepo(): CardRepository { softDeleteByNoteId: vi.fn(), findDueCards: vi.fn(), countDueCards: vi.fn().mockResolvedValue(0), + countNewCards: 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 ed7077e..dcf758a 100644 --- a/src/server/routes/decks.ts +++ b/src/server/routes/decks.ts @@ -30,8 +30,11 @@ export function createDecksRouter(deps: DeckDependencies) { const now = new Date(); const decksWithDueCount = await Promise.all( decks.map(async (deck) => { - const dueCardCount = await cardRepo.countDueCards(deck.id, now); - return { ...deck, dueCardCount }; + const [dueCardCount, newCardCount] = await Promise.all([ + cardRepo.countDueCards(deck.id, now), + cardRepo.countNewCards(deck.id), + ]); + return { ...deck, dueCardCount, newCardCount }; }), ); return c.json({ decks: decksWithDueCount }, 200); @@ -58,9 +61,12 @@ export function createDecksRouter(deps: DeckDependencies) { } const now = new Date(); - const dueCardCount = await cardRepo.countDueCards(deck.id, now); + const [dueCardCount, newCardCount] = await Promise.all([ + cardRepo.countDueCards(deck.id, now), + cardRepo.countNewCards(deck.id), + ]); - return c.json({ deck: { ...deck, dueCardCount } }, 200); + return c.json({ deck: { ...deck, dueCardCount, newCardCount } }, 200); }) .put( "/:id", diff --git a/src/server/routes/study.test.ts b/src/server/routes/study.test.ts index 119b25d..84bf3a7 100644 --- a/src/server/routes/study.test.ts +++ b/src/server/routes/study.test.ts @@ -26,6 +26,7 @@ function createMockCardRepo(): CardRepository { softDeleteByNoteId: vi.fn(), findDueCards: vi.fn(), countDueCards: vi.fn(), + countNewCards: vi.fn(), findDueCardsWithNoteData: vi.fn(), findDueCardsForStudy: vi.fn(), updateFSRSFields: vi.fn(), -- cgit v1.3-1-g0d28