7 files changed, 29 insertions, 4 deletions
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<number> {
+		const result = await db
+			.select({ count: sql<number>`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<boolean>;
 	findDueCards(deckId: string, now: Date): Promise<Card[]>;
 	countDueCards(deckId: string, now: Date): Promise<number>;
+	countNewCards(deckId: string): Promise<number>;
 	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(),