kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 04:34:00 +00:00
Code Issues Projects Releases Wiki Activity

Add limit to object groups #3150

Browse Source
This commit is contained in:
James Cole
2020-07-21 06:30:37 +02:00
parent bb841e66c7
commit f777abdeb1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
View File

@@ -57,7 +57,6 @@ class ObjectGroupController extends Controller
} }
/** /**
* TODO add limit
* @param AutocompleteRequest $request * @param AutocompleteRequest $request
* *
* @return JsonResponse * @return JsonResponse
@@ -66,7 +65,7 @@ class ObjectGroupController extends Controller
{ {
$data = $request->getData(); $data = $request->getData();
$return = []; $return = [];
$result = $this->repository->search($data['query']); $result = $this->repository->search($data['query'], $data['limit']);
/** @var ObjectGroup $account */ /** @var ObjectGroup $account */
foreach ($result as $objectGroup) { foreach ($result as $objectGroup) {

5
app/Repositories/ObjectGroup/ObjectGroupRepository.php
View File

@@ -61,10 +61,11 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
/** /**
* @param string $query * @param string $query
* @param int $limit
* *
* @return Collection * @return Collection
*/ */
public function search(string $query): Collection public function search(string $query, int $limit): Collection
{ {
$dbQuery = $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC'); $dbQuery = $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC');
if ('' !== $query) { if ('' !== $query) {
@@ -77,7 +78,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
} }
return $dbQuery->get(['object_groups.*']); return $dbQuery->take($limit)->get(['object_groups.*']);
} }
/** /**

3
app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php
View File

@@ -39,10 +39,11 @@ interface ObjectGroupRepositoryInterface
/** /**
* @param string $query * @param string $query
* @param int $limit
* *
* @return Collection * @return Collection
*/ */
public function search(string $query): Collection; public function search(string $query, int $limit): Collection;
/** /**
* Delete empty ones. * Delete empty ones.