Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Clean up API's and cron job code.
James Cole09efaab17e6a
diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.phpindex 6932106a37..8370a09b14 100644--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php@@ -26,6 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteCategoryApiRequest;+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteGenericApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Category;use FireflyIII\Repositories\Category\CategoryRepositoryInterface;@@ -62,7 +64,7 @@ final class CategoryController extends Controller* Documentation for this endpoint is at:* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCategoriesAC*/- public function categories(AutocompleteApiRequest $request): JsonResponse+ public function categories(AutocompleteGenericApiRequest $request): JsonResponse{$result = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit'));$filtered = $result->map(static fn (Category $item): array => ['id' => (string) $item->id, 'name' => $item->name]);diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.phpindex f5512cb690..be667873d8 100644--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php@@ -26,6 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteGenericApiRequest;+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteObjectGroupApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\ObjectGroup;use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;@@ -62,7 +64,7 @@ final class ObjectGroupController extends Controller* Documentation for this endpoint is at:* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getObjectGroupsAC*/- public function objectGroups(AutocompleteApiRequest $request): JsonResponse+ public function objectGroups(AutocompleteGenericApiRequest $request): JsonResponse{$return = [];$result = $this->repository->search($request->attributes->get('query'), $request->attributes->get('limit'));diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.phpindex eebbf95660..16620df6c1 100644--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php@@ -70,32 +70,6 @@ final class PiggyBankController extends Controller$piggies = $this->piggyRepository->searchPiggyBank($request->attributes->get('query'), $request->attributes->get('limit'));$response = [];- /** @var PiggyBank $piggy */- foreach ($piggies as $piggy) {- $currency = $piggy->transactionCurrency;- $objectGroup = $piggy->objectGroups()->first();- $response[] = [- 'id' => (string) $piggy->id,- 'name' => $piggy->name,- 'currency_id' => (string) $currency->id,- 'currency_name' => $currency->name,- 'currency_code' => $currency->code,- 'currency_symbol' => $currency->symbol,- 'currency_decimal_places' => $currency->decimal_places,- 'object_group_id' => null === $objectGroup ? null : (string) $objectGroup->id,- 'object_group_title' => $objectGroup?->title,- 'object_group_order' => $objectGroup?->order,- ];- }-- return response()->api($response);- }-- public function piggyBanksWithBalance(AutocompleteApiRequest $request): JsonResponse- {- $piggies = $this->piggyRepository->searchPiggyBank($request->attributes->get('query'), $request->attributes->get('limit'));- $response = [];-/** @var PiggyBank $piggy */foreach ($piggies as $piggy) {/** @var TransactionCurrency $currency */diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.phpindex 746c0732fb..2c99dfc806 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php@@ -89,40 +89,9 @@ final class TransactionController extends Controllerreturn response()->api($array);}- public function transactionsWithID(AutocompleteApiRequest $request): JsonResponse- {- $result = new Collection();- if (is_numeric($request->attributes->get('query'))) {- // search for group, not journal.- $firstResult = $this->groupRepository->find((int) $request->attributes->get('query'));- if ($firstResult instanceof TransactionGroup) {- // group may contain multiple journals, each a result:- foreach ($firstResult->transactionJournals as $journal) {- $result->push($journal);- }- }- }- if (!is_numeric($request->attributes->get('query'))) {- $result = $this->repository->searchJournalDescriptions($request->attributes->get('query'), $request->attributes->get('limit'));- }-- // limit and unique- $array = [];-- /** @var TransactionJournal $journal */- foreach ($result as $journal) {- $array[] = [- 'id' => (string) $journal->id,- 'transaction_group_id' => (string) $journal->transaction_group_id,- 'name' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),- 'description' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),- ];- }- return response()->api($array);- }- public function transactionsWithMeta(AutocompleteApiRequest $request): JsonResponse+ public function transactionsWithMeta(AutocompleteTransactionApiRequest $request): JsonResponse{$result = new Collection();if (is_numeric($request->attributes->get('query'))) {diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteCategoryApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteCategoryApiRequest.phpnew file mode 100644index 0000000000..8e5da46097--- /dev/null+++ b/app/Api/V1/Requests/Autocomplete/AutocompleteCategoryApiRequest.php@@ -0,0 +1,48 @@+<?php++/*+ * AutocompleteApiRequest.php+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++declare(strict_types=1);++namespace FireflyIII\Api\V1\Requests\Autocomplete;++use FireflyIII\Api\V1\Requests\AggregateFormRequest;+use FireflyIII\Api\V1\Requests\DateRequest;+use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;+use FireflyIII\Api\V1\Requests\Generic\QueryRequest;+use FireflyIII\Api\V1\Requests\PaginationRequest;+use FireflyIII\Models\Account;+use FireflyIII\Models\Category;+use Override;++class AutocompleteCategoryApiRequest extends AggregateFormRequest+{+ #[Override]+ protected function getRequests(): array+ {+ return [+ DateRequest::class,+ [PaginationRequest::class, 'sort_class' => Category::class],+ [ObjectTypeApiRequest::class, 'object_type' => Category::class],+ QueryRequest::class,+ ];+ }+}diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.phpnew file mode 100644index 0000000000..be4aacaabc--- /dev/null+++ b/app/Api/V1/Requests/Autocomplete/AutocompleteGenericApiRequest.php@@ -0,0 +1,47 @@+<?php++/*+ * AutocompleteApiRequest.php+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++declare(strict_types=1);++namespace FireflyIII\Api\V1\Requests\Autocomplete;++use FireflyIII\Api\V1\Requests\AggregateFormRequest;+use FireflyIII\Api\V1\Requests\DateRequest;+use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;+use FireflyIII\Api\V1\Requests\Generic\QueryRequest;+use FireflyIII\Api\V1\Requests\PaginationRequest;+use FireflyIII\Models\ObjectGroup;+use Override;++class AutocompleteGenericApiRequest extends AggregateFormRequest+{+ #[Override]+ protected function getRequests(): array+ {+ return [+ // DateRequest::class,+ [PaginationRequest::class, 'sort_class' => ObjectGroup::class],+ // [ObjectTypeApiRequest::class, 'object_type' => ObjectGroup::class],+ QueryRequest::class,+ ];+ }+}diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteObjectGroupApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteObjectGroupApiRequest.phpnew file mode 100644index 0000000000..7715cd1872--- /dev/null+++ b/app/Api/V1/Requests/Autocomplete/AutocompleteObjectGroupApiRequest.php@@ -0,0 +1,48 @@+<?php++/*+ * AutocompleteApiRequest.php+ * Copyright (c) 2026 [email protected]+ *+ * This file is part of Firefly III (https://github.com/firefly-iii).+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */++declare(strict_types=1);++namespace FireflyIII\Api\V1\Requests\Autocomplete;++use FireflyIII\Api\V1\Requests\AggregateFormRequest;+use FireflyIII\Api\V1\Requests\DateRequest;+use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;+use FireflyIII\Api\V1\Requests\Generic\QueryRequest;+use FireflyIII\Api\V1\Requests\PaginationRequest;+use FireflyIII\Models\Account;+use FireflyIII\Models\ObjectGroup;+use Override;++class AutocompleteObjectGroupApiRequest extends AggregateFormRequest+{+ #[Override]+ protected function getRequests(): array+ {+ return [+ DateRequest::class,+ [PaginationRequest::class, 'sort_class' => ObjectGroup::class],+ [ObjectTypeApiRequest::class, 'object_type' => ObjectGroup::class],+ QueryRequest::class,+ ];+ }+}diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.phpindex d6f001e7a9..46f0df8e92 100644--- a/app/Console/Commands/Tools/Cron.php+++ b/app/Console/Commands/Tools/Cron.php@@ -89,6 +89,8 @@ class Cron extends Command}$force = (bool) $this->option('force');+ Log::debug(sprintf('Force is %s', $force ? 'true' : 'false'));+// Fire exchange rates cron job.if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {try {diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.phpindex c69b1f4d02..c72c1d6264 100644--- a/app/Repositories/Recurring/RecurringRepository.php+++ b/app/Repositories/Recurring/RecurringRepository.php@@ -531,7 +531,7 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte}$search->orderBy('recurrences.title', 'ASC');- return $search->take($limit)->get(['id', 'title', 'description']);+ return $search->take($limit)->get(['id', 'title', 'description','active']);}#[Override]diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.phpindex aed440ec1d..53ab7d1464 100644--- a/app/Repositories/Rule/RuleRepository.php+++ b/app/Repositories/Rule/RuleRepository.php@@ -253,7 +253,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface}$search->orderBy('rules.order', 'ASC')->orderBy('rules.title', 'ASC');- return $search->take($limit)->get(['id', 'title', 'description']);+ return $search->take($limit)->get(['id', 'title', 'description','active']);}public function setOrder(Rule $rule, int $newOrder): voiddiff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.phpindex a7e8518795..ede5f22e37 100644--- a/app/Repositories/RuleGroup/RuleGroupRepository.php+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php@@ -324,7 +324,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte}$search->orderBy('rule_groups.order', 'ASC')->orderBy('rule_groups.title', 'ASC');- return $search->take($limit)->get(['id', 'title', 'description']);+ return $search->take($limit)->get(['id', 'title', 'description','active']);}public function setOrder(RuleGroup $ruleGroup, int $newOrder): voiddiff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.phpindex 33838b57a2..c4f0af67da 100644--- a/app/Support/Cronjobs/AutoBudgetCronjob.php+++ b/app/Support/Cronjobs/AutoBudgetCronjob.php@@ -39,8 +39,10 @@ class AutoBudgetCronjob extends AbstractCronjob{public function fire(): void{+ Log::debug('AutoBudgetCronjob::fire()');/** @var User $user */foreach ($this->users as $user) {+ Log::debug(sprintf('Now at user #%d ("%s")', $user->id, $user->email));/** @var Configuration $config */$config = AppConfiguration::get(sprintf('last_ab_job_%d', $user->id), 0);$lastTime = (int) $config->data;@@ -60,7 +62,7 @@ class AutoBudgetCronjob extends AbstractCronjob$user->id);- return;+ continue;}Log::info(sprintf('Execution of the auto budget cron-job has been FORCED for user #%d.', $user->id));}diff --git a/app/Support/Cronjobs/BillWarningCronjob.php b/app/Support/Cronjobs/BillWarningCronjob.phpindex d4bd4a40b6..f361f6010b 100644--- a/app/Support/Cronjobs/BillWarningCronjob.php+++ b/app/Support/Cronjobs/BillWarningCronjob.php@@ -66,7 +66,7 @@ class BillWarningCronjob extends AbstractCronjob$this->jobErrored = false;$this->jobSucceeded = false;- return;+ continue;}Log::info(sprintf('Execution of the bill notification cron-job has been FORCED for user #%d.', $user->id));diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.phpindex d04b65c6a6..1a0a6d0f4f 100644--- a/app/Support/Cronjobs/RecurringCronjob.php+++ b/app/Support/Cronjobs/RecurringCronjob.php@@ -70,7 +70,7 @@ class RecurringCronjob extends AbstractCronjob$this->jobErrored = false;$this->jobSucceeded = false;- return;+ continue;}Log::info(sprintf('Execution of the recurring transaction cron-job has been FORCED for user #%d.', $user->id));}diff --git a/app/Support/Cronjobs/WebhookCronjob.php b/app/Support/Cronjobs/WebhookCronjob.phpindex c56c77e6ee..9a21832711 100644--- a/app/Support/Cronjobs/WebhookCronjob.php+++ b/app/Support/Cronjobs/WebhookCronjob.php@@ -66,7 +66,7 @@ class WebhookCronjob extends AbstractCronjob$this->jobErrored = false;$this->jobSucceeded = false;- return;+ continue;}Log::info(sprintf('Execution of the webhook cron-job has been FORCED for user #%d.', $user->id));diff --git a/public/v1/js/ff/transactions/show.js b/public/v1/js/ff/transactions/show.jsindex db5491d5a8..5e416f78f8 100644--- a/public/v1/js/ff/transactions/show.js+++ b/public/v1/js/ff/transactions/show.js@@ -20,101 +20,12 @@$(function () {"use strict";- $('.link-modal').click(getLinkModal);$('.clone-transaction').click(cloneTransaction);$('.clone-transaction-and-edit').click(cloneTransactionAndEdit);- $('#linkJournalModal').on('shown.bs.modal', function () {- makeAutoComplete();- })$('[data-toggle="tooltip"]').tooltip();});-function getLinkModal(e) {- var button = $(e.currentTarget);- var journalId = parseInt(button.data('journal'));- var url = modalDialogURL.replace('%JOURNAL%', journalId);- console.log(url);- $.get(url).done(function (data) {- $('#linkJournalModal').html(data).modal('show');-- }).fail(function () {- alert('Could not load the data to link journals. Sorry :(');- button.prop('disabled', true);- });-- return false;-}--function makeAutoComplete() {- var inputItem = document.getElementsByClassName('link-journal')[0];-- inputItem.addEventListener('autocomplete', (event) => {- selectedJournal(event);- console.log('Selected value:', event);- });-- new BootstrapSimpleAutocomplete(inputItem, {- renderItem: function (option, query, index) {- const item = document.createElement('a');- item.className = 'dropdown-item';- item.innerText = option.name;- item.setAttribute('role', 'option');- item.setAttribute('aria-selected', 'false');- item.id = `autocomplete-item-${this.id}-${index}`;-- item.addEventListener('click', () => this.selectOption(option));- return item;- // return option.name;- // const item = document.createElement('a');- // item.className = 'dropdown-item';- // item.setAttribute('role', 'option');- // item.setAttribute('aria-selected', 'false');- // item.id = `autocomplete-item-${this.id}-${index}`;- //- // // Example: Highlight the query in the option text- // // const regex = new RegExp(`(${query})`, 'gi');- // // item.innerHTML = option.replace(regex, '<strong>$1</strong>');- //- // // item.addEventListener('click', () => this.selectOption(option));- // return item;- },- fetchFunction: function (query) {- // Custom data fetching logic- return fetch(acURL + '?query=' + encodeURIComponent(query),- {- method: 'GET',- credentials: 'include',- headers: {- 'Content-Type': 'application/json',- 'Accept': 'application/json',- 'X-CSRF-TOKEN': token- },- }- )- .then((response) => response.json())- .then((data) => {- return data;- var result = [];- for(var i in data) {- if(data.hasOwnProperty(i)) {- result.push(data[i].name);- }- }- // Process data if needed- return result;- });- },- });-}--function selectedJournal(event) {- console.log(event);- $('#journal-selector').hide();- $('#journal-selection').show();- $('#selected-journal').html('<a href="' + groupURL.replace('%GROUP%', event.detail.value.transaction_group_id) + '">' + event.detail.value.description + '</a>').show();- $('input[name="opposing"]').val(event.detail.value.id);-}function cloneTransaction(e) {var button = $(e.currentTarget);diff --git a/resources/assets/v3/js/pages/transactions/shared/load-transaction-links.js b/resources/assets/v3/js/pages/transactions/shared/load-transaction-links.jsindex b8355120d4..525fd50d4c 100644--- a/resources/assets/v3/js/pages/transactions/shared/load-transaction-links.js+++ b/resources/assets/v3/js/pages/transactions/shared/load-transaction-links.js@@ -12,40 +12,26 @@ export function loadTransactionLinks(index, journalId) {for (let i = 0; i < links.length; i++) {if (Object.hasOwn(links, i)) {let current = links[i];- console.log(current);- console.log(this.formData.linkTypes);- let direction =- parseInt(journalId) ===- parseInt(current.attributes.inward_id)- ? "inward"- : "outward";+ let direction = parseInt(journalId) === parseInt(current.attributes.inward_id) ? "inward" : "outward";let otherJournal = parseInt(current.attributes.inward_id);- if (- parseInt(journalId) ===- parseInt(current.attributes.inward_id)+ if (parseInt(journalId) === parseInt(current.attributes.inward_id)) {otherJournal = parseInt(current.attributes.outward_id);}new Get().showJournal(otherJournal).then((response) => {let group = response.data.data;let foundJournal = null;- for (- let j = 0;- j < group.attributes.transactions.length;- j++- ) {+ for (let j = 0; j < group.attributes.transactions.length; j++) {if (Object.hasOwn(group.attributes.transactions, j)) {let journal = group.attributes.transactions[j];- if (- parseInt(journal.transaction_journal_id) ===- otherJournal- ) {+ if (parseInt(journal.transaction_journal_id) === otherJournal) {foundJournal = journal;}}}if (null !== foundJournal) {- console.log("showJournal");+ //console.log('Found other journal ', parseInt(foundJournal.transaction_journal_id));+ console.log('Current link is', parseInt(current.id));this.links[index].push({id: parseInt(current.id),link_type:@@ -61,7 +47,7 @@ export function loadTransactionLinks(index, journalId) {link.id ===parseInt(current.attributes.link_type_id),)[direction],- journal_id: parseInt(journalId),+ journal_id: parseInt(foundJournal.transaction_journal_id),group_id: parseInt(group.id),journal_description: foundJournal.description,editMode: false,diff --git a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.jsindex 4cf2d8c1de..6e314c499c 100644--- a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js+++ b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js@@ -11,18 +11,23 @@ export function processTransactionLinks(transactions) {let link = this.links[i][j];let left = journalId;let right = parseInt(link.journal_id);+ console.log('Left is now' + left + ' and right is now ' + right + ' and existing ID is ' + link.id);+if ("inward" === link.link_type_direction) {left = parseInt(link.journal_id);right = journalId;+ console.log('Switched because inward: left is now' + left + ' and right is now ' + right);+ }+ if(0 === link.id) {+ new PostLink()+ .post(link.link_type_id, left, right, null)+ .then(() => {+ this.redirectAfterTransactionLinks(i, j);+ })+ .catch(function (e) {+ console.error(e);+ });}- new PostLink()- .post(link.link_type_id, left, right, null)- .then(() => {- this.redirectAfterTransactionLinks(i, j);- })- .catch(function (e) {- console.error(e);- });}}}diff --git a/routes/api.php b/routes/api.phpindex 2181ee3917..f6e0693728 100644--- a/routes/api.php+++ b/routes/api.php@@ -48,19 +48,12 @@ Route::group('as' => 'api.v1.cron.',],static function (): void {- Route::get('cron/{cliToken}', ['uses' => 'CronController@cron', 'as' => 'index'])- ->withoutMiddleware(['api'])- ;- Route::get(- 'cron/{cliToken}',- [CronController::class, 'cron']- )->name('index')- ->withoutMiddleware(['api'])- ;+ Route::get('cron/{cliToken}', [CronController::class, 'cron'])->name('index')->withoutMiddleware(['api']);});// Autocomplete controllers+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Autocomplete',@@ -75,22 +68,20 @@ Route::group(Route::get('budgets', ['uses' => 'BudgetController@budgets', 'as' => 'budgets']);Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);Route::get('currencies', ['uses' => 'CurrencyController@currencies', 'as' => 'currencies']);- Route::get('currencies-with-code', ['uses' => 'CurrencyController@currenciesWithCode', 'as' => 'currencies-with-code']);Route::get('object-groups', ['uses' => 'ObjectGroupController@objectGroups', 'as' => 'object-groups']);Route::get('piggy-banks', ['uses' => 'PiggyBankController@piggyBanks', 'as' => 'piggy-banks']);- Route::get('piggy-banks-with-balance', ['uses' => 'PiggyBankController@piggyBanksWithBalance', 'as' => 'piggy-banks-with-balance']);Route::get('recurring', ['uses' => 'RecurrenceController@recurring', 'as' => 'recurring']);Route::get('rules', ['uses' => 'RuleController@rules', 'as' => 'rules']);Route::get('rule-groups', ['uses' => 'RuleGroupController@ruleGroups', 'as' => 'rule-groups']);Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);Route::get('transactions', ['uses' => 'TransactionController@transactions', 'as' => 'transactions']);- Route::get('transactions-with-id', ['uses' => 'TransactionController@transactionsWithID', 'as' => 'transactions-with-id']);Route::get('transactions-with-meta', ['uses' => 'TransactionController@transactionsWithMeta', 'as' => 'transactions-with-meta']);Route::get('transaction-types', ['uses' => 'TransactionTypeController@transactionTypes', 'as' => 'transaction-types']);});// exchange rates+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate',@@ -123,6 +114,7 @@ Route::group();// CHART ROUTES+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -135,6 +127,7 @@ Route::group();// Chart accounts+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -146,6 +139,7 @@ Route::group(});+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -157,6 +151,7 @@ Route::group(});+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -171,6 +166,7 @@ Route::group(// DATA ROUTES// Export data API routes+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data\Export',@@ -190,7 +186,9 @@ Route::group(Route::get('transactions', ['uses' => 'ExportController@transactions', 'as' => 'transactions']);});+// Destroy data API route+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data',@@ -201,6 +199,8 @@ Route::group(Route::delete('', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);});++// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data',@@ -213,6 +213,7 @@ Route::group();// Bulk update API routes+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data\Bulk',@@ -227,6 +228,7 @@ Route::group(// INSIGHTS ROUTES// Insight in expenses:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Insight\Expense',@@ -254,6 +256,7 @@ Route::group(});// insight in income+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Insight\Income',@@ -279,6 +282,7 @@ Route::group();// Insight in transfers+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Insight\Transfer',@@ -298,6 +302,7 @@ Route::group();// SUMMARY CONTROLLER// BASIC+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Summary',@@ -311,6 +316,7 @@ Route::group(// MODELS// Accounts API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Account',@@ -331,6 +337,7 @@ Route::group();// Attachment API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Attachment',@@ -349,6 +356,7 @@ Route::group();// User group API routes.+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\UserGroup',@@ -368,6 +376,7 @@ Route::group();// Bills API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Bill',@@ -386,6 +395,8 @@ Route::group(Route::get('{bill}/transactions', ['uses' => 'ListController@transactions', 'as' => 'transactions']);});++// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Bill',@@ -406,6 +417,7 @@ Route::group();// Available Budget API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\AvailableBudget',@@ -422,6 +434,7 @@ Route::group();// Budget and Budget Limit API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models',@@ -450,6 +463,7 @@ Route::group();// separate route for budget limits without referring to the budget.+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\BudgetLimit',@@ -462,6 +476,7 @@ Route::group();// Category API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Category',@@ -481,6 +496,7 @@ Route::group();// Object Group API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\ObjectGroup',@@ -499,6 +515,7 @@ Route::group();// Piggy Bank API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\PiggyBank',@@ -519,6 +536,7 @@ Route::group();// Recurrence API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Recurrence',@@ -541,6 +559,7 @@ Route::group();// Rules API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Rule',@@ -563,6 +582,7 @@ Route::group();// Rules API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\RuleGroup',@@ -583,6 +603,7 @@ Route::group();// Tag API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Tag',@@ -601,6 +622,7 @@ Route::group(});// Transaction API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Transaction',@@ -619,6 +641,7 @@ Route::group(});+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Transaction',@@ -634,6 +657,7 @@ Route::group();// Transaction currency API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\TransactionCurrency',@@ -663,6 +687,7 @@ Route::group();// Transaction currency API routes that require admin rights:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\TransactionCurrency',@@ -678,6 +703,7 @@ Route::group(// Transaction Links API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\TransactionLink',@@ -694,6 +720,7 @@ Route::group();// Transaction Link Type API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\TransactionLinkType',@@ -708,6 +735,7 @@ Route::group();// Transaction Link Type API routes that need admin rights.+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\TransactionLinkType',@@ -723,6 +751,7 @@ Route::group();// SEARCH ENDPOINTS+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Search',@@ -738,6 +767,7 @@ Route::group(// SYSTEM END POINTS// About Firefly III API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\System',@@ -750,6 +780,7 @@ Route::group(});// Configuration API routes+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\System',@@ -763,6 +794,7 @@ Route::group();// Configuration API routes that need admin rights+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\System',@@ -776,6 +808,7 @@ Route::group();// Users API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\System',@@ -793,6 +826,7 @@ Route::group();// Batch API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\System',@@ -807,6 +841,7 @@ Route::group(// USER// Preference API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\User',@@ -823,6 +858,7 @@ Route::group();// Preference API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\User',@@ -839,6 +875,7 @@ Route::group();// Webhook API routes:+// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Webhook',