gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new API request.

Browse Source
This commit is contained in:
James Cole
2025-10-26 15:37:27 +01:00
parent ffc91d5ead
commit 19c4a82194
14 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ class AccountController extends Controller
$types = $request->attributes->get('types'); $types = $request->attributes->get('types');
$query = $request->attributes->get('query'); $query = $request->attributes->get('query');
$date = $request->attributes->get('date'); $date = $request->attributes->get('date');
$limit = $request->attributes->get('limit');
$date = $date ?? today(config('app.timezone')); $date = $date ?? today(config('app.timezone'));
// set date to end-of-day for account balance. so it is at $date 23:59:59 // set date to end-of-day for account balance. so it is at $date 23:59:59
@@ -92,7 +93,7 @@ class AccountController extends Controller
$return = []; $return = [];
$timer = Timer::getInstance(); $timer = Timer::getInstance();
$timer->start(sprintf('AC accounts "%s"', $query)); $timer->start(sprintf('AC accounts "%s"', $query));
$result = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit')); $result = $this->repository->searchAccount((string)$query, $types, $limit);
$allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary); $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
/** @var Account $account */ /** @var Account $account */

6
app/Api/V1/Controllers/Autocomplete/BillController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
@@ -61,10 +62,9 @@ class BillController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBillsAC * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBillsAC
*/ */
public function bills(AutocompleteRequest $request): JsonResponse public function bills(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $result = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit'));
$result = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
$filtered = $result->map( $filtered = $result->map(
static fn (Bill $item) => [ static fn (Bill $item) => [
'id' => (string) $item->id, 'id' => (string) $item->id,

6
app/Api/V1/Controllers/Autocomplete/BudgetController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
@@ -61,10 +62,9 @@ class BudgetController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBudgetsAC * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBudgetsAC
*/ */
public function budgets(AutocompleteRequest $request): JsonResponse public function budgets(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $result = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit'));
$result = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
$filtered = $result->map( $filtered = $result->map(
static fn (Budget $item) => [ static fn (Budget $item) => [
'id' => (string) $item->id, 'id' => (string) $item->id,

6
app/Api/V1/Controllers/Autocomplete/CategoryController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
@@ -61,10 +62,9 @@ class CategoryController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC
*/ */
public function categories(AutocompleteRequest $request): JsonResponse public function categories(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $result = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit'));
$result = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
$filtered = $result->map( $filtered = $result->map(
static fn (Category $item) => [ static fn (Category $item) => [
'id' => (string) $item->id, 'id' => (string) $item->id,

6
app/Api/V1/Controllers/Autocomplete/CurrencyController.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use Deprecated; use Deprecated;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
@@ -62,10 +63,9 @@ class CurrencyController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesAC * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesAC
*/ */
public function currencies(AutocompleteRequest $request): JsonResponse public function currencies(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $collection = $this->repository->searchCurrency($request->attributes->get('query'), $request->attributes->get('limit'));
$collection = $this->repository->searchCurrency($data['query'], $this->parameters->get('limit'));
$result = []; $result = [];
/** @var TransactionCurrency $currency */ /** @var TransactionCurrency $currency */

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

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\ObjectGroup;
@@ -61,11 +62,10 @@ class ObjectGroupController extends Controller
* Documentation for this endpoint is at: * Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC
*/ */
public function objectGroups(AutocompleteRequest $request): JsonResponse public function objectGroups(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData();
$return = []; $return = [];
$result = $this->repository->search($data['query'], $this->parameters->get('limit')); $result = $this->repository->search($request->attributes->get('query'), $request->attributes->get('limit'));
/** @var ObjectGroup $objectGroup */ /** @var ObjectGroup $objectGroup */
foreach ($result as $objectGroup) { foreach ($result as $objectGroup) {

6
app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
@@ -64,10 +65,9 @@ class PiggyBankController extends Controller
); );
} }
public function piggyBanks(AutocompleteRequest $request): JsonResponse public function piggyBanks(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $piggies = $this->piggyRepository->searchPiggyBank($request->attributes->get('query'), $request->attributes->get('limit'));
$piggies = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
$response = []; $response = [];
/** @var PiggyBank $piggy */ /** @var PiggyBank $piggy */

6
app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Recurrence; use FireflyIII\Models\Recurrence;
@@ -57,10 +58,9 @@ class RecurrenceController extends Controller
); );
} }
public function recurring(AutocompleteRequest $request): JsonResponse public function recurring(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $recurrences = $this->repository->searchRecurrence($request->attributes->get('query'), $request->attributes->get('limit'));
$recurrences = $this->repository->searchRecurrence($data['query'], $this->parameters->get('limit'));
$response = []; $response = [];
/** @var Recurrence $recurrence */ /** @var Recurrence $recurrence */

6
app/Api/V1/Controllers/Autocomplete/RuleController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
@@ -57,10 +58,9 @@ class RuleController extends Controller
); );
} }
public function rules(AutocompleteRequest $request): JsonResponse public function rules(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $rules = $this->repository->searchRule($request->attributes->get('query'), $request->attributes->get('limit'));
$rules = $this->repository->searchRule($data['query'], $this->parameters->get('limit'));
$response = []; $response = [];
/** @var Rule $rule */ /** @var Rule $rule */

6
app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
@@ -57,10 +58,9 @@ class RuleGroupController extends Controller
); );
} }
public function ruleGroups(AutocompleteRequest $request): JsonResponse public function ruleGroups(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $groups = $this->repository->searchRuleGroup($request->attributes->get('query'), $request->attributes->get('limit'));
$groups = $this->repository->searchRuleGroup($data['query'], $this->parameters->get('limit'));
$response = []; $response = [];
/** @var RuleGroup $group */ /** @var RuleGroup $group */

6
app/Api/V1/Controllers/Autocomplete/TagController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
@@ -57,10 +58,9 @@ class TagController extends Controller
); );
} }
public function tags(AutocompleteRequest $request): JsonResponse public function tags(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $result = $this->repository->searchTags($request->attributes->get('query'), $request->attributes->get('limit'));
$result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
$array = []; $array = [];
/** @var Tag $tag */ /** @var Tag $tag */

6
app/Api/V1/Controllers/Autocomplete/TransactionController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
@@ -64,10 +65,9 @@ class TransactionController extends Controller
); );
} }
public function transactions(AutocompleteRequest $request): JsonResponse public function transactions(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $result = $this->repository->searchJournalDescriptions($request->attributes->get('query'), $request->attributes->get('limit'));
$result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
// limit and unique // limit and unique
$filtered = $result->unique('description'); $filtered = $result->unique('description');

6
app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Autocomplete; namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
@@ -55,10 +56,9 @@ class TransactionTypeController extends Controller
); );
} }
public function transactionTypes(AutocompleteRequest $request): JsonResponse public function transactionTypes(AutocompleteApiRequest $request): JsonResponse
{ {
$data = $request->getData(); $types = $this->repository->searchTypes($request->attributes->get('query'), $request->attributes->get('limit'));
$types = $this->repository->searchTypes($data['query'], $this->parameters->get('limit'));
$array = []; $array = [];
/** @var TransactionType $type */ /** @var TransactionType $type */

3
app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
View File

@@ -26,6 +26,8 @@ use FireflyIII\Api\V1\Requests\DateRequest;
use FireflyIII\Api\V1\Requests\Generic\QueryRequest; use FireflyIII\Api\V1\Requests\Generic\QueryRequest;
use FireflyIII\Api\V1\Requests\Models\Account\AccountTypeApiRequest; use FireflyIII\Api\V1\Requests\Models\Account\AccountTypeApiRequest;
use FireflyIII\Api\V1\Requests\Models\Account\AccountTypesApiRequest; use FireflyIII\Api\V1\Requests\Models\Account\AccountTypesApiRequest;
use FireflyIII\Api\V1\Requests\PaginationRequest;
use FireflyIII\Models\Account;
class AutocompleteApiRequest extends AggregateFormRequest class AutocompleteApiRequest extends AggregateFormRequest
@@ -36,6 +38,7 @@ class AutocompleteApiRequest extends AggregateFormRequest
{ {
return [ return [
DateRequest::class, DateRequest::class,
[PaginationRequest::class, 'sort_class' => Account::class],
AccountTypesApiRequest::class, AccountTypesApiRequest::class,
QueryRequest::class, QueryRequest::class,
]; ];