Merge remote-tracking branch 'upstream/main' into feat/expression-engine

This commit is contained in:
Michael Thomas
2024-03-06 21:38:40 -05:00
2225 changed files with 111169 additions and 148980 deletions

View File

@@ -22,21 +22,7 @@
declare(strict_types=1);
/**
* V2 API route for TransactionSum API endpoints
* TODO what to do with these routes
*/
//Route::group(
// ['namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\Sum', 'prefix' => 'v2/transaction/sum',
// 'as' => 'api.v2.transaction.sum.',],
// static function () {
// Route::get('bills/paid', ['uses' => 'BillController@paid', 'as' => 'bills.paid']);
// }
//);
/**
* V2 API route for Summary boxes
*/
// V2 API route for Summary boxes
// BASIC
Route::group(
[
@@ -44,65 +30,65 @@ Route::group(
'prefix' => 'v2/summary',
'as' => 'api.v2.summary.',
],
static function () {
static function (): void {
Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']);
}
);
/**
* V2 API route for TransactionList API endpoints
*/
// V2 API route for all kinds of Transaction lists.
// A lot of endpoints involve transactions. So any time Firefly III needs to list transactions
// it's coming from these endpoints.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List',
'prefix' => 'v2',
'as' => 'api.v2.',
],
static function () {
static function (): void {
// basic list
Route::get('transactions', ['uses' => 'TransactionController@list', 'as' => 'transactions.list']);
// list by parent or related object.
// note how the check is done on the user group, not the user itself.
Route::get('accounts/{userGroupAccount}/transactions', ['uses' => 'AccountController@list', 'as' => 'accounts.transactions']);
}
);
/**
* V2 API routes for auto complete
*/
// V2 API routes for auto complete
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Autocomplete',
'prefix' => 'v2/autocomplete',
'as' => 'api.v2.autocomplete.',
],
static function () {
static function (): void {
// Auto complete routes
Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']);
Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);
}
);
/**
* V2 API route for net worth endpoint(s);
*/
// V2 API route for net worth endpoint(s);
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Summary',
'prefix' => 'v2/net-worth',
'as' => 'api.v2.net-worth.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'NetWorthController@get', 'as' => 'index']);
}
);
/**
* V2 API routes for charts
*/
// V2 API routes for charts
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Chart',
'prefix' => 'v2/chart',
'as' => 'api.v1.chart.',
],
static function () {
static function (): void {
Route::get('account/dashboard', ['uses' => 'AccountController@dashboard', 'as' => 'account.dashboard']);
Route::get('budget/dashboard', ['uses' => 'BudgetController@dashboard', 'as' => 'budget.dashboard']);
Route::get('category/dashboard', ['uses' => 'CategoryController@dashboard', 'as' => 'category.dashboard']);
@@ -110,110 +96,122 @@ Route::group(
}
);
/**
* V2 API route for accounts.
*/
// V2 API route for accounts.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Account',
'prefix' => 'v2/accounts',
'as' => 'api.v2.accounts.',
],
static function () {
static function (): void {
Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']);
}
);
/**
* V2 API route for subscriptions.
*/
// V2 API route for subscriptions.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Bill',
'prefix' => 'v2/subscriptions',
'as' => 'api.v2.subscriptions.',
],
static function () {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
Route::get('{userGroupBill}', ['uses' => 'ShowController@show', 'as' => 'show']);
Route::get('sum/paid', ['uses' => 'SumController@paid', 'as' => 'sum.paid']);
Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']);
}
);
/**
* V2 API route for piggy banks.
*/
// V2 API route for piggy banks.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model\PiggyBank',
'prefix' => 'v2/piggy-banks',
'as' => 'api.v2.piggy-banks.',
],
static function () {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
}
);
/**
* V2 API route for transactions
*/
// V2 API route for transaction currencies
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Currency',
'prefix' => 'v2/currencies',
'as' => 'api.v2.currencies.',
],
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
}
);
// V2 API route for transactions
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Transaction',
'prefix' => 'v2/transactions',
'as' => 'api.v2.transactions.',
],
static function () {
static function (): void {
Route::post('', ['uses' => 'StoreController@post', 'as' => 'store']);
Route::get('{userGroupTransaction}', ['uses' => 'ShowController@show', 'as' => 'show']);
Route::put('{userGroupTransaction}', ['uses' => 'UpdateController@update', 'as' => 'update']);
}
);
// infinite (transactions) list:
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List',
'prefix' => 'v2/infinite/transactions',
'as' => 'api.v2.infinite.transactions.',
],
static function (): void {
Route::get('', ['uses' => 'TransactionController@infiniteList', 'as' => 'list']);
}
);
/**
* V2 API route for budgets and budget limits:
*/
// V2 API route for budgets and budget limits:
// TODO Validate from here down.
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\Model',
'prefix' => 'v2/budgets',
'as' => 'api.v2.budgets',
],
static function () {
Route::get('', ['uses' => 'Budget\ListController@index', 'as' => 'index']);
static function (): void {
Route::get('', ['uses' => 'Budget\IndexController@index', 'as' => 'index']);
Route::get('{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
Route::get('{budget}/limits', ['uses' => 'BudgetLimit\ListController@index', 'as' => 'budget-limits.index']);
Route::get('sum/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'sum.budgeted']);
Route::get('{budget}/limits', ['uses' => 'BudgetLimit\IndexController@index', 'as' => 'budget-limits.index']);
Route::get('sum/budgeted', ['uses' => 'Budget\SumController@budgeted', 'as' => 'sum.budgeted']);
Route::get('sum/spent', ['uses' => 'Budget\SumController@spent', 'as' => 'sum.spent']);
Route::get('{budget}/budgeted', ['uses' => 'Budget\SumController@budgeted', 'as' => 'budget.budgeted']);
Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
// Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']);
// Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
}
);
/**
* V2 API route for system
*/
// V2 API route for system
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\System',
'prefix' => 'v2',
'as' => 'api.v2.system.',
],
static function () {
static function (): void {
Route::get('preferences/{preference}', ['uses' => 'PreferencesController@get', 'as' => 'preferences.get']);
}
);
/**
* V2 API route for user groups (administrations).
*/
// V2 API route for user groups (administrations).
Route::group(
[
'namespace' => 'FireflyIII\Api\V2\Controllers\UserGroup',
'prefix' => 'v2/user-groups',
'as' => 'api.v2.user-groups.',
],
static function () {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
static function (): void {
Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
@@ -224,16 +222,14 @@ Route::group(
// down here is v1
/**
* Autocomplete controllers
*/
// Autocomplete controllers
Route::group(
[
'namespace' => 'FireflyIII\Api\V1\Controllers\Autocomplete',
'prefix' => 'v1/autocomplete',
'as' => 'api.v1.autocomplete.',
],
static function () {
static function (): void {
// Auto complete routes
Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']);
Route::get('bills', ['uses' => 'BillController@bills', 'as' => 'bills']);
@@ -254,9 +250,7 @@ Route::group(
}
);
/**
* CHART ROUTES.
*/
// CHART ROUTES.
// Accounts
Route::group(
[
@@ -264,14 +258,12 @@ Route::group(
'prefix' => 'v1/chart/account',
'as' => 'api.v1.chart.account.',
],
static function () {
static function (): void {
Route::get('overview', ['uses' => 'AccountController@overview', 'as' => 'overview']);
}
);
/**
* DATA ROUTES
*/
// DATA ROUTES
// Export data API routes
Route::group(
[
@@ -279,7 +271,7 @@ Route::group(
'prefix' => 'v1/data/export',
'as' => 'api.v1.data.export.',
],
static function () {
static function (): void {
Route::get('accounts', ['uses' => 'ExportController@accounts', 'as' => 'accounts']);
Route::get('bills', ['uses' => 'ExportController@bills', 'as' => 'bills']);
Route::get('budgets', ['uses' => 'ExportController@budgets', 'as' => 'budgets']);
@@ -298,7 +290,7 @@ Route::group(
'prefix' => 'v1/data/destroy',
'as' => 'api.v1.data.',
],
static function () {
static function (): void {
Route::delete('', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
}
);
@@ -308,7 +300,7 @@ Route::group(
'prefix' => 'v1/data/purge',
'as' => 'api.v1.data.',
],
static function () {
static function (): void {
Route::delete('', ['uses' => 'PurgeController@purge', 'as' => 'purge']);
}
);
@@ -320,14 +312,12 @@ Route::group(
'prefix' => 'v1/data/bulk',
'as' => 'api.v1.data.bulk.',
],
static function () {
static function (): void {
Route::post('transactions', ['uses' => 'TransactionController@update', 'as' => 'transactions']);
}
);
/**
* INSIGHTS ROUTES
*/
// INSIGHTS ROUTES
// Insight in expenses:
Route::group(
@@ -336,7 +326,7 @@ Route::group(
'prefix' => 'v1/insight/expense',
'as' => 'api.v1.insight.expense.',
],
static function () {
static function (): void {
// Insight in expenses per account:
Route::get('expense', ['uses' => 'AccountController@expense', 'as' => 'expense']);
Route::get('asset', ['uses' => 'AccountController@asset', 'as' => 'asset']);
@@ -363,7 +353,7 @@ Route::group(
'prefix' => 'v1/insight/income',
'as' => 'api.v1.insight.income.',
],
static function () {
static function (): void {
// Insight in expenses per account:
Route::get('revenue', ['uses' => 'AccountController@revenue', 'as' => 'revenue']);
Route::get('asset', ['uses' => 'AccountController@asset', 'as' => 'asset']);
@@ -388,7 +378,7 @@ Route::group(
'prefix' => 'v1/insight/transfer',
'as' => 'api.v1.insight.transfer.',
],
static function () {
static function (): void {
// Insight in expenses per account:
Route::get('asset', ['uses' => 'AccountController@asset', 'as' => 'asset']);
Route::get('category', ['uses' => 'CategoryController@category', 'as' => 'category']);
@@ -399,9 +389,7 @@ Route::group(
// TODO Transfers for piggies
}
);
/**
* SUMMARY CONTROLLER
*/
// SUMMARY CONTROLLER
// BASIC
Route::group(
[
@@ -409,14 +397,12 @@ Route::group(
'prefix' => 'v1/summary',
'as' => 'api.v1.summary.',
],
static function () {
static function (): void {
Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']);
}
);
/**
* MODELS
*/
// MODELS
// Accounts API routes:
Route::group(
[
@@ -424,7 +410,7 @@ Route::group(
'prefix' => 'v1/accounts',
'as' => 'api.v1.accounts.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -444,7 +430,7 @@ Route::group(
'prefix' => 'v1/attachments',
'as' => 'api.v1.attachments.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{attachment}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -462,7 +448,7 @@ Route::group(
'prefix' => 'v1/bills',
'as' => 'api.v1.bills.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{bill}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -482,12 +468,12 @@ Route::group(
'prefix' => 'v1/available-budgets',
'as' => 'api.v1.available-budgets.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
//Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
// Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{availableBudget}', ['uses' => 'ShowController@show', 'as' => 'show']);
//Route::put('{availableBudget}', ['uses' => 'UpdateController@update', 'as' => 'update']);
//Route::delete('{availableBudget}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
// Route::put('{availableBudget}', ['uses' => 'UpdateController@update', 'as' => 'update']);
// Route::delete('{availableBudget}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
}
);
@@ -498,7 +484,7 @@ Route::group(
'prefix' => 'v1/budgets',
'as' => 'api.v1.budgets.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'Budget\ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'Budget\StoreController@store', 'as' => 'store']);
Route::get('transactions-without-budget', ['uses' => 'Budget\ListController@withoutBudget', 'as' => 'without-budget']);
@@ -526,7 +512,7 @@ Route::group(
'prefix' => 'v1/budget-limits',
'as' => 'api.v1.budget-limits.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@indexAll', 'as' => 'index']);
}
);
@@ -538,7 +524,7 @@ Route::group(
'prefix' => 'v1/categories',
'as' => 'api.v1.categories.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{category}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -557,7 +543,7 @@ Route::group(
'prefix' => 'v1/object-groups',
'as' => 'api.v1.object-groups.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::get('{objectGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
Route::put('{objectGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
@@ -575,7 +561,7 @@ Route::group(
'prefix' => 'v1/piggy-banks',
'as' => 'api.v1.piggy-banks.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{piggyBank}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -594,7 +580,7 @@ Route::group(
'prefix' => 'v1/recurrences',
'as' => 'api.v1.recurrences.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{recurrence}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -613,7 +599,7 @@ Route::group(
'prefix' => 'v1/rules',
'as' => 'api.v1.rules.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{rule}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -636,7 +622,7 @@ Route::group(
'prefix' => 'v1/rule-groups',
'as' => 'api.v1.rule-groups.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{ruleGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -656,7 +642,7 @@ Route::group(
'prefix' => 'v1/tags',
'as' => 'api.v1.tags.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{tagOrId}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -674,7 +660,7 @@ Route::group(
'prefix' => 'v1/transactions',
'as' => 'api.v1.transactions.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{transactionGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -692,7 +678,7 @@ Route::group(
'prefix' => 'v1/transaction-journals',
'as' => 'api.v1.transaction-journals.',
],
static function () {
static function (): void {
Route::get('{tj}', ['uses' => 'ShowController@showJournal', 'as' => 'show']);
Route::delete('{tj}', ['uses' => 'DestroyController@destroyJournal', 'as' => 'delete']);
@@ -707,7 +693,7 @@ Route::group(
'prefix' => 'v1/currencies',
'as' => 'api.v1.currencies.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('default', ['uses' => 'ShowController@showDefault', 'as' => 'show.default']);
@@ -737,7 +723,7 @@ Route::group(
'prefix' => 'v1/transaction-links',
'as' => 'api.v1.transaction-links.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{journalLink}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -753,7 +739,7 @@ Route::group(
'prefix' => 'v1/link-types',
'as' => 'api.v1.link-types.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{linkType}', ['uses' => 'ShowController@show', 'as' => 'show']);
@@ -763,24 +749,20 @@ Route::group(
}
);
/**
* SEARCH ENDPOINTS
*/
// SEARCH ENDPOINTS
Route::group(
[
'namespace' => 'FireflyIII\Api\V1\Controllers\Search',
'prefix' => 'v1/search',
'as' => 'api.v1.search.',
],
static function () {
static function (): void {
Route::get('transactions', ['uses' => 'TransactionController@search', 'as' => 'transactions']);
Route::get('accounts', ['uses' => 'AccountController@search', 'as' => 'accounts']);
}
);
/**
* SYSTEM END POINTS
*/
// SYSTEM END POINTS
// About Firefly III API routes:
Route::group(
[
@@ -788,7 +770,7 @@ Route::group(
'prefix' => 'v1/about',
'as' => 'api.v1.about.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'AboutController@about', 'as' => 'index']);
Route::get('user', ['uses' => 'AboutController@user', 'as' => 'user']);
}
@@ -800,7 +782,7 @@ Route::group(
'prefix' => 'v1/configuration',
'as' => 'api.v1.configuration.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ConfigurationController@index', 'as' => 'index']);
Route::get('{eitherConfigKey}', ['uses' => 'ConfigurationController@show', 'as' => 'show']);
Route::put('{dynamicConfigKey}', ['uses' => 'ConfigurationController@update', 'as' => 'update']);
@@ -814,7 +796,7 @@ Route::group(
'prefix' => 'v1/users',
'as' => 'api.v1.users.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'UserController@index', 'as' => 'index']);
Route::post('', ['uses' => 'UserController@store', 'as' => 'store']);
Route::get('{user}', ['uses' => 'UserController@show', 'as' => 'show']);
@@ -823,9 +805,7 @@ Route::group(
}
);
/**
* USER
*/
// USER
// Preference API routes:
Route::group(
@@ -834,7 +814,7 @@ Route::group(
'prefix' => 'v1/preferences',
'as' => 'api.v1.preferences.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']);
Route::get('{preference}', ['uses' => 'PreferencesController@show', 'as' => 'show']);
@@ -849,7 +829,7 @@ Route::group(
'prefix' => 'v1/webhooks',
'as' => 'api.v1.webhooks.',
],
static function () {
static function (): void {
Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{webhook}', ['uses' => 'ShowController@show', 'as' => 'show']);