Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-14 04:16:54 +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

22
app/modules/web/Controllers/AccountManager/SearchController.php
View File

@@ -28,7 +28,7 @@ use SP\Core\Acl\ActionsInterface;
use SP\Core\Application;
use SP\Domain\Account\AccountSearchServiceInterface;
use SP\Domain\Account\AccountServiceInterface;
use SP\Domain\Account\Services\AccountSearchFilter;
use SP\Domain\Account\Search\AccountSearchFilter;
use SP\Html\DataGrid\DataGridInterface;
use SP\Http\JsonResponse;
use SP\Modules\Web\Controllers\ControllerBase;
@@ -51,6 +51,10 @@ final class SearchController extends ControllerBase
private AccountSearchServiceInterface $accountSearchService;
private AccountGrid $accountGrid;
/**
* @throws \SP\Core\Exceptions\SessionTimeout
* @throws \SP\Domain\Auth\Services\AuthException
*/
public function __construct(
Application $application,
WebControllerHelper $webControllerHelper,
@@ -67,7 +71,6 @@ final class SearchController extends ControllerBase
/**
* @return bool
* @throws \JsonException
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
* @throws \SP\Core\Exceptions\SPException
@@ -100,19 +103,12 @@ final class SearchController extends ControllerBase
{
$itemSearchData = $this->getSearchData($this->configData->getAccountCount(), $this->request);
$filter = new AccountSearchFilter();
$filter->setLimitCount($itemSearchData->getLimitCount());
$filter->setLimitStart($itemSearchData->getLimitStart());
if (!empty($itemSearchData->getSeachString())) {
$filter->setStringFilters(
$this->accountSearchService->analyzeQueryFilters($itemSearchData->getSeachString())
);
$filter->setCleanTxtSearch($this->accountSearchService->getCleanString());
}
$filter = AccountSearchFilter::build($itemSearchData->getSeachString())
->setLimitCount($itemSearchData->getLimitCount())
->setLimitStart($itemSearchData->getLimitStart());
return $this->accountGrid->updatePager(
$this->accountGrid->getGrid($this->accountService->getByFilter($filter)),
$this->accountGrid->getGrid($this->accountSearchService->getByFilter($filter)),
$itemSearchData
);
}