Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Clean up a few API calls.
James Cole82c75eb0ca88
diff --git a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php b/app/Api/V1/Controllers/Models/UserGroup/IndexController.phpindex 54a9fd266e..1d070493e1 100644--- a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php+++ b/app/Api/V1/Controllers/Models/UserGroup/IndexController.php@@ -52,12 +52,14 @@ final class IndexController extends Controllerpublic function index(PaginationRequest $request): JsonResponse{- $administrations = $this->repository->get();+ $administrations = $this->repository->get();['page' => $page, 'limit' => $limit, 'offset' => $offset] = $request->attributes->all();- $count = $administrations->count();- $administrations = $administrations->slice($offset, $limit);- $paginator = new LengthAwarePaginator($administrations, $count, $limit, $page);- $transformer = new UserGroupTransformer();+ $count = $administrations->count();+ $transformer = new UserGroupTransformer();+ $administrations = $administrations->slice($offset, $limit);+ $administrations = $transformer->collectMetaData($administrations);++ $paginator = new LengthAwarePaginator($administrations, $count, $limit, $page);return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);}diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.phpindex a557f35188..12fe598ecb 100644--- a/app/Api/V1/Controllers/Summary/BasicController.php+++ b/app/Api/V1/Controllers/Summary/BasicController.php@@ -239,7 +239,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, $sums[$currencyId]['sum'] ?? '0', false),- 'local_icon' => 'balance-scale','sub_title' => Amount::formatAnything($currency, $expenses[$currencyId]['sum'] ?? '0', false).' + '.Amount::formatAnything($currency, $incomes[$currencyId]['sum'] ?? '0', false),@@ -253,7 +252,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, $expenses[$currencyId]['sum'] ?? '0', false),- 'local_icon' => 'balance-scale','sub_title' => '',];$return[] = [@@ -265,7 +263,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, $incomes[$currencyId]['sum'] ?? '0', false),- 'local_icon' => 'balance-scale','sub_title' => '',];}@@ -281,7 +278,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, '0', false),- 'local_icon' => 'balance-scale','sub_title' => Amount::formatAnything($currency, '0', false).' + '.Amount::formatAnything($currency, '0', false),];$return[] = [@@ -293,7 +289,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, '0', false),- 'local_icon' => 'balance-scale','sub_title' => '',];$return[] = [@@ -305,7 +300,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatAnything($currency, '0', false),- 'local_icon' => 'balance-scale','sub_title' => '',];}@@ -346,7 +340,6 @@ final class BasicController extends Controller$availableBudget,false),- 'local_icon' => 'money','sub_title' => Amount::formatFlat($currencies[$currencyId]->symbol,$currencies[$currencyId]->decimal_places,@@ -382,7 +375,6 @@ final class BasicController extends Controller'currency_symbol' => $row['currency_symbol'],'currency_decimal_places' => $row['currency_decimal_places'],'value_parsed' => Amount::formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),- 'local_icon' => 'money','sub_title' => Amount::formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $perDay, false),];}@@ -412,7 +404,6 @@ final class BasicController extends Controller'currency_symbol' => $row['currency_symbol'],'currency_decimal_places' => $row['currency_decimal_places'],'value_parsed' => Amount::formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $spentInCurrency, false),- 'local_icon' => 'money','sub_title' => Amount::formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $perDay, false),];}@@ -431,7 +422,6 @@ final class BasicController extends Controller// 'currency_symbol' => $currency->symbol,// 'currency_decimal_places' => $currency->decimal_places,// 'value_parsed' => Amount::formatFlat($currency->symbol, $currency->decimal_places, '0', false),- // 'local_icon' => 'money',// 'sub_title' => Amount::formatFlat(// $currency->symbol,// $currency->decimal_places,@@ -488,7 +478,6 @@ final class BasicController extends Controller'currency_symbol' => $data['currency_symbol'],'currency_decimal_places' => $data['currency_decimal_places'],'value_parsed' => Amount::formatFlat($data['currency_symbol'], $data['currency_decimal_places'], $data['balance'], false),- 'local_icon' => 'line-chart','sub_title' => '',];}@@ -502,7 +491,6 @@ final class BasicController extends Controller'currency_symbol' => $this->primaryCurrency->symbol,'currency_decimal_places' => $this->primaryCurrency->decimal_places,'value_parsed' => Amount::formatFlat($this->primaryCurrency->symbol, $this->primaryCurrency->decimal_places, '0', false),- 'local_icon' => 'line-chart','sub_title' => '',];}@@ -593,7 +581,6 @@ final class BasicController extends Controller'currency_symbol' => $info['symbol'],'currency_decimal_places' => $info['decimal_places'],'value_parsed' => Amount::formatFlat($info['symbol'], $info['decimal_places'], $amount, false),- 'local_icon' => 'check','sub_title' => '',];}@@ -612,7 +599,6 @@ final class BasicController extends Controller'currency_symbol' => $info['symbol'],'currency_decimal_places' => $info['decimal_places'],'value_parsed' => Amount::formatFlat($info['symbol'], $info['decimal_places'], $amount, false),- 'local_icon' => 'calendar-o','sub_title' => '',];}@@ -631,7 +617,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatFlat($currency->symbol, $currency->decimal_places, '0', false),- 'local_icon' => 'check','sub_title' => '',];$return[] = [@@ -643,7 +628,6 @@ final class BasicController extends Controller'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,'value_parsed' => Amount::formatFlat($currency->symbol, $currency->decimal_places, '0', false),- 'local_icon' => 'calendar-o','sub_title' => '',];}diff --git a/app/Console/Commands/System/ForcesDecimalSize.php b/app/Console/Commands/System/ForcesDecimalSize.phpindex 6e60d35f41..4433937272 100644--- a/app/Console/Commands/System/ForcesDecimalSize.php+++ b/app/Console/Commands/System/ForcesDecimalSize.php@@ -195,7 +195,7 @@ class ForcesDecimalSize extends Command*/private function correctAmountsByCurrency(): void{- $enabled = TransactionCurrency::whereEnabled(1)->get();+ $enabled = TransactionCurrency::query()->get();/** @var TransactionCurrency $currency */foreach ($enabled as $currency) {diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.phpindex c764bf56f0..cf7bec2e0d 100644--- a/app/Repositories/Budget/BudgetLimitRepository.php+++ b/app/Repositories/Budget/BudgetLimitRepository.php@@ -304,7 +304,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface, UserGroupif (null === $currency) {$currency = Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);}- $currency->enabled = true;+ $currency->enabled = false;$currency->save();// find the budget:@@ -387,7 +387,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface, UserGroupif (null === $currency) {$currency = $budgetLimit->transactionCurrency ?? Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);}- $currency->enabled = true;+ $currency->enabled = false;$currency->save();// this is a lame trick to communicate with the observer.diff --git a/app/Rules/IsValidBulkClause.php b/app/Rules/IsValidBulkClause.phpindex c676c683a4..1b75488664 100644--- a/app/Rules/IsValidBulkClause.php+++ b/app/Rules/IsValidBulkClause.php@@ -80,12 +80,22 @@ class IsValidBulkClause implements ValidationRulereturn false;}+ if(is_string($array[$clause])) {+ $this->error = (string) trans(sprintf('validation.invalid_%s_key', $clause));++ return false;+ }/*** @var string $arrayKey* @var mixed $arrayValue*/foreach ($array[$clause] as $arrayKey => $arrayValue) {+ if(is_string($arrayValue)) {+ $this->error = (string) trans(sprintf('validation.invalid_%s_key', $clause));++ return false;+ }if (!array_key_exists($arrayKey, $this->rules[$clause])) {$this->error = (string) trans(sprintf('validation.invalid_%s_key', $clause));diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.phpindex 1ab0013455..d2ee222aca 100644--- a/app/Services/Internal/Support/AccountServiceTrait.php+++ b/app/Services/Internal/Support/AccountServiceTrait.php@@ -539,7 +539,7 @@ trait AccountServiceTrait// use default currency:$currency = Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);}- $currency->enabled = true;+ $currency->enabled = false;$currency->save();return $currency;diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.phpindex 21db673bd3..73d06c72f1 100644--- a/app/Services/Internal/Update/BillUpdateService.php+++ b/app/Services/Internal/Update/BillUpdateService.php@@ -56,7 +56,7 @@ class BillUpdateService) ?? Amount::getPrimaryCurrencyByUserGroup($bill->user->userGroup);// enable the currency if it isn't.- $currency->enabled = true;+ $currency->enabled = false;$currency->save();$bill->transaction_currency_id = $currency->id;$bill->save();diff --git a/routes/api.php b/routes/api.phpindex f6e0693728..3cf8277c90 100644--- a/routes/api.php+++ b/routes/api.php@@ -53,7 +53,6 @@ Route::group();// Autocomplete controllers-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Autocomplete',@@ -81,7 +80,6 @@ Route::group();// exchange rates-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate',@@ -114,7 +112,6 @@ Route::group();// CHART ROUTES-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -127,7 +124,6 @@ Route::group();// Chart accounts-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -139,7 +135,6 @@ Route::group(});-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -151,7 +146,6 @@ Route::group(});-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Chart',@@ -166,7 +160,6 @@ Route::group(// DATA ROUTES// Export data API routes-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data\Export',@@ -188,7 +181,6 @@ Route::group();// Destroy data API route-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data',@@ -200,7 +192,6 @@ Route::group(});-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data',@@ -213,7 +204,6 @@ Route::group();// Bulk update API routes-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Data\Bulk',@@ -228,7 +218,6 @@ Route::group(// INSIGHTS ROUTES// Insight in expenses:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Insight\Expense',@@ -242,6 +231,8 @@ Route::group(Route::get('total', ['uses' => 'PeriodController@total', 'as' => 'total']);Route::get('bill', ['uses' => 'BillController@bill', 'as' => 'bill']);Route::get('no-bill', ['uses' => 'BillController@noBill', 'as' => 'no-bill']);+ Route::get('subscription', ['uses' => 'BillController@bill', 'as' => 'subscription']);+ Route::get('no-subscription', ['uses' => 'BillController@noBill', 'as' => 'no-subscription']);Route::get('budget', ['uses' => 'BudgetController@budget', 'as' => 'budget']);Route::get('no-budget', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']);Route::get('category', ['uses' => 'CategoryController@category', 'as' => 'category']);@@ -256,7 +247,6 @@ Route::group(});// insight in income-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Insight\Income',@@ -302,7 +292,6 @@ Route::group();// SUMMARY CONTROLLER// BASIC-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Summary',@@ -316,7 +305,6 @@ Route::group(// MODELS// Accounts API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Account',@@ -337,7 +325,6 @@ Route::group();// Attachment API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Attachment',@@ -356,7 +343,6 @@ Route::group();// User group API routes.-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\UserGroup',@@ -376,7 +362,6 @@ Route::group();// Bills API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Bill',@@ -396,7 +381,6 @@ Route::group(});-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Bill',@@ -417,7 +401,6 @@ Route::group();// Available Budget API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\AvailableBudget',@@ -434,7 +417,6 @@ Route::group();// Budget and Budget Limit API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models',@@ -463,7 +445,6 @@ 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',@@ -476,7 +457,6 @@ Route::group();// Category API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Category',@@ -496,7 +476,6 @@ Route::group();// Object Group API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\ObjectGroup',@@ -515,7 +494,6 @@ Route::group();// Piggy Bank API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\PiggyBank',@@ -536,7 +514,6 @@ Route::group();// Recurrence API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Recurrence',@@ -559,7 +536,6 @@ Route::group();// Rules API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Rule',@@ -582,7 +558,6 @@ Route::group();// Rules API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\RuleGroup',@@ -603,7 +578,6 @@ Route::group();// Tag API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Tag',@@ -622,7 +596,6 @@ Route::group(});// Transaction API routes:-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Transaction',@@ -641,7 +614,6 @@ Route::group(});-// TODO validate API documentation.Route::group(['namespace' => 'FireflyIII\Api\V1\Controllers\Models\Transaction',