diff options
Diffstat (limited to 'src/server/routes')
| -rw-r--r-- | src/server/routes/cards.test.ts | 2 | ||||
| -rw-r--r-- | src/server/routes/decks.test.ts | 2 | ||||
| -rw-r--r-- | src/server/routes/decks.ts | 43 | ||||
| -rw-r--r-- | src/server/routes/study.test.ts | 2 |
4 files changed, 39 insertions, 10 deletions
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(), }; } |
