demostf/api
1
0
Fork 0
mirror of https://codeberg.org/demostf/api.git synced 2026-06-03 18:04:08 +02:00
Code Issues Releases Wiki Activity

fix search with players in them

Browse source
This commit is contained in:
Robin Appelman 2020-04-20 18:39:12 +02:00
commit bd61d4fd8d
1 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/Providers/DemoListProvider.php
View file

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Demostf\API\Providers; namespace Demostf\API\Providers;
use Doctrine\DBAL\Query\QueryBuilder;
use function count; use function count;
use Demostf\API\Demo\Demo; use Demostf\API\Demo\Demo;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
@ -30,6 +31,7 @@ class DemoListProvider extends BaseProvider {
$query->select('p.demo_id') $query->select('p.demo_id')
->from('players', 'p') ->from('players', 'p')
->where($query->expr()->in('user_id', $query->createNamedParameter($userIds, Connection::PARAM_INT_ARRAY))) ->where($query->expr()->in('user_id', $query->createNamedParameter($userIds, Connection::PARAM_INT_ARRAY)))
->innerJoin('p', 'demos', 'd', $query->expr()->eq('demo_id', 'd.id'))
->groupBy('demo_id') ->groupBy('demo_id')
->having($query->expr()->eq( ->having($query->expr()->eq(
'COUNT(user_id)', 'COUNT(user_id)',
@ -39,16 +41,38 @@ class DemoListProvider extends BaseProvider {
->setMaxResults(50) ->setMaxResults(50)
->setFirstResult(((int) $page - 1) * 50); ->setFirstResult(((int) $page - 1) * 50);
$this->addWhere($query, $where);
$result = $query->execute(); $result = $query->execute();
$demoIds = $result->fetchAll(PDO::FETCH_COLUMN); $demoIds = $result->fetchAll(PDO::FETCH_COLUMN);
$demos = $this->db->demo()->where('id', $demoIds) $demos = $this->db->demo()->where('id', $demoIds)
->where($where)
->orderBy('id', 'DESC'); ->orderBy('id', 'DESC');
return $this->formatList($demos->fetchAll()); return $this->formatList($demos->fetchAll());
} }
private function addWhere(QueryBuilder $query, array $where = []) {
if (isset($where['map'])) {
$query->andWhere($query->expr()->orX(
$query->expr()->eq('clean_map_name(map)', $query->createNamedParameter($where['map'])),
$query->expr()->eq('map', $query->createNamedParameter($where['map']))
));
}
if (isset($where['playerCount'])) {
$query->andWhere($query->expr()->in('"playerCount"',
$query->createNamedParameter($where['playerCount'], Connection::PARAM_INT_ARRAY)));
}
if (isset($where['uploader'])) {
$query->andWhere($query->expr()->in('uploader',
$query->createNamedParameter($where['uploader'], PDO::PARAM_INT)));
}
if (isset($where['backend'])) {
$query->andWhere($query->expr()->eq('backend',
$query->createNamedParameter($where['backend'])));
}
}
/** /**
* @param int $page * @param int $page
* @param array $where * @param array $where
@ -68,24 +92,9 @@ class DemoListProvider extends BaseProvider {
->from('demos', 'd') ->from('demos', 'd')
->leftJoin('d', 'upload_blacklist', 'b', $query->expr()->eq('uploader_id', 'uploader')) ->leftJoin('d', 'upload_blacklist', 'b', $query->expr()->eq('uploader_id', 'uploader'))
->where($query->expr()->isNull('b.id')); ->where($query->expr()->isNull('b.id'));
if (isset($where['map'])) {
$query->andWhere($query->expr()->orX( $this->addWhere($query, $where);
$query->expr()->eq('clean_map_name(map)', $query->createNamedParameter($where['map'])),
$query->expr()->eq('map', $query->createNamedParameter($where['map']))
));
}
if (isset($where['playerCount'])) {
$query->andWhere($query->expr()->in('"playerCount"',
$query->createNamedParameter($where['playerCount'], Connection::PARAM_INT_ARRAY)));
}
if (isset($where['uploader'])) {
$query->andWhere($query->expr()->in('uploader',
$query->createNamedParameter($where['uploader'], PDO::PARAM_INT)));
}
if (isset($where['backend'])) {
$query->andWhere($query->expr()->eq('backend',
$query->createNamedParameter($where['backend'])));
}
$query->orderBy('d.id', $order) $query->orderBy('d.id', $order)
->setMaxResults(50) ->setMaxResults(50)
->setFirstResult($offset); ->setFirstResult($offset);