Clean up API code and fix test code.

app/Api/V1/Controllers/CurrencyController.php

@@ -58,11 +58,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CurrencyController.
@@ -110,9 +108,7 @@ class CurrencyController extends Controller
      */
     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // read type from URI
         $type = $request->get('type') ?? 'all';
@@ -143,9 +139,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -160,22 +153,17 @@ class CurrencyController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request             $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function availableBudgets(Request $request, TransactionCurrency $currency): JsonResponse
+    public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
         /** @var User $admin */
         $admin = auth()->user();
 
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $manager = $this->getManager();
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -197,9 +185,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.available_budgets', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -213,17 +198,14 @@ class CurrencyController extends Controller
     /**
      * List all bills
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function bills(Request $request, TransactionCurrency $currency): JsonResponse
+    public function bills(TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         /** @var BillRepositoryInterface $repository */
         $repository = app(BillRepositoryInterface::class);
@@ -243,9 +225,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]) . $this->buildParams());
 
-
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -259,20 +238,17 @@ class CurrencyController extends Controller
     /**
      * List all budget limits
      *
-     * @param Request             $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function budgetLimits(Request $request, TransactionCurrency $currency): JsonResponse
+    public function budgetLimits(TransactionCurrency $currency): JsonResponse
     {
         /** @var BudgetLimitRepositoryInterface $blRepository */
         $blRepository = app(BudgetLimitRepositoryInterface::class);
 
-        $manager      = new Manager;
-        $baseUrl      = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager      = $this->getManager();
         $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection   = $blRepository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
@@ -280,8 +256,6 @@ class CurrencyController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.budget_limits', [$currency->code]) . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -295,20 +269,17 @@ class CurrencyController extends Controller
     /**
      * Show a list of known exchange rates
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function cer(Request $request, TransactionCurrency $currency): JsonResponse
+    public function cer(TransactionCurrency $currency): JsonResponse
     {
         // create some objects:
-        $manager    = new Manager;
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager    = $this->getManager();
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getExchangeRates($currency);
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
 
         $count         = $collection->count();
@@ -316,8 +287,6 @@ class CurrencyController extends Controller
         $paginator     = new LengthAwarePaginator($exchangeRates, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.cer', [$currency->code]) . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var CurrencyExchangeRateTransformer $transformer */
         $transformer = app(CurrencyExchangeRateTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -357,22 +326,19 @@ class CurrencyController extends Controller
     /**
      * Disable a currency.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function disable(Request $request, TransactionCurrency $currency): JsonResponse
+    public function disable(TransactionCurrency $currency): JsonResponse
     {
         // must be unused.
         if ($this->repository->currencyInUse($currency)) {
             return response()->json([], 409);
         }
         $this->repository->disable($currency);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
@@ -390,18 +356,15 @@ class CurrencyController extends Controller
     /**
      * Enable a currency.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function enable(Request $request, TransactionCurrency $currency): JsonResponse
+    public function enable(TransactionCurrency $currency): JsonResponse
     {
         $this->repository->enable($currency);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
@@ -419,12 +382,10 @@ class CurrencyController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAll();
@@ -435,9 +396,7 @@ class CurrencyController extends Controller
         $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
 
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager         = $this->getManager();
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -454,22 +413,19 @@ class CurrencyController extends Controller
     /**
      * Make the currency a default currency.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function makeDefault(Request $request, TransactionCurrency $currency): JsonResponse
+    public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
         $this->repository->enable($currency);
 
         app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         $this->parameters->set('defaultCurrency', $currency);
 
@@ -486,19 +442,14 @@ class CurrencyController extends Controller
     /**
      * List all recurring transactions.
      *
-     * @param Request             $request
-     *
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function recurrences(Request $request, TransactionCurrency $currency): JsonResponse
+    public function recurrences(TransactionCurrency $currency): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $manager = $this->getManager();
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
@@ -529,9 +480,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]) . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -546,16 +494,14 @@ class CurrencyController extends Controller
     /**
      * List all of them.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function rules(Request $request, TransactionCurrency $currency): JsonResponse
+    public function rules(TransactionCurrency $currency): JsonResponse
     {
-        $manager  = new Manager;
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager  = $this->getManager();
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
@@ -583,9 +529,6 @@ class CurrencyController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -600,17 +543,14 @@ class CurrencyController extends Controller
     /**
      * Show a currency.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionCurrency $currency): JsonResponse
+    public function show(TransactionCurrency $currency): JsonResponse
     {
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager         = $this->getManager();
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -640,9 +580,7 @@ class CurrencyController extends Controller
                 app('preferences')->set('currencyPreference', $currency->code);
                 app('preferences')->mark();
             }
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+            $manager         = $this->getManager();
             $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
             $this->parameters->set('defaultCurrency', $defaultCurrency);
 
@@ -675,9 +613,7 @@ class CurrencyController extends Controller
         $this->parameters->set('type', $type);
 
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         /** @var User $admin */
         $admin = auth()->user();
@@ -734,9 +670,7 @@ class CurrencyController extends Controller
             app('preferences')->mark();
         }
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);