fix learn endpoint

prisma/schema.prisma

@@ -125,9 +125,9 @@ model deck {
 
 model grade {
   id      String   @id @default(cuid())
-  deckId  String   @unique
+  deckId  String
   cardId  String   @unique
-  userId  String   @unique
+  userId  String
   grade   Int
   shots   Int
   created DateTime @default(now())

src/modules/auth/auth.controller.ts

@@ -159,7 +159,9 @@ export class AuthController {
     @Res({ passthrough: true }) res: ExpressResponse
   ): Promise<void> {
     if (!accessToken) throw new UnauthorizedException()
+
     await this.commandBus.execute(new LogoutCommand(accessToken))
+
     res.clearCookie('accessToken', { httpOnly: true, sameSite: 'none', secure: true })
 
     res.clearCookie('refreshToken', {

src/modules/auth/dto/save-grade.dto.ts

@@ -1,4 +1,11 @@
+import { IsNumber, IsString, Max, Min } from 'class-validator'
+
 export class SaveGradeDto {
+  @IsString()
   cardId: string
+
+  @IsNumber()
+  @Max(5)
+  @Min(1)
   grade: number
 }

src/modules/cards/entities/cards.entity.ts

@@ -9,6 +9,8 @@ export class Card {
   shots: number
   answerImg: string
   questionImg: string
+  questionVideo: string
+  answerVideo: string
   rating: number
   created: Date
   updated: Date
@@ -18,3 +20,11 @@ export class PaginatedCards {
   items: Card[]
   pagination: Pagination
 }
+
+export class PaginatedCardsWithGrade {
+  pagination: Pagination
+  items: CardWithGrade[]
+}
+export class CardWithGrade extends Card {
+  grades?: Array<{ grade: number }>
+}

src/modules/cards/infrastructure/cards.repository.ts

@@ -4,7 +4,7 @@ import { createPrismaOrderBy } from '../../../infrastructure/common/helpers/get-
 import { Pagination } from '../../../infrastructure/common/pagination/pagination.service'
 import { PrismaService } from '../../../prisma.service'
 import { CreateCardDto, GetAllCardsInDeckDto, UpdateCardDto } from '../dto'
-import { PaginatedCards } from '../entities/cards.entity'
+import { PaginatedCardsWithGrade } from '../entities/cards.entity'
 
 @Injectable()
 export class CardsRepository {
@@ -53,6 +53,7 @@ export class CardsRepository {
 
   async findCardsByDeckId(
     deckId: string,
+    userId: string,
     {
       answer = undefined,
       question = undefined,
@@ -60,7 +61,7 @@ export class CardsRepository {
       itemsPerPage,
       orderBy,
     }: GetAllCardsInDeckDto
-  ): Promise<PaginatedCards> {
+  ): Promise<PaginatedCardsWithGrade> {
     try {
       const where = {
         decks: {
@@ -78,6 +79,16 @@ export class CardsRepository {
         this.prisma.card.findMany({
           orderBy: createPrismaOrderBy(orderBy) || { updated: 'desc' },
           where,
+          include: {
+            grades: {
+              where: {
+                userId,
+              },
+              select: {
+                grade: true,
+              },
+            },
+          },
           skip: (currentPage - 1) * itemsPerPage,
           take: itemsPerPage,
         }),

src/modules/decks/infrastructure/grades.repository.ts

@@ -22,9 +22,7 @@ export class GradesRepository {
     try {
       return await this.prisma.grade.upsert({
         where: {
-          userId,
           cardId,
-          deckId,
         },
         update: {
           grade,

src/modules/decks/use-cases/get-all-cards-in-deck-use-case.ts

@@ -1,8 +1,9 @@
 import { ForbiddenException, NotFoundException } from '@nestjs/common'
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'
+import { omit } from 'remeda'
 
 import { GetAllCardsInDeckDto } from '../../cards/dto'
-import { PaginatedCards } from '../../cards/entities/cards.entity'
+import { PaginatedCards, PaginatedCardsWithGrade } from '../../cards/entities/cards.entity'
 import { CardsRepository } from '../../cards/infrastructure/cards.repository'
 import { DecksRepository } from '../infrastructure/decks.repository'
 
@@ -20,6 +21,24 @@ export class GetAllCardsInDeckHandler implements ICommandHandler<GetAllCardsInDe
     private readonly cardsRepository: CardsRepository,
     private readonly decksRepository: DecksRepository
   ) {}
+  private transformGrade(cards: PaginatedCardsWithGrade): PaginatedCards {
+    return {
+      ...cards,
+      items: cards.items.map(card => {
+        if (card.grades.length === 0) return omit({ ...card, grade: 0 }, ['grades'])
+
+        const grade = card.grades.reduce((acc, grade) => acc + grade.grade, 0) / card.grades.length
+
+        return omit(
+          {
+            ...card,
+            grade,
+          },
+          ['grades']
+        )
+      }),
+    }
+  }
 
   async execute(command: GetAllCardsInDeckCommand): Promise<PaginatedCards> {
     const deck = await this.decksRepository.findDeckById(command.deckId)
@@ -29,7 +48,12 @@ export class GetAllCardsInDeckHandler implements ICommandHandler<GetAllCardsInDe
     if (deck.userId !== command.userId && deck.isPrivate) {
       throw new ForbiddenException(`You can't get a private deck that you don't own`)
     }
+    const cards = await this.cardsRepository.findCardsByDeckId(
+      command.deckId,
+      command.userId,
+      command.params
+    )
 
-    return await this.cardsRepository.findCardsByDeckId(command.deckId, command.params)
+    return this.transformGrade(cards)
   }
 }

src/modules/decks/use-cases/get-random-card-in-deck-use-case.ts

@@ -56,6 +56,17 @@ export class GetRandomCardInDeckHandler implements ICommandHandler<GetRandomCard
     )
     const smartRandomCard = await this.getSmartRandomCard(cards)
 
-    return pick(smartRandomCard, ['id', 'question', 'answer', 'deckId'])
+    return pick(smartRandomCard, [
+      'id',
+      'question',
+      'answer',
+      'deckId',
+      'questionImg',
+      'answerImg',
+      'questionVideo',
+      'answerVideo',
+      'created',
+      'updated',
+    ])
   }
 }