Skip to content

Filter deck by card reference #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toxicity1985 merged 1 commit into from
Jun 4, 2026
Merged

Filter deck by card reference #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Controller/PublicDeckController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public function __invoke(Request $request): JsonResponse
$itemsPerPage = min(1000, max(1, (int) $request->query->get('itemsPerPage', 30)));
$hero = $request->query->get('hero') ?: null;
$cardName = $request->query->get('cardName') ?: null;
$cardRef = $request->query->get('cardRef') ?: null;
$name = $request->query->get('name') ?: null;
$faction = $request->query->get('faction') ?: null;
$format = $request->query->get('format') ?: null;
Expand All @@ -45,8 +46,8 @@ public function __invoke(Request $request): JsonResponse
default => 'created_at',
};

$decks = $this->deckRepository->findPublic($page, $itemsPerPage, $hero, $cardName, $orderBy, $faction, $name, $format);
$total = $this->deckRepository->countPublic($hero, $cardName, $faction, $name, $format);
$decks = $this->deckRepository->findPublic($page, $itemsPerPage, $hero, $cardName, $orderBy, $faction, $name, $format, $cardRef);
$total = $this->deckRepository->countPublic($hero, $cardName, $faction, $name, $format, $cardRef);

/** @var array<int, array<string, mixed>> $data */
$data = $this->serializer->normalize($decks, 'json', ['groups' => ['deck:read']]) ?? [];
Expand Down
16 changes: 11 additions & 5 deletions src/Repository/DeckRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ public function findBatchWithCards(int $offset, int $limit): array
->getResult();
}

public function findPublic(int $page, int $itemsPerPage, ?string $hero = null, ?string $cardName = null, string $orderBy = 'created_at', ?string $faction = null, ?string $name = null, ?string $format = null): array
public function findPublic(int $page, int $itemsPerPage, ?string $hero = null, ?string $cardName = null, string $orderBy = 'created_at', ?string $faction = null, ?string $name = null, ?string $format = null, ?string $cardRef = null): array
{
$rsm = new ResultSetMappingBuilder($this->getEntityManager());
$rsm->addRootEntityFromClassMetadata(Deck::class, 'd');

[$join, $where, $params] = $this->buildPublicFilters($hero, $cardName, $faction, $name, $format);
[$join, $where, $params] = $this->buildPublicFilters($hero, $cardName, $faction, $name, $format, $cardRef);

$allowedOrderBy = ['created_at', 'upvote_count', 'view_count'];
$col = in_array($orderBy, $allowedOrderBy, true) ? $orderBy : 'created_at';
Expand All @@ -100,9 +100,9 @@ public function findPublic(int $page, int $itemsPerPage, ?string $hero = null, ?
return $query->getResult();
}

public function countPublic(?string $hero = null, ?string $cardName = null, ?string $faction = null, ?string $name = null, ?string $format = null): int
public function countPublic(?string $hero = null, ?string $cardName = null, ?string $faction = null, ?string $name = null, ?string $format = null, ?string $cardRef = null): int
{
[$join, $where, $params] = $this->buildPublicFilters($hero, $cardName, $faction, $name, $format);
[$join, $where, $params] = $this->buildPublicFilters($hero, $cardName, $faction, $name, $format, $cardRef);

return (int) $this->getEntityManager()->getConnection()->fetchOne(
"SELECT COUNT(DISTINCT d.id) FROM deck d {$join} WHERE {$where}",
Expand All @@ -113,7 +113,7 @@ public function countPublic(?string $hero = null, ?string $cardName = null, ?str
/**
* @return array{0: string, 1: string, 2: array<string, mixed>}
*/
private function buildPublicFilters(?string $hero, ?string $cardName, ?string $faction = null, ?string $name = null, ?string $format = null): array
private function buildPublicFilters(?string $hero, ?string $cardName, ?string $faction = null, ?string $name = null, ?string $format = null, ?string $cardRef = null): array
{
$where = 'd.is_public = true AND d.is_draft = false';
$join = '';
Expand All @@ -140,6 +140,12 @@ private function buildPublicFilters(?string $hero, ?string $cardName, ?string $f
$params['cardName'] = '%'.$cardName.'%';
}

if (null !== $cardRef) {
$join = 'JOIN deck_card dc ON dc.deck_id = d.id';
$where .= ' AND dc.cardReference = :cardRef';
$params['cardRef'] = $cardRef;
}

if (null !== $name) {
$where .= ' AND d.name LIKE :name';
$params['name'] = '%'.$name.'%';
Expand Down
Loading