diff options
Diffstat (limited to 'src/server/routes')
| -rw-r--r-- | src/server/routes/cards.test.ts | 1 | ||||
| -rw-r--r-- | src/server/routes/decks.test.ts | 1 | ||||
| -rw-r--r-- | src/server/routes/decks.ts | 14 | ||||
| -rw-r--r-- | src/server/routes/study.test.ts | 1 |
4 files changed, 13 insertions, 4 deletions
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(), |
