From 87d292ca27b3e3e749bd828db50c9b80677a16c7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 Aug 2025 14:33:14 +0200 Subject: [PATCH] Rename method from default to primary. --- .../Models/TransactionCurrency/ShowController.php | 2 +- .../Models/TransactionCurrency/StoreController.php | 2 +- .../Models/TransactionCurrency/UpdateController.php | 4 ++-- app/Http/Controllers/NewUserController.php | 2 +- app/Repositories/Currency/CurrencyRepository.php | 4 ++-- app/Repositories/Currency/CurrencyRepositoryInterface.php | 2 +- app/Repositories/UserGroup/UserGroupRepository.php | 2 +- app/Repositories/UserGroups/Currency/CurrencyRepository.php | 4 ++-- .../UserGroups/Currency/CurrencyRepositoryInterface.php | 2 +- routes/api.php | 5 ++--- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php index 73b6b1de3e..481896505c 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -126,7 +126,7 @@ class ShowController extends Controller * * @throws FireflyException */ - public function showDefault(): JsonResponse + public function showPrimary(): JsonResponse { /** @var User $user */ $user = auth()->user(); diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php index d3ef22fb29..5e4364043f 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -73,7 +73,7 @@ class StoreController extends Controller { $currency = $this->repository->store($request->getAll()); if (true === $request->boolean('default')) { - $this->repository->makeDefault($currency); + $this->repository->makePrimary($currency); app('preferences')->mark(); } $manager = $this->getManager(); diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index 2516a34c67..f9a45ffdee 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -101,12 +101,12 @@ class UpdateController extends Controller /** * @throws FireflyException */ - public function makeDefault(TransactionCurrency $currency): JsonResponse + public function makePrimary(TransactionCurrency $currency): JsonResponse { /** @var User $user */ $user = auth()->user(); $this->repository->enable($currency); - $this->repository->makeDefault($currency); + $this->repository->makePrimary($currency); app('preferences')->mark(); diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index ab53751cce..271c70e692 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -112,7 +112,7 @@ class NewUserController extends Controller $this->createCashWalletAccount($currency, $language); // create cash wallet account // store currency preference: - $currencyRepository->makeDefault($currency); + $currencyRepository->makePrimary($currency); // store frontpage preferences: $accounts = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray(); diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 3acdfc5593..ce52a5f503 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -417,7 +417,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf // currency must be made default. if (true === $default) { - $this->makeDefault($currency); + $this->makePrimary($currency); } /** @var CurrencyUpdateService $service */ @@ -426,7 +426,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf return $service->update($currency, $data); } - public function makeDefault(TransactionCurrency $currency): void + public function makePrimary(TransactionCurrency $currency): void { $current = app('amount')->getPrimaryCurrencyByUserGroup($this->userGroup); Log::debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id)); diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index f45f5642d2..820b57c73c 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -102,7 +102,7 @@ interface CurrencyRepositoryInterface public function isFallbackCurrency(TransactionCurrency $currency): bool; - public function makeDefault(TransactionCurrency $currency): void; + public function makePrimary(TransactionCurrency $currency): void; public function searchCurrency(string $search, int $limit): Collection; diff --git a/app/Repositories/UserGroup/UserGroupRepository.php b/app/Repositories/UserGroup/UserGroupRepository.php index 5301b87f9f..f8c9e3a488 100644 --- a/app/Repositories/UserGroup/UserGroupRepository.php +++ b/app/Repositories/UserGroup/UserGroupRepository.php @@ -209,7 +209,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte $currency = $repository->find((int) $data['primary_currency_id']); } if (null !== $currency) { - $repository->makeDefault($currency); + $repository->makePrimary($currency); } diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepository.php b/app/Repositories/UserGroups/Currency/CurrencyRepository.php index 409ebeef5d..7928ec74e6 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepository.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepository.php @@ -365,7 +365,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface // currency must be made default. if (true === $default) { - $this->makeDefault($currency); + $this->makePrimary($currency); } /** @var CurrencyUpdateService $service */ @@ -374,7 +374,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $service->update($currency, $data); } - public function makeDefault(TransactionCurrency $currency): void + public function makePrimary(TransactionCurrency $currency): void { $current = app('amount')->getPrimaryCurrencyByUserGroup($this->userGroup); Log::debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id)); diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php b/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php index f876c65e84..8c34e22708 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php @@ -89,7 +89,7 @@ interface CurrencyRepositoryInterface public function isFallbackCurrency(TransactionCurrency $currency): bool; - public function makeDefault(TransactionCurrency $currency): void; + public function makePrimary(TransactionCurrency $currency): void; public function searchCurrency(string $search, int $limit): Collection; diff --git a/routes/api.php b/routes/api.php index 09a72d07f4..1e3bcc8933 100644 --- a/routes/api.php +++ b/routes/api.php @@ -617,15 +617,14 @@ Route::group( 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']); - Route::get('native', ['uses' => 'ShowController@showDefault', 'as' => 'show.native']); + Route::get('primary', ['uses' => 'ShowController@showPrimary', 'as' => 'show.primary']); Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']); Route::put('{currency_code?}', ['uses' => 'UpdateController@update', 'as' => 'update']); Route::delete('{currency_code}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']); Route::post('{currency_code}/enable', ['uses' => 'UpdateController@enable', 'as' => 'enable']); Route::post('{currency_code}/disable', ['uses' => 'UpdateController@disable', 'as' => 'disable']); - Route::post('{currency_code}/default', ['uses' => 'UpdateController@makeDefault', 'as' => 'default']); + Route::post('{currency_code}/primary', ['uses' => 'UpdateController@makePrimary', 'as' => 'update.primary']); Route::get('{currency_code}/accounts', ['uses' => 'ListController@accounts', 'as' => 'accounts']); Route::get('{currency_code}/available-budgets', ['uses' => 'ListController@availableBudgets', 'as' => 'available-budgets']);