OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-22 15:13:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed default/fallback tags with stats ordering

Browse Source
This commit is contained in:
Alejandro Celaya 2022-01-21 22:22:55 +01:00
parent 6b409b06cc
commit 1c9ce0ede0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/Core/src/Repository/TagRepository.php
View File

@ -43,6 +43,7 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
{ {
$orderBy = $filtering?->orderBy(); $orderBy = $filtering?->orderBy();
$orderField = $orderBy?->orderField(); $orderField = $orderBy?->orderField();
$orderDir = $orderBy?->orderDirection();
$orderMainQuery = contains(['shortUrlsCount', 'visitsCount'], $orderField); $orderMainQuery = contains(['shortUrlsCount', 'visitsCount'], $orderField);
$conn = $this->getEntityManager()->getConnection(); $conn = $this->getEntityManager()->getConnection();
@ -50,7 +51,7 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
$subQb->select('t.id', 't.name'); $subQb->select('t.id', 't.name');
if (! $orderMainQuery) { if (! $orderMainQuery) {
$subQb->orderBy('t.name', $orderBy?->orderDirection() ?? 'ASC') $subQb->orderBy('t.name', $orderDir ?? 'ASC')
->setMaxResults($filtering?->limit() ?? PHP_INT_MAX) ->setMaxResults($filtering?->limit() ?? PHP_INT_MAX)
->setFirstResult($filtering?->offset() ?? 0); ->setFirstResult($filtering?->offset() ?? 0);
} }
@ -81,8 +82,7 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
->leftJoin('t', 'short_urls_in_tags', 'st', $nativeQb->expr()->eq('t.id_0', 'st.tag_id')) ->leftJoin('t', 'short_urls_in_tags', 'st', $nativeQb->expr()->eq('t.id_0', 'st.tag_id'))
->leftJoin('st', 'short_urls', 's', $nativeQb->expr()->eq('s.id', 'st.short_url_id')) ->leftJoin('st', 'short_urls', 's', $nativeQb->expr()->eq('s.id', 'st.short_url_id'))
->leftJoin('st', 'visits', 'v', $nativeQb->expr()->eq('s.id', 'v.short_url_id')) ->leftJoin('st', 'visits', 'v', $nativeQb->expr()->eq('s.id', 'v.short_url_id'))
->groupBy('t.id_0', 't.name_1') ->groupBy('t.id_0', 't.name_1');
->orderBy('t.name_1', $orderBy?->orderDirection() ?? 'ASC'); // TODO Make field dynamic
// Apply API key role conditions to the native query too, as they will affect the amounts on the aggregates // Apply API key role conditions to the native query too, as they will affect the amounts on the aggregates
$apiKey?->mapRoles(fn (string $roleName, array $meta) => match ($roleName) { $apiKey?->mapRoles(fn (string $roleName, array $meta) => match ($roleName) {
@ -99,13 +99,15 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
$nativeQb $nativeQb
->orderBy( ->orderBy(
$orderField === 'shortUrlsCount' ? 'short_urls_count' : 'visits_count', $orderField === 'shortUrlsCount' ? 'short_urls_count' : 'visits_count',
$orderBy?->orderDirection() ?? 'ASC', $orderDir ?? 'ASC',
) )
->addOrderBy('t.name_1', 'ASC') // In case of same amount, order by tag too
->setMaxResults($filtering?->limit() ?? PHP_INT_MAX) ->setMaxResults($filtering?->limit() ?? PHP_INT_MAX)
->setFirstResult($filtering?->offset() ?? 0); ->setFirstResult($filtering?->offset() ?? 0);
} }
// Add ordering by tag name, as a fallback in case of same amount, or as default ordering
$nativeQb->addOrderBy('t.name_1', $orderMainQuery || $orderDir === null ? 'ASC' : $orderDir);
$rsm = new ResultSetMappingBuilder($this->getEntityManager()); $rsm = new ResultSetMappingBuilder($this->getEntityManager());
$rsm->addRootEntityFromClassMetadata(Tag::class, 't'); $rsm->addRootEntityFromClassMetadata(Tag::class, 't');
$rsm->addScalarResult('short_urls_count', 'shortUrlsCount'); $rsm->addScalarResult('short_urls_count', 'shortUrlsCount');