Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Use Aura.SqlQuery for building queries.

Browse Source 
Refactor AccountRepository and AccountSearchRepository to use Aura.SqlQuery. This will allow to mock queries when testing.

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2022-11-05 09:58:57 +01:00
parent 08ce35a837
commit 8a2bbc8283
31 changed files with 1926 additions and 1592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lib/SP/Infrastructure/Database/QueryData.php
View File

@@ -24,6 +24,11 @@
namespace SP\Infrastructure\Database;
use Aura\SqlQuery\Common\Select;
use Aura\SqlQuery\QueryInterface;
use SP\Core\Exceptions\QueryException;
use SP\Domain\Common\Out\SimpleModel;
/**
* Class QueryData
*
@@ -31,18 +36,27 @@ namespace SP\Infrastructure\Database;
*/
final class QueryData
{
protected array $params = [];
protected ?string $query = null;
protected ?string $mapClassName = null;
protected bool $useKeyPair = false;
protected ?string $select = null;
protected ?string $from = null;
protected ?string $where = null;
protected ?string $groupBy = null;
protected ?string $order = null;
protected ?string $limit = null;
protected ?string $queryCount = null;
protected ?string $onErrorMessage = null;
protected array $params = [];
protected QueryInterface $query;
protected ?string $mapClassName = SimpleModel::class;
protected bool $useKeyPair = false;
protected ?string $select = null;
protected ?string $from = null;
protected ?string $where = null;
protected ?string $groupBy = null;
protected ?string $order = null;
protected ?string $limit = null;
protected ?string $onErrorMessage = null;
public function __construct(QueryInterface $query)
{
$this->query = $query;
}
public static function build(QueryInterface $query): QueryData
{
return new self($query);
}
/**
* Añadir un parámetro a la consulta
@@ -69,28 +83,16 @@ final class QueryData
$this->params = $data;
}
public function getQuery(): string
public function getQuery(): QueryInterface
{
if (empty($this->query)) {
return $this->select.
' '.
$this->from.
' '.
$this->where.
' '.
$this->groupBy.
' '.
$this->order.
' '.
$this->limit;
}
return $this->query;
}
public function setQuery(string $query): void
public function setQuery(QueryInterface $query): QueryData
{
$this->query = $query;
return $this;
}
public function getMapClassName(): ?string
@@ -98,9 +100,11 @@ final class QueryData
return $this->mapClassName;
}
public function setMapClassName(string $mapClassName): void
public function setMapClassName(string $mapClassName): QueryData
{
$this->mapClassName = $mapClassName;
return $this;
}
public function isUseKeyPair(): bool
@@ -146,13 +150,26 @@ final class QueryData
$this->params = array_merge($this->params, $params);
}
public function getQueryCount(): string
/**
* @throws \SP\Core\Exceptions\QueryException
*/
public function getQueryCount(): QueryInterface
{
if (empty($this->queryCount)) {
return 'SELECT COUNT(*) '.$this->from.' '.$this->where;
if ($this->query instanceof Select) {
$countQuery = (clone $this->query)
->resetFlags()
->resetCols()
->resetOrderBy()
->resetGroupBy()
->resetHaving()
->page(0);
$countQuery->cols(['COUNT(*)']);
return $countQuery;
}
return $this->queryCount;
throw new QueryException(__u('Invalid query type for count'));
}
public function getFrom(): ?string
@@ -191,9 +208,11 @@ final class QueryData
return $this->onErrorMessage ?: __u('Error while querying');
}
public function setOnErrorMessage(string $onErrorMessage): void
public function setOnErrorMessage(string $onErrorMessage): QueryData
{
$this->onErrorMessage = $onErrorMessage;
return $this;
}
public function setGroupBy(string $groupBy): void