From f7d0c418709532af198664d4c2b22f14abdb3c23 Mon Sep 17 00:00:00 2001 From: andres Date: Tue, 12 Mar 2024 19:08:15 +0100 Subject: [PATCH] wip --- src/modules/cards/infrastructure/cards.repository.ts | 4 ++-- src/modules/decks/infrastructure/decks.repository.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/cards/infrastructure/cards.repository.ts b/src/modules/cards/infrastructure/cards.repository.ts index a88ad15..a5e3778 100644 --- a/src/modules/cards/infrastructure/cards.repository.ts +++ b/src/modules/cards/infrastructure/cards.repository.ts @@ -98,8 +98,8 @@ export class CardsRepository { const sqlQuery = ` SELECT c.*, g.grade as "userGrade" - FROM card AS c - LEFT JOIN grade AS g ON c.id = g."cardId" AND g."userId" = $1 + FROM flashcards.card AS c + LEFT JOIN flashcards.grade AS g ON c.id = g."cardId" AND g."userId" = $1 WHERE c."deckId" = $2 AND (${whereClause}) ORDER BY g."grade" ${direction === 'asc' ? 'ASC NULLS FIRST' : 'DESC NULLS LAST'} LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2} diff --git a/src/modules/decks/infrastructure/decks.repository.ts b/src/modules/decks/infrastructure/decks.repository.ts index e7927a8..f162167 100644 --- a/src/modules/decks/infrastructure/decks.repository.ts +++ b/src/modules/decks/infrastructure/decks.repository.ts @@ -59,7 +59,7 @@ export class DecksRepository { async findMinMaxCards(): Promise<{ min: number; max: number }> { const result = await this.prisma - .$queryRaw`SELECT MAX(card_count) as "maxCardsCount", MIN(card_count) as "minCardsCount" FROM (SELECT deck.id, COUNT(card.id) as card_count FROM deck LEFT JOIN card ON deck.id = card."deckId" GROUP BY deck.id) AS card_counts;` + .$queryRaw`SELECT MAX(card_count) as "maxCardsCount", MIN(card_count) as "minCardsCount" FROM (SELECT deck.id, COUNT(card.id) as card_count FROM flashcards.deck LEFT JOIN "flashcards"."card" ON deck.id = card."deckId" GROUP BY deck.id) AS card_counts;` return { max: Number(result[0].maxCardsCount), @@ -129,9 +129,9 @@ SELECT COUNT(c.id) AS "cardsCount", a."id" AS "authorId", a."name" AS "authorName" -FROM deck AS "d" -LEFT JOIN "card" AS c ON d."id" = c."deckId" -LEFT JOIN "user" AS a ON d."userId" = a.id +FROM flashcards.deck AS "d" +LEFT JOIN "flashcards"."card" AS c ON d."id" = c."deckId" +LEFT JOIN "flashcards"."user" AS a ON d."userId" = a.id ${ conditions.length ? `WHERE ${conditions.map((_, index) => `${_.replace('?', `$${index + 1}`)}`).join(' AND ')}` @@ -177,8 +177,8 @@ LIMIT $${conditions.length + havingConditions.length + 1} OFFSET $${ SELECT COUNT(*) AS total FROM ( SELECT d.id - FROM deck AS d - LEFT JOIN card AS c ON d.id = c."deckId" + FROM flashcards.deck AS d + LEFT JOIN flashcards.card AS c ON d.id = c."deckId" ${ conditions.length ? `WHERE ${conditions