Merge branch 'release/5.5.0-beta.1' into main

# Conflicts:
#	.github/ISSUE_TEMPLATE/Custom.md

.ci/phpstan.neon

@@ -9,6 +9,7 @@ parameters:
     - '#is not allowed to extend#'
     - '#is neither abstract nor final#'
     - '#Control structures using switch should not be used\.#'
+    - '#has a nullable return type declaration#'
   paths:
     - ../app
     - ../database
@@ -16,4 +17,4 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 0
+  level: 5

.ci/phpstan.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Install composer packages
-composer install --no-suggest --no-scripts --no-ansi
+composer install --no-scripts --no-ansi
 
 # enable test .env file.
 cp .ci/.env.ci .env

.deploy/heroku/.locales

@@ -9,13 +9,13 @@ fi_FI
 fr_FR
 hu_HU
 it_IT
-lt_LT
 nb_NO
 nl_NL
 pl_PL
 pt_BR
 ro_RO
 ru_RU
+sk_SK
 sv_SE
 vi_VN
 zh-hans_CN

.env.example

@@ -10,7 +10,6 @@ APP_DEBUG=false
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
-# If you generate a new one all existing attachments must be considered LOST.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
@@ -53,6 +52,11 @@ LOG_CHANNEL=stack
 # nothing will get logged, ever.
 APP_LOG_LEVEL=notice
 
+# Audit log level.
+# set to "emergency" if you dont want to store audit logs.
+# leave on info otherwise.
+AUDIT_LOG_LEVEL=info
+
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -143,6 +147,7 @@ SPARKPOST_SECRET=
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
+SEND_LOGIN_NEW_IP_WARNING=true
 
 # These messages contain (sensitive) transaction information:
 SEND_REPORT_JOURNALS=true
@@ -179,11 +184,25 @@ AUTHENTICATION_GUARD=web
 # Some systems use X-Auth headers. In that case, use HTTP_X_AUTH_USERNAME or HTTP_X_AUTH_EMAIL
 # Depending on your system, REMOTE_USER may need to be changed to HTTP_REMOTE_USER
 #
-# Firefly III won't be able to send emails when the header you use isn't an email address.
+# If this header is 'unexpectedly empty', check out the documentation.
+# https://docs.firefly-iii.org/advanced-installation/authentication
 #
 AUTHENTICATION_GUARD_HEADER=REMOTE_USER
 
-# Likewise, it's impossible to log out users who's authentication is handled by an external system.
+#
+# Firefly III uses email addresses as user identifiers. When you're using an external authentication guard
+# that doesn't do this, Firefly III is incapable of emailing you. Messages sent to "Bill Gates" always fail.
+#
+# However, if you set this value, Firefly III will store the value from this header as the user's backup
+# email address and use it to communicate. So user "Bill Gates" could still have
+# the email address "bill@microsoft.com".
+#
+# Example value: AUTHENTICATION_GUARD_EMAIL=HTTP_X_AUTH_EMAIL
+#
+AUTHENTICATION_GUARD_EMAIL=
+
+
+# It's impossible to log out users who's authentication is handled by an external system.
 # Enter a custom URL here that will force a logout (your authentication provider can tell you).
 # Setting this variable only works when AUTHENTICATION_GUARD != web
 #
@@ -257,6 +276,11 @@ TRACKER_URL=
 # To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
 SEND_TELEMETRY=false
 
+#
+# Firefly III supports webhooks. These are security sensitive and must be enabled manually first.
+#
+ALLOW_WEBHOOKS=false
+
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.

.gitattributes

@@ -3,3 +3,6 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+/tests       export-ignore
+/phpunit.xml export-ignore
+/.ci export-ignore

.github/.mergify.yml

@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: PR on main is never approved.
+    conditions:
+      - base=main
+    actions:
+      close:
+        message: Please reopen this PR on the `develop` branch. Thank you.

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help Firefly III improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
@@ -13,7 +16,12 @@ I am running Firefly III version x.x.x, and my problem is:
 <!-- What do you need to do to trigger this bug? -->
 
 **Extra info**
-<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
+<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). 
+
+DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
+
+-->
+
 
 **Bonus points**
 <!-- Before you submit, verify the following please: -->

.github/ISSUE_TEMPLATE/Custom.md

@@ -10,7 +10,11 @@ I am running Firefly III version x.x.x.
 <!-- (if relevant of course) -->
 
 **Extra info**
-<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). --> 
+<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). 
+
+DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
+
+--> 
 
 **Bonus points**
 

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea or feature for Firefly III
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
@@ -28,4 +31,4 @@ Please describe your feature request:
 
 - Make a drawing
 - Donate money (just kidding ;)
--->
+-->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://github.com/firefly-iii/firefly-iii/discussions
+    about: Please ask and answer questions here.

.github/contributing.md

@@ -1,15 +1,3 @@
-# Welcome to Firefly III on Github!
+# [Contributing guidelines](https://docs.firefly-iii.org/other-pages/contributing)
 
-:+1::tada: Thank you for taking the time to contribute something to Firefly III!
-
-## Feature requests
-
-I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:james@firefly-iii.org).
-
-## Pull requests
-
-When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `main` branch.
-
-## Translations :us: :fr: :de:
-
-If you see a spelling error, grammatical error or a weird translation in your language, please join [our CrowdIn](https://crowdin.com/project/firefly-iii) project. There, you can submit your translations and fixes. The GitHub repository will download these automatically and they will be included in the next release.
+[Contributing guidelines](https://docs.firefly-iii.org/other-pages/contributing)

.github/funding.yml

@@ -2,4 +2,3 @@
 
 github: jc5
 patreon: JC5
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L62W7DVD5ETPC&source=url

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: "Close stale issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          stale-pr-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          days-before-stale: 14
+          days-before-close: 7
+          exempt-issue-labels: 'enhancement,feature,bug,announcement'

.travis.yml

@@ -14,7 +14,6 @@ branches:
 
 before_script:
 - phpenv config-rm xdebug.ini || return 0
-- composer global require hirak/prestissimo --no-plugins --no-scripts
 
 script:
 - "./.ci/phpstan.sh"

app/Api/V1/Controllers/AboutController.php

@@ -60,7 +60,7 @@ class AboutController extends Controller
             'driver'      => $currentDriver,
         ];
 
-        return response()->json(['data' => $data])->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -78,6 +78,6 @@ class AboutController extends Controller
 
         $resource = new Item(auth()->user(), $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/AccountController.php

@@ -102,7 +102,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -155,7 +155,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -191,7 +191,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -211,7 +211,7 @@ class AccountController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -233,7 +233,7 @@ class AccountController extends Controller
 
         $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -283,7 +283,7 @@ class AccountController extends Controller
         $resource = new FractalCollection($groups, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -306,6 +306,6 @@ class AccountController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/AttachmentController.php

@@ -95,8 +95,8 @@ class AttachmentController extends Controller
      * @param Attachment $attachment
      *
      * @codeCoverageIgnore
-     * @throws   FireflyException
      * @return LaravelResponse
+     * @throws   FireflyException
      */
     public function download(Attachment $attachment): LaravelResponse
     {
@@ -160,7 +160,7 @@ class AttachmentController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -179,7 +179,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -187,8 +187,8 @@ class AttachmentController extends Controller
      *
      * @param AttachmentStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(AttachmentStoreRequest $request): JsonResponse
     {
@@ -202,7 +202,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -225,7 +225,7 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -41,7 +41,6 @@ class AccountController extends Controller
     use AccountFilter;
 
     private array                      $balanceTypes;
-
     private AccountRepositoryInterface $repository;
 
 
@@ -76,16 +75,14 @@ class AccountController extends Controller
         $query = $data['query'];
         $date  = $data['date'] ?? today(config('app.timezone'));
 
-        /** @var AccountRepositoryInterface $repository */
-        $repository      = app(AccountRepositoryInterface::class);
         $return          = [];
-        $result          = $repository->searchAccount((string) $query, $types, $data['limit']);
+        $result          = $this->repository->searchAccount((string)$query, $types, $data['limit']);
         $defaultCurrency = app('amount')->getDefaultCurrency();
 
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;
-            $currency        = $repository->getAccountCurrency($account) ?? $defaultCurrency;
+            $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
 
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
                 $balance         = app('steam')->balance($account, $date);
@@ -100,6 +97,7 @@ class AccountController extends Controller
                 'currency_id'             => $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
             ];
         }
@@ -108,11 +106,14 @@ class AccountController extends Controller
         $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
 
 
-        usort($return, function ($a, $b) use ($order) {
+        usort(
+            $return, function ($a, $b) use ($order) {
             $pos_a = array_search($a['type'], $order);
             $pos_b = array_search($b['type'], $order);
+
             return $pos_a - $pos_b;
-        });
+        }
+        );
 
         return response()->json($return);
     }

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -58,7 +58,6 @@ class BillController extends Controller
     }
 
     /**
-     * TODO add limit
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -58,7 +58,6 @@ class BudgetController extends Controller
     }
 
     /**
-     * TODO add limit
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -89,7 +89,7 @@ class CurrencyController extends Controller
      */
     public function currencies(AutocompleteRequest $request): JsonResponse
     {
-        $data   = $request->getData();
+        $data       = $request->getData();
         $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
         $result     = [];
 

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -76,7 +76,7 @@ class PiggyBankController extends Controller
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency           = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currency   = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
             $response[] = [
                 'id'                      => $piggy->id,
                 'name'                    => $piggy->name,
@@ -103,9 +103,9 @@ class PiggyBankController extends Controller
         $response        = [];
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency           = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
-            $currentAmount      = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
-            $response[] = [
+            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $response[]    = [
                 'id'                      => $piggy->id,
                 'name'                    => $piggy->name,
                 'name_with_balance'       => sprintf(

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -111,7 +111,7 @@ class AvailableBudgetController extends Controller
         $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -132,7 +132,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -145,6 +145,9 @@ class AvailableBudgetController extends Controller
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
         $data = $request->getAll();
+        $data['start']->startOfDay();
+        $data['end']->endOfDay();
+
         /** @var TransactionCurrencyFactory $factory */
         $factory  = app(TransactionCurrencyFactory::class);
         $currency = $factory->find($data['currency_id'], $data['currency_code']);
@@ -162,7 +165,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -202,7 +205,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/BillController.php

@@ -24,7 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\BillRequest;
+use FireflyIII\Api\V1\Requests\BillUpdateRequest;
+use FireflyIII\Api\V1\Requests\BillStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Bill;
@@ -49,8 +50,7 @@ class BillController extends Controller
 {
     use TransactionFilter;
 
-    /** @var BillRepositoryInterface The bill repository */
-    private $repository;
+    private BillRepositoryInterface $repository;
 
 
     /**
@@ -103,7 +103,7 @@ class BillController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -143,7 +143,7 @@ class BillController extends Controller
         $resource = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -178,7 +178,7 @@ class BillController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -199,18 +199,18 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store a bill.
      *
-     * @param BillRequest $request
+     * @param BillStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(BillRequest $request): JsonResponse
+    public function store(BillStoreRequest $request): JsonResponse
     {
         $bill    = $this->repository->store($request->getAll());
         $manager = $this->getManager();
@@ -221,7 +221,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -279,18 +279,18 @@ class BillController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update a bill.
      *
-     * @param BillRequest $request
+     * @param BillUpdateRequest $request
      * @param Bill        $bill
      *
      * @return JsonResponse
      */
-    public function update(BillRequest $request, Bill $bill): JsonResponse
+    public function update(BillUpdateRequest $request, Bill $bill): JsonResponse
     {
         $data    = $request->getAll();
         $bill    = $this->repository->update($bill, $data);
@@ -302,7 +302,7 @@ class BillController extends Controller
 
         $resource = new Item($bill, $transformer, 'bills');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/BudgetController.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use Exception;
-use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Api\V1\Requests\BudgetStoreRequest;
 use FireflyIII\Api\V1\Requests\BudgetUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
@@ -109,7 +107,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -138,7 +136,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -185,7 +183,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($budgets, $transformer, 'budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -206,7 +204,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -214,9 +212,9 @@ class BudgetController extends Controller
      *
      * @param BudgetStoreRequest $request
      *
+     * @return JsonResponse
      * @throws FireflyException
      *
-     * @return JsonResponse
      */
     public function store(BudgetStoreRequest $request): JsonResponse
     {
@@ -229,7 +227,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -293,7 +291,7 @@ class BudgetController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -316,7 +314,7 @@ class BudgetController extends Controller
 
         $resource = new Item($budget, $transformer, 'budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

app/Api/V1/Controllers/BudgetLimitController.php

@@ -24,7 +24,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 
-use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
+use FireflyIII\Api\V1\Requests\BudgetLimitStoreRequest;
+use FireflyIII\Api\V1\Requests\BudgetLimitUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\BudgetLimit;
@@ -49,11 +50,8 @@ class BudgetLimitController extends Controller
 {
     use TransactionFilter;
 
-    /** @var BudgetLimitRepositoryInterface */
-    private $blRepository;
-
-    /** @var BudgetRepositoryInterface The budget repository */
-    private $repository;
+    private BudgetLimitRepositoryInterface $blRepository;
+    private BudgetRepositoryInterface      $repository;
 
 
     /**
@@ -104,9 +102,10 @@ class BudgetLimitController extends Controller
     public function index(Request $request): JsonResponse
     {
         $manager  = $this->getManager();
-        $budgetId = (int) ($request->get('budget_id') ?? 0);
+        $manager->parseIncludes('budget');
+        $budgetId = (int)($request->get('budget_id') ?? 0);
         $budget   = $this->repository->findNull($budgetId);
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $this->parameters->set('budget_id', $budgetId);
 
         $collection = new Collection;
@@ -129,7 +128,7 @@ class BudgetLimitController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -150,19 +149,19 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store a newly created resource in storage.
      *
-     * @param BudgetLimitRequest $request
+     * @param BudgetLimitStoreRequest $request
      *
      * @return JsonResponse
      * @throws FireflyException
      *
      */
-    public function store(BudgetLimitRequest $request): JsonResponse
+    public function store(BudgetLimitStoreRequest $request): JsonResponse
     {
         $data               = $request->getAll();
         $data['start_date'] = $data['start'];
@@ -178,7 +177,7 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -192,7 +191,7 @@ class BudgetLimitController extends Controller
      */
     public function transactions(Request $request, BudgetLimit $budgetLimit): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -231,22 +230,22 @@ class BudgetLimitController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param BudgetLimitRequest $request
-     * @param BudgetLimit        $budgetLimit
+     * @param BudgetLimitUpdateRequest $request
+     * @param BudgetLimit              $budgetLimit
      *
      * @return JsonResponse
      */
-    public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
+    public function update(BudgetLimitUpdateRequest $request, BudgetLimit $budgetLimit): JsonResponse
     {
-        $data           = $request->getAll();
-        $budgetLimit    = $this->blRepository->update($budgetLimit, $data);
-        $manager        = $this->getManager();
+        $data        = $request->getAll();
+        $budgetLimit = $this->blRepository->update($budgetLimit, $data);
+        $manager     = $this->getManager();
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -254,7 +253,7 @@ class BudgetLimitController extends Controller
 
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/CategoryController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\CategoryRequest;
+use FireflyIII\Api\V1\Requests\CategoryStoreRequest;
+use FireflyIII\Api\V1\Requests\CategoryUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Category;
@@ -46,9 +47,7 @@ use League\Fractal\Resource\Item;
 class CategoryController extends Controller
 {
     use TransactionFilter;
-
-    /** @var CategoryRepositoryInterface The category repository */
-    private $repository;
+    private CategoryRepositoryInterface $repository;
 
 
     /**
@@ -99,7 +98,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -147,7 +146,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($categories, $transformer, 'categories');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -169,18 +168,18 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store new category.
      *
-     * @param CategoryRequest $request
+     * @param CategoryStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(CategoryRequest $request): JsonResponse
+    public function store(CategoryStoreRequest $request): JsonResponse
     {
         $category = $this->repository->store($request->getAll());
         $manager  = $this->getManager();
@@ -191,7 +190,7 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -247,18 +246,18 @@ class CategoryController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update the category.
      *
-     * @param CategoryRequest $request
+     * @param CategoryUpdateRequest $request
      * @param Category        $category
      *
      * @return JsonResponse
      */
-    public function update(CategoryRequest $request, Category $category): JsonResponse
+    public function update(CategoryUpdateRequest $request, Category $category): JsonResponse
     {
         $data     = $request->getAll();
         $category = $this->repository->update($category, $data);
@@ -270,7 +269,7 @@ class CategoryController extends Controller
 
         $resource = new Item($category, $transformer, 'categories');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

app/Api/V1/Controllers/Chart/AccountController.php

@@ -149,7 +149,7 @@ class AccountController extends Controller
         foreach ($tempData as $entry) {
             $currencyId                               = $entry['currency_id'];
             $name                                     = $entry['name'];
-            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
+            $chartData[$currencyId]['entries'][$name] = round((float) $entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
         }
         $chartData = array_values($chartData);
 
@@ -206,11 +206,11 @@ class AccountController extends Controller
             /** @var Carbon $currentStart */
             $currentStart = clone $start;
             $range        = app('steam')->balanceInRange($account, $start, clone $end);
-            $previous     = round(array_values($range)[0], 12);
+            $previous     = round((float) array_values($range)[0], 12);
             while ($currentStart <= $end) {
                 $format   = $currentStart->format('Y-m-d');
                 $label    = $currentStart->format('Y-m-d');
-                $balance  = array_key_exists($format, $range) ? round($range[$format], 12) : $previous;
+                $balance  = array_key_exists($format, $range) ? round((float) $range[$format], 12) : $previous;
                 $previous = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;
@@ -300,7 +300,7 @@ class AccountController extends Controller
         foreach ($tempData as $entry) {
             $currencyId                               = $entry['currency_id'];
             $name                                     = $entry['name'];
-            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
+            $chartData[$currencyId]['entries'][$name] = round((float) $entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
         }
         $chartData = array_values($chartData);
 

app/Api/V1/Controllers/Chart/AvailableBudgetController.php

@@ -31,7 +31,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
 
 /**
  * Class AvailableBudgetController
@@ -106,7 +105,7 @@ class AvailableBudgetController extends Controller
                 'currency_decimal_places' => $currency->decimal_places,
                 'type'                    => 'line', // line, area or bar
                 'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => [round($left, $currency->decimal_places)],
+                'entries'                 => [round((float) $left, $currency->decimal_places)],
             ],
         ];
 

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -58,13 +58,10 @@ class BudgetController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-                //$this->generator     = app(GeneratorInterface::class);
                 $this->repository    = app(BudgetRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
 
-                //$this->nbRepository  = app(NoBudgetRepositoryInterface::class);
-
                 return $next($request);
             }
         );
@@ -134,94 +131,6 @@ class BudgetController extends Controller
         return $arr;
     }
 
-    /**
-     * @param array $budgetNames
-     * @param array $currencyNames
-     *
-     * @return array
-     */
-    private function createSets(array $budgetNames, array $currencyNames): array
-    {
-        $return = [];
-        foreach ($currencyNames as $currencyName) {
-            $entries = [];
-            foreach ($budgetNames as $budgetName) {
-                $label           = sprintf('%s (%s)', $budgetName, $currencyName);
-                $entries[$label] = '0';
-            }
-
-            // left
-            $return['left'] = [
-                'label'         => sprintf('%s (%s)', trans('firefly.left'), $currencyName),
-                'data_type'     => 'left',
-                'currency_name' => $currencyName,
-                'type'          => 'bar',
-                'yAxisID'       => 0, // 0, 1, 2
-                'entries'       => $entries,
-            ];
-
-            // spent_capped
-            $return['spent_capped'] = [
-                'label'         => sprintf('%s (%s)', trans('firefly.spent'), $currencyName),
-                'data_type'     => 'spent_capped',
-                'currency_name' => $currencyName,
-                'type'          => 'bar',
-                'yAxisID'       => 0, // 0, 1, 2
-                'entries'       => $entries,
-            ];
-
-            // overspent
-            $return['overspent'] = [
-                'label'         => sprintf('%s (%s)', trans('firefly.overspent'), $currencyName),
-                'data_type'     => 'overspent',
-                'currency_name' => $currencyName,
-                'type'          => 'bar',
-                'yAxisID'       => 0, // 0, 1, 2
-                'entries'       => $entries,
-            ];
-
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param array $basic
-     * @param array $sets
-     *
-     * @return array
-     */
-    private function fillSets(array $basic, array $sets): array
-    {
-        foreach ($sets as $set) {
-            $label                                    = $set['label'];
-            //$basic['spent']['entries'][$label]        = $set['entries']['spent'];
-            $basic['spent_capped']['entries'][$label] = $set['entries']['spent_capped'];
-            $basic['left']['entries'][$label]         = $set['entries']['left'];
-            $basic['overspent']['entries'][$label]    = $set['entries']['overspent'];
-        }
-
-        return $basic;
-    }
-
-    /**
-     * @param array $expenses
-     *
-     * @return array
-     */
-    private function filterNulls(array $expenses): array
-    {
-        $return = [];
-        /** @var array|null $arr */
-        foreach ($expenses as $arr) {
-            if ([] !== $arr) {
-                $return[] = $arr;
-            }
-        }
-
-        return $return;
-    }
-
     /**
      * @param Budget $budget
      * @param Carbon $start
@@ -292,10 +201,97 @@ class BudgetController extends Controller
         $return['entries']['spent']        = $sumSpent;
         $return['entries']['amount']       = $limit->amount;
         $return['entries']['spent_capped'] = 1 === bccomp($sumSpent, $limit->amount) ? $limit->amount : $sumSpent;
-        $return['entries']['left']         = 1 === bccomp($limit->amount, $sumSpent) ? bcadd($set['sum'], $limit->amount) : '0'; // left
+        $return['entries']['left']         = 1 === bccomp($limit->amount, $sumSpent) ? bcadd($set['sum'], $limit->amount) : '0';              // left
         $return['entries']['overspent']    = 1 === bccomp($limit->amount, $sumSpent) ? '0' : bcmul(bcadd($set['sum'], $limit->amount), '-1'); // overspent
 
         return $return;
     }
 
+    /**
+     * @param array $expenses
+     *
+     * @return array
+     */
+    private function filterNulls(array $expenses): array
+    {
+        $return = [];
+        /** @var array|null $arr */
+        foreach ($expenses as $arr) {
+            if ([] !== $arr) {
+                $return[] = $arr;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param array $budgetNames
+     * @param array $currencyNames
+     *
+     * @return array
+     */
+    private function createSets(array $budgetNames, array $currencyNames): array
+    {
+        $return = [];
+        foreach ($currencyNames as $currencyName) {
+            $entries = [];
+            foreach ($budgetNames as $budgetName) {
+                $label           = sprintf('%s (%s)', $budgetName, $currencyName);
+                $entries[$label] = '0';
+            }
+
+            // left
+            $return['left'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.left'), $currencyName),
+                'data_type'     => 'left',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // spent_capped
+            $return['spent_capped'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.spent'), $currencyName),
+                'data_type'     => 'spent_capped',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // overspent
+            $return['overspent'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.overspent'), $currencyName),
+                'data_type'     => 'overspent',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param array $basic
+     * @param array $sets
+     *
+     * @return array
+     */
+    private function fillSets(array $basic, array $sets): array
+    {
+        foreach ($sets as $set) {
+            $label                                    = $set['label'];
+            $basic['spent_capped']['entries'][$label] = $set['entries']['spent_capped'];
+            $basic['left']['entries'][$label]         = $set['entries']['left'];
+            $basic['overspent']['entries'][$label]    = $set['entries']['overspent'];
+        }
+
+        return $basic;
+    }
+
 }

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -38,15 +38,10 @@ use Illuminate\Http\JsonResponse;
  */
 class CategoryController extends Controller
 {
-    /** @var CategoryRepositoryInterface */
-    private $categoryRepository;
-
-    /** @var NoCategoryRepositoryInterface */
-    private $noCatRepository;
-
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
-
+    private CategoryRepositoryInterface   $categoryRepository;
+    private NoCategoryRepositoryInterface $noCatRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private array                         $categories;
 
     /**
      * AccountController constructor.
@@ -63,6 +58,7 @@ class CategoryController extends Controller
                 $this->categoryRepository = app(CategoryRepositoryInterface::class);
                 $this->opsRepository      = app(OperationsRepositoryInterface::class);
                 $this->noCatRepository    = app(NoCategoryRepositoryInterface::class);
+                $this->categories         = [];
                 $this->categoryRepository->setUser($user);
                 $this->opsRepository->setUser($user);
                 $this->noCatRepository->setUser($user);
@@ -87,53 +83,75 @@ class CategoryController extends Controller
         /** @var Carbon $end */
         $end = $dates['end'];
 
+        $tempData     = [];
+        $spentWith    = $this->opsRepository->listExpenses($start, $end);
+        $spentWithout = $this->noCatRepository->listExpenses($start, $end);
 
-        $tempData      = [];
-        $spentWith     = $this->opsRepository->listExpenses($start, $end);
-        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
-        $categories    = [];
+        /** @var array $set */
+        foreach ([$spentWith, $spentWithout,] as $set) {
+            $tempData = $this->processArray($tempData, $set);
+        }
 
+        $chartData = $this->sortArray($tempData);
 
-        foreach ([$spentWith, $spentWithout, ] as $set) {
-            foreach ($set as $currency) {
-                foreach ($currency['categories'] as $category) {
-                    $categories[] = $category['name'];
-                    $outKey       = sprintf('%d-e', $currency['currency_id']);
-                    $tempData[$outKey] = $tempData[$outKey] ?? [
-                            'currency_id'             => $currency['currency_id'],
-                            'label'                   => (string) trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                            'currency_code'           => $currency['currency_code'],
-                            'currency_symbol'         => $currency['currency_symbol'],
-                            'currency_decimal_places' => $currency['currency_decimal_places'],
-                            'type'                    => 'bar', // line, area or bar
-                            'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [],
-                        ];
+        return response()->json($chartData);
+    }
 
-                    foreach ($category['transaction_journals'] as $journal) {
-                        // is it expense or income?
-                        $currentKey                              = sprintf('%d-%s', $currency['currency_id'], 'e');
-                        $name                                    = $category['name'];
-                        $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
-                        $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
-                    }
+    /**
+     * @param array $tempData
+     * @param array $set
+     *
+     * @return array
+     */
+    private function processArray(array $tempData, array $set): array
+    {
+        foreach ($set as $currency) {
+            foreach ($currency['categories'] as $category) {
+                $this->categories[] = $category['name'];
+                $outKey             = sprintf('%d-e', $currency['currency_id']);
+                $tempData[$outKey]  = $tempData[$outKey] ?? [
+                        'currency_id'             => $currency['currency_id'],
+                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
+                        'currency_code'           => $currency['currency_code'],
+                        'currency_symbol'         => $currency['currency_symbol'],
+                        'currency_decimal_places' => $currency['currency_decimal_places'],
+                        'type'                    => 'bar', // line, area or bar
+                        'yAxisID'                 => 0, // 0, 1, 2
+                        'entries'                 => [],
+                    ];
+
+                foreach ($category['transaction_journals'] as $journal) {
+                    // is it expense or income?
+                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], 'e');
+                    $name                                    = $category['name'];
+                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
                 }
             }
         }
 
+        return $tempData;
+    }
+
+    /**
+     * @param array $tempData
+     *
+     * @return array
+     */
+    private function sortArray(array $tempData): array
+    {
         // re-sort every spent array and add 0 for missing entries.
         foreach ($tempData as $index => $set) {
             $oldSet = $set['entries'];
             $newSet = [];
-            foreach ($categories as $category) {
+            foreach ($this->categories as $category) {
                 $value             = $oldSet[$category] ?? '0';
                 $value             = -1 === bccomp($value, '0') ? bcmul($value, '-1') : $value;
                 $newSet[$category] = $value;
             }
             $tempData[$index]['entries'] = $newSet;
         }
-        $chartData = array_values($tempData);
 
-        return response()->json($chartData);
+        return array_values($tempData);
     }
 }

app/Api/V1/Controllers/ConfigurationController.php

@@ -71,24 +71,7 @@ class ConfigurationController extends Controller
     {
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the configuration.
-     *
-     * @param ConfigurationRequest $request
-     * @param string               $name
-     *
-     * @return JsonResponse
-     */
-    public function update(ConfigurationRequest $request, string $name): JsonResponse
-    {
-        $data = $request->getAll();
-        app('fireflyconfig')->set($name, $data['value']);
-        $configData = $this->getConfigData();
-
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -114,4 +97,21 @@ class ConfigurationController extends Controller
             'single_user_mode'        => null === $singleUser ? null : $singleUser->data,
         ];
     }
+
+    /**
+     * Update the configuration.
+     *
+     * @param ConfigurationRequest $request
+     * @param string               $name
+     *
+     * @return JsonResponse
+     */
+    public function update(ConfigurationRequest $request, string $name): JsonResponse
+    {
+        $data = $request->getAll();
+        app('fireflyconfig')->set($name, $data['value']);
+        $configData = $this->getConfigData();
+
+        return response()->json(['data' => $configData])->header('Content-Type', self::CONTENT_TYPE);
+    }
 }

app/Api/V1/Controllers/Controller.php

@@ -44,9 +44,9 @@ abstract class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
+    protected const CONTENT_TYPE = 'application/vnd.api+json';
     protected ParameterBag $parameters;
 
-
     /**
      * Controller constructor.
      */
@@ -54,43 +54,17 @@ abstract class Controller extends BaseController
     {
         // get global parameters
         $this->parameters = $this->getParameters();
-    }
+        $this->middleware(
+            function ($request, $next) {
+                if (auth()->check()) {
+                    $language = app('steam')->getLanguage();
+                    app()->setLocale($language);
+                }
 
-    /**
-     * Method to help build URI's.
-     *
-     * @return string
-     */
-    final protected function buildParams(): string
-    {
-        $return = '?';
-        $params = [];
-        foreach ($this->parameters as $key => $value) {
-            if ('page' === $key) {
-                continue;
+                return $next($request);
             }
-            if ($value instanceof Carbon) {
-                $params[$key] = $value->format('Y-m-d');
-                continue;
-            }
-            $params[$key] = $value;
-        }
-        $return .= http_build_query($params);
+        );
 
-        return $return;
-    }
-
-    /**
-     * @return Manager
-     */
-    final protected function getManager(): Manager
-    {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        return $manager;
     }
 
     /**
@@ -101,7 +75,7 @@ abstract class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag  = new ParameterBag;
-        $page = (int) request()->get('page');
+        $page = (int)request()->get('page');
         if (0 === $page) {
             $page = 1;
         }
@@ -128,11 +102,47 @@ abstract class Controller extends BaseController
         foreach ($integers as $integer) {
             $value = request()->query->get($integer);
             if (null !== $value) {
-                $bag->set($integer, (int) $value);
+                $bag->set($integer, (int)$value);
             }
         }
 
         return $bag;
 
     }
+
+    /**
+     * Method to help build URI's.
+     *
+     * @return string
+     */
+    final protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return $return . http_build_query($params);
+    }
+
+    /**
+     * @return Manager
+     */
+    final protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
 }

app/Api/V1/Controllers/CurrencyController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\CurrencyRequest;
+use FireflyIII\Api\V1\Requests\CurrencyUpdateRequest;
+use FireflyIII\Api\V1\Requests\CurrencyStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
@@ -37,7 +38,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
@@ -68,11 +68,8 @@ class CurrencyController extends Controller
 {
     use AccountFilter, TransactionFilter;
 
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $repository;
-
-    /** @var UserRepositoryInterface The user repository */
-    private $userRepository;
+    private CurrencyRepositoryInterface $repository;
+    private UserRepositoryInterface     $userRepository;
 
 
     /**
@@ -148,7 +145,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($accounts, $transformer, 'accounts');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -161,22 +158,14 @@ class CurrencyController extends Controller
      */
     public function availableBudgets(TransactionCurrency $currency): JsonResponse
     {
-        /** @var User $admin */
-        $admin = auth()->user();
-
         $manager = $this->getManager();
         // types to get, page size:
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of available budgets. Count it and split it.
-
-        /** @var BudgetRepositoryInterface $repository */
-        $repository = app(BudgetRepositoryInterface::class);
-
         /** @var AvailableBudgetRepositoryInterface $abRepository */
         $abRepository = app(AvailableBudgetRepositoryInterface::class);
 
-        $repository->setUser($admin);
         $collection       = $abRepository->getAvailableBudgetsByCurrency($currency);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -193,7 +182,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -208,10 +197,10 @@ class CurrencyController extends Controller
     {
         $manager = $this->getManager();
 
-        /** @var BillRepositoryInterface $repository */
-        $repository = app(BillRepositoryInterface::class);
+        /** @var BillRepositoryInterface $billRepos */
+        $billRepos  = app(BillRepositoryInterface::class);
         $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $unfiltered = $repository->getBills();
+        $unfiltered = $billRepos->getBills();
 
         // filter and paginate list:
         $collection = $unfiltered->filter(
@@ -233,7 +222,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -264,7 +253,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -295,7 +284,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($exchangeRates, $transformer, 'currency_exchange_rates');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -303,9 +292,9 @@ class CurrencyController extends Controller
      *
      * @param TransactionCurrency $currency
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(TransactionCurrency $currency): JsonResponse
     {
@@ -354,7 +343,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -380,7 +369,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -412,7 +401,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($currencies, $transformer, 'currencies');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -440,7 +429,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -459,9 +448,9 @@ class CurrencyController extends Controller
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
-        /** @var RecurringRepositoryInterface $repository */
-        $repository = app(RecurringRepositoryInterface::class);
-        $unfiltered = $repository->getAll();
+        /** @var RecurringRepositoryInterface $recurringRepos */
+        $recurringRepos = app(RecurringRepositoryInterface::class);
+        $unfiltered     = $recurringRepos->getAll();
 
         // filter selection
         $collection = $unfiltered->filter(
@@ -492,7 +481,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -510,9 +499,9 @@ class CurrencyController extends Controller
         $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
-        /** @var RuleRepositoryInterface $repository */
-        $repository = app(RuleRepositoryInterface::class);
-        $unfiltered = $repository->getAll();
+        /** @var RuleRepositoryInterface $ruleRepos */
+        $ruleRepos  = app(RuleRepositoryInterface::class);
+        $unfiltered = $ruleRepos->getAll();
 
         $collection = $unfiltered->filter(
             static function (Rule $rule) use ($currency) {
@@ -541,7 +530,7 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -565,7 +554,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -586,18 +575,18 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Store new currency.
      *
-     * @param CurrencyRequest $request
+     * @param CurrencyStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(CurrencyRequest $request): JsonResponse
+    public function store(CurrencyStoreRequest $request): JsonResponse
     {
         $currency = $this->repository->store($request->getAll());
         if (true === $request->boolean('default')) {
@@ -614,7 +603,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -670,18 +659,18 @@ class CurrencyController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update a currency.
      *
-     * @param CurrencyRequest     $request
+     * @param CurrencyUpdateRequest     $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
      */
-    public function update(CurrencyRequest $request, TransactionCurrency $currency): JsonResponse
+    public function update(CurrencyUpdateRequest $request, TransactionCurrency $currency): JsonResponse
     {
         $data     = $request->getAll();
         $currency = $this->repository->update($currency, $data);
@@ -702,7 +691,7 @@ class CurrencyController extends Controller
 
         $resource = new Item($currency, $transformer, 'currencies');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * CurrencyExchangeRateController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * 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\Controllers;
-
-use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Services\Currency\ExchangeRateInterface;
-use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use League\Fractal\Resource\Item;
-
-/**
- * Class CurrencyExchangeRateController
- *
- * @codeCoverageIgnore
- */
-class CurrencyExchangeRateController extends Controller
-{
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $repository;
-
-
-    /**
-     * CurrencyExchangeRateController constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($admin);
-
-                return $next($request);
-            }
-        );
-
-    }
-
-    /**
-     * Show an exchange rate.
-     *
-     * @param Request $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function index(Request $request): JsonResponse
-    {
-        $manager      = $this->getManager();
-        $fromCurrency = $this->repository->findByCodeNull($request->get('from') ?? 'EUR');
-        $toCurrency   = $this->repository->findByCodeNull($request->get('to') ?? 'USD');
-
-        if (null === $fromCurrency) {
-            throw new FireflyException('200007: Unknown source currency');
-        }
-        if (null === $toCurrency) {
-            throw new FireflyException('200007: Unknown destination currency');
-        }
-
-        /** @var Carbon $dateObj */
-        $dateObj = Carbon::createFromFormat('Y-m-d', $request->get('date') ?? date('Y-m-d'));
-        $this->parameters->set('from', $fromCurrency->code);
-        $this->parameters->set('to', $toCurrency->code);
-        $this->parameters->set('date', $dateObj->format('Y-m-d'));
-        $this->parameters->set('amount', $request->get('amount'));
-
-        $rate = $this->repository->getExchangeRate($fromCurrency, $toCurrency, $dateObj);
-        if (null === $rate) {
-            /** @var User $admin */
-            $admin = auth()->user();
-            // create service:
-            /** @var ExchangeRateInterface $service */
-            $service = app(ExchangeRateInterface::class);
-            $service->setUser($admin);
-            $rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
-        }
-        /** @var CurrencyExchangeRateTransformer $transformer */
-        $transformer = app(CurrencyExchangeRateTransformer::class);
-        $transformer->setParameters($this->parameters);
-        $resource = new Item($rate, $transformer, 'currency_exchange_rates');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-}

app/Api/V1/Controllers/Data/DestroyController.php

@@ -160,31 +160,6 @@ class DestroyController extends Controller
         return response()->json([], 204);
     }
 
-    /**
-     * @param array $types
-     */
-    private function destroyAccounts(array $types): void
-    {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app(AccountRepositoryInterface::class);
-        $collection = $repository->getAccountsByType($types);
-        $service    = app(AccountDestroyService::class);
-        /** @var Account $account */
-        foreach ($collection as $account) {
-            $service->destroy($account, null);
-        }
-    }
-
-    /**
-     *
-     */
-    private function destroyBills(): void
-    {
-        /** @var BillRepositoryInterface $repository */
-        $repository = app(BillRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
     /**
      *
      */
@@ -206,18 +181,11 @@ class DestroyController extends Controller
     /**
      *
      */
-    private function destroyCategories(): void
+    private function destroyBills(): void
     {
-        /** @var CategoryRepositoryInterface $categoryRepos */
-        $categoryRepos = app(CategoryRepositoryInterface::class);
-        $categoryRepos->destroyAll();
-    }
-
-    private function destroyObjectGroups(): void
-    {
-        /** @var ObjectGroupRepositoryInterface $repository */
-        $repository = app(ObjectGroupRepositoryInterface::class);
-        $repository->deleteAll();
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $repository->destroyAll();
     }
 
     /**
@@ -230,16 +198,6 @@ class DestroyController extends Controller
         $repository->destroyAll();
     }
 
-    /**
-     *
-     */
-    private function destroyRecurringTransactions(): void
-    {
-        /** @var RecurringRepositoryInterface $repository */
-        $repository = app(RecurringRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
     /**
      *
      */
@@ -250,6 +208,26 @@ class DestroyController extends Controller
         $repository->destroyAll();
     }
 
+    /**
+     *
+     */
+    private function destroyRecurringTransactions(): void
+    {
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyCategories(): void
+    {
+        /** @var CategoryRepositoryInterface $categoryRepos */
+        $categoryRepos = app(CategoryRepositoryInterface::class);
+        $categoryRepos->destroyAll();
+    }
+
     /**
      *
      */
@@ -260,6 +238,28 @@ class DestroyController extends Controller
         $tagRepository->destroyAll();
     }
 
+    private function destroyObjectGroups(): void
+    {
+        /** @var ObjectGroupRepositoryInterface $repository */
+        $repository = app(ObjectGroupRepositoryInterface::class);
+        $repository->deleteAll();
+    }
+
+    /**
+     * @param array $types
+     */
+    private function destroyAccounts(array $types): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $collection = $repository->getAccountsByType($types);
+        $service    = app(AccountDestroyService::class);
+        /** @var Account $account */
+        foreach ($collection as $account) {
+            $service->destroy($account, null);
+        }
+    }
+
     /**
      * @param array $types
      */
@@ -267,10 +267,10 @@ class DestroyController extends Controller
     {
         /** @var JournalRepositoryInterface $repository */
         $repository = app(JournalRepositoryInterface::class);
-        $journals = $repository->findByType($types);
-        $service = app(JournalDestroyService::class);
+        $journals   = $repository->findByType($types);
+        $service    = app(JournalDestroyService::class);
         /** @var TransactionJournal $journal */
-        foreach($journals as $journal) {
+        foreach ($journals as $journal) {
             $service->destroy($journal);
         }
     }

app/Api/V1/Controllers/Insight/Expense/DateController.php

@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+/*
+ * DateController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DateController
+ *
+ * Shows expense information grouped or limited by date.
+ * Ie. all expenses grouped by account + currency.
+ */
+class DateController extends Controller
+{
+    use ApiSupport;
+
+    private CurrencyRepositoryInterface $currencyRepository;
+    private AccountRepositoryInterface  $repository;
+
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *
+     */
+    public function basic(DateRequest $request): JsonResponse
+    {
+        // parameters for chart:
+        $dates = $request->getAll();
+        /** @var Carbon $start */
+        $start = $dates['start'];
+        /** @var Carbon $end */
+        $end = $dates['end'];
+
+        $start->subDay();
+
+        // prep some vars:
+        $currencies = [];
+        $chartData  = [];
+        $tempData   = [];
+
+        // grab all accounts and names
+        $accounts      = $this->repository->getAccountsByType([AccountType::EXPENSE]);
+        $accountNames  = $this->extractNames($accounts);
+        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
+        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
+
+        // loop the end balances. This is an array for each account ($expenses)
+        foreach ($endBalances as $accountId => $expenses) {
+            $accountId = (int)$accountId;
+            // loop each expense entry (each entry can be a different currency).
+            foreach ($expenses as $currencyId => $endAmount) {
+                $currencyId = (int)$currencyId;
+
+                // see if there is an accompanying start amount.
+                // grab the difference and find the currency.
+                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
+                $diff                    = bcsub($endAmount, $startAmount);
+                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
+                if (0 !== bccomp($diff, '0')) {
+                    // store the values in a temporary array.
+                    $tempData[] = [
+                        'id'               => $accountId,
+                        'name'             => $accountNames[$accountId],
+                        'difference'       => bcmul($diff, '-1'),
+                        'difference_float' => ((float)$diff) * -1,
+                        'currency_id'      => $currencyId,
+                        'currency_code'    => $currencies[$currencyId]->code,
+                    ];
+                }
+            }
+        }
+
+
+        // sort temp array by amount.
+        $amounts = array_column($tempData, 'difference_float');
+        array_multisort($amounts, SORT_ASC, $tempData);
+
+        return response()->json($tempData);
+    }
+
+}

app/Api/V1/Controllers/Insight/Income/DateController.php

@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+/*
+ * DateController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DateController
+ *
+ * Shows income information grouped or limited by date.
+ * Ie. all income grouped by revenue + currency.
+ */
+class DateController extends Controller
+{
+    use ApiSupport;
+
+    private CurrencyRepositoryInterface $currencyRepository;
+    private AccountRepositoryInterface  $repository;
+
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *
+     */
+    public function basic(DateRequest $request): JsonResponse
+    {
+        // parameters for chart:
+        $dates = $request->getAll();
+        /** @var Carbon $start */
+        $start = $dates['start'];
+        /** @var Carbon $end */
+        $end = $dates['end'];
+
+        $start->subDay();
+
+        // prep some vars:
+        $currencies = [];
+        $chartData  = [];
+        $tempData   = [];
+
+        // grab all accounts and names
+        $accounts      = $this->repository->getAccountsByType([AccountType::REVENUE]);
+        $accountNames  = $this->extractNames($accounts);
+        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
+        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
+
+        // loop the end balances. This is an array for each account ($expenses)
+        foreach ($endBalances as $accountId => $expenses) {
+            $accountId = (int)$accountId;
+            // loop each expense entry (each entry can be a different currency).
+            foreach ($expenses as $currencyId => $endAmount) {
+                $currencyId = (int)$currencyId;
+
+                // see if there is an accompanying start amount.
+                // grab the difference and find the currency.
+                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
+                $diff                    = bcsub($endAmount, $startAmount);
+                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
+                if (0 !== bccomp($diff, '0')) {
+                    // store the values in a temporary array.
+                    $tempData[] = [
+                        'id'               => $accountId,
+                        'name'             => $accountNames[$accountId],
+                        'difference'       => $diff,
+                        'difference_float' => (float)$diff,
+                        'currency_id'      => $currencyId,
+                        'currency_code'    => $currencies[$currencyId]->code,
+                    ];
+                }
+            }
+        }
+
+
+        // sort temp array by amount.
+        $amounts = array_column($tempData, 'difference_float');
+        array_multisort($amounts, SORT_ASC, $tempData);
+
+        return response()->json($tempData);
+    }
+
+}

app/Api/V1/Controllers/LinkTypeController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\LinkTypeRequest;
+use FireflyIII\Api\V1\Requests\LinkTypeStoreRequest;
+use FireflyIII\Api\V1\Requests\LinkTypeUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\LinkType;
@@ -80,9 +81,9 @@ class LinkTypeController extends Controller
      *
      * @param LinkType $linkType
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(LinkType $linkType): JsonResponse
     {
@@ -122,7 +123,7 @@ class LinkTypeController extends Controller
         $resource = new FractalCollection($linkTypes, $transformer, 'link_types');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -143,19 +144,19 @@ class LinkTypeController extends Controller
 
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
     /**
      * Store new object.
      *
-     * @param LinkTypeRequest $request
+     * @param LinkTypeStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function store(LinkTypeRequest $request): JsonResponse
+    public function store(LinkTypeStoreRequest $request): JsonResponse
     {
         /** @var User $admin */
         $admin = auth()->user();
@@ -173,7 +174,7 @@ class LinkTypeController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -232,20 +233,20 @@ class LinkTypeController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
     /**
      * Update object.
      *
-     * @param LinkTypeRequest $request
+     * @param LinkTypeUpdateRequest $request
      * @param LinkType        $linkType
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
-    public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
+    public function update(LinkTypeUpdateRequest $request, LinkType $linkType): JsonResponse
     {
         if (false === $linkType->editable) {
             throw new FireflyException('200020: Link type cannot be changed.');
@@ -267,7 +268,7 @@ class LinkTypeController extends Controller
 
         $resource = new Item($linkType, $transformer, 'link_types');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/ObjectGroupController.php

@@ -111,7 +111,7 @@ class ObjectGroupController extends Controller
         $resource = new FractalCollection($objectGroups, $transformer, 'object_groups');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -147,7 +147,7 @@ class ObjectGroupController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -167,7 +167,7 @@ class ObjectGroupController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($objectGroup, $transformer, 'object_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -190,6 +190,6 @@ class ObjectGroupController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($objectGroup, $transformer, 'object_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/PiggyBankController.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\PiggyBankRequest;
+use FireflyIII\Api\V1\Requests\PiggyBankUpdateRequest;
 use FireflyIII\Api\V1\Requests\PiggyBankStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
@@ -43,9 +43,7 @@ use League\Fractal\Resource\Item;
  */
 class PiggyBankController extends Controller
 {
-    /** @var PiggyBankRepositoryInterface The piggy bank repository */
-    private $repository;
-
+    private PiggyBankRepositoryInterface $repository;
 
     /**
      * PiggyBankController constructor.
@@ -111,7 +109,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -142,7 +140,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -175,7 +173,7 @@ class PiggyBankController extends Controller
         $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -197,7 +195,7 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -206,8 +204,8 @@ class PiggyBankController extends Controller
      *
      * @param PiggyBankStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(PiggyBankStoreRequest $request): JsonResponse
     {
@@ -220,18 +218,18 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Update piggy bank.
      *
-     * @param PiggyBankRequest $request
+     * @param PiggyBankUpdateRequest $request
      * @param PiggyBank        $piggyBank
      *
      * @return JsonResponse
      */
-    public function update(PiggyBankRequest $request, PiggyBank $piggyBank): JsonResponse
+    public function update(PiggyBankUpdateRequest $request, PiggyBank $piggyBank): JsonResponse
     {
         $data      = $request->getAll();
         $piggyBank = $this->repository->update($piggyBank, $data);
@@ -247,7 +245,7 @@ class PiggyBankController extends Controller
 
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/PreferenceController.php

@@ -101,7 +101,7 @@ class PreferenceController extends Controller
 
         $resource = new FractalCollection($preferences, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -122,7 +122,7 @@ class PreferenceController extends Controller
 
         $resource = new Item($preference, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -161,7 +161,7 @@ class PreferenceController extends Controller
 
         $resource = new Item($result, $transformer, 'preferences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/Preferences/IndexController.php

@@ -0,0 +1,99 @@
+<?php
+/*
+ * IndexController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Preferences;
+
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Facades\Navigation;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class IndexController
+ */
+class IndexController extends Controller
+{
+    public const DATE_FORMAT = 'Y-m-d';
+
+    /**
+     * Return users preferred date range settings, the current period
+     * and some previous / next periods.
+     *
+     * @return JsonResponse
+     */
+    public function dateRanges(): JsonResponse
+    {
+        $range    = app('preferences')->get('viewRange', '1M')->data;
+        $return   = [
+            'range'   => $range,
+            'ranges'  => [],
+            'default' => null,
+        ];
+        $today    = Carbon::today(config('app.timezone'));
+        $start    = Navigation::startOfPeriod($today, $range);
+        $todayStr = $today->format(self::DATE_FORMAT);
+        // optional date ranges. Maybe to be configured later
+        // current $period
+        $title                    = (string)Navigation::periodShow($start, $range);
+        $return['default']        = $title;
+        $return['ranges'][$title] = [$start->format(self::DATE_FORMAT),
+                                     Navigation::endOfPeriod($start, $range)->format(self::DATE_FORMAT)];
+        // previous $period
+        $previousStart            = Navigation::subtractPeriod($start, $range);
+        $title                    = (string)Navigation::periodShow($previousStart, $range);
+        $return['ranges'][$title] = [$previousStart->format(self::DATE_FORMAT),
+                                     Navigation::endOfPeriod($previousStart, $range)->format(self::DATE_FORMAT)];
+        // next $period
+        $nextStart                = Navigation::addPeriod($start, $range, 0);
+        $title                    = (string)Navigation::periodShow($nextStart, $range);
+        $return['ranges'][$title] = [$nextStart->format(self::DATE_FORMAT),
+                                     Navigation::endOfPeriod($nextStart, $range)->format(self::DATE_FORMAT)];
+        // --
+        // last seven days:
+        $seven                    = Carbon::today()->subDays(7);
+        $title                    = (string)trans('firefly.last_seven_days');
+        $return['ranges'][$title] = [$seven->format(self::DATE_FORMAT), $todayStr];
+        // last 30 days:
+        $thirty                   = Carbon::today()->subDays(30);
+        $title                    = (string)trans('firefly.last_thirty_days');
+        $return['ranges'][$title] = [$thirty->format(self::DATE_FORMAT), $todayStr];
+        // last 180 days
+        $long                     = Carbon::today()->subDays(180);
+        $title                    = (string)trans('firefly.last_180_days');
+        $return['ranges'][$title] = [$long->format(self::DATE_FORMAT), $todayStr];
+        // YTD
+        $YTD                      = Carbon::today()->startOfYear();
+        $title                    = (string)trans('firefly.YTD');
+        $return['ranges'][$title] = [$YTD->format(self::DATE_FORMAT), $todayStr];
+        // ---
+        // everything
+        $repository               = app(JournalRepositoryInterface::class);
+        $journal                  = $repository->firstNull();
+        $first                    = null === $journal ? clone $YTD : clone $journal->date;
+        $title                    = (string)trans('firefly.everything');
+        $return['ranges'][$title] = [$first->format(self::DATE_FORMAT), $todayStr];
+
+        return response()->json($return);
+    }
+
+}

app/Api/V1/Controllers/RecurrenceController.php

@@ -119,7 +119,7 @@ class RecurrenceController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -141,7 +141,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($recurrence, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
 
     }
@@ -151,8 +151,8 @@ class RecurrenceController extends Controller
      *
      * @param RecurrenceStoreRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(RecurrenceStoreRequest $request): JsonResponse
     {
@@ -166,7 +166,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($recurrence, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -222,13 +222,13 @@ class RecurrenceController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function trigger(): JsonResponse
     {
@@ -238,7 +238,7 @@ class RecurrenceController extends Controller
             $result = $recurring->fire();
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
-            throw new FireflyException('200022: Error in cron job.',0, $e);
+            throw new FireflyException('200022: Error in cron job.', 0, $e);
         }
         if (false === $result) {
             return response()->json([], 204);
@@ -270,7 +270,7 @@ class RecurrenceController extends Controller
 
         $resource = new Item($category, $transformer, 'recurrences');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/RuleController.php

@@ -28,21 +28,19 @@ use FireflyIII\Api\V1\Requests\RuleTestRequest;
 use FireflyIII\Api\V1\Requests\RuleTriggerRequest;
 use FireflyIII\Api\V1\Requests\RuleUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
-use FireflyIII\TransactionRules\Engine\RuleEngine;
-use FireflyIII\TransactionRules\TransactionMatcher;
+use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use Log;
 
 /**
  * Class RuleController
@@ -124,7 +122,7 @@ class RuleController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -145,7 +143,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -166,7 +164,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -187,7 +185,7 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -208,36 +206,44 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * @param RuleTestRequest $request
      * @param Rule            $rule
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function testRule(RuleTestRequest $request, Rule $rule): JsonResponse
     {
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $parameters = $request->getTestParameters();
-        /** @var Rule $rule */
-        Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
-        /** @var TransactionMatcher $matcher */
-        $matcher = app(TransactionMatcher::class);
-        // set all parameters:
-        $matcher->setRule($rule);
-        $matcher->setStartDate($parameters['start_date']);
-        $matcher->setEndDate($parameters['end_date']);
-        $matcher->setSearchLimit($parameters['search_limit']);
-        $matcher->setTriggeredLimit($parameters['trigger_limit']);
-        $matcher->setAccounts($parameters['accounts']);
 
-        $matchingTransactions = $matcher->findTransactionsByRule();
-        $count                = count($matchingTransactions);
-        $transactions         = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
-        $paginator            = new LengthAwarePaginator($transactions, $count, $pageSize, $this->parameters->get('page'));
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules(new Collection([$rule]));
+
+
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+        }
+
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $transactions = $ruleEngine->find();
+        $count        = $transactions->count();
+
+        $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
 
         // resulting list is presented as JSON thing.
@@ -246,10 +252,10 @@ class RuleController extends Controller
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -265,28 +271,27 @@ class RuleController extends Controller
         // Get parameters specified by the user
         $parameters = $request->getTriggerParameters();
 
-        /** @var RuleEngine $ruleEngine */
-        $ruleEngine = app(RuleEngine::class);
-        $ruleEngine->setUser(auth()->user());
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules(new Collection([$rule]));
 
-        $rules = [$rule->id];
-
-        $ruleEngine->setRulesToApply($rules);
-        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts($parameters['accounts']);
-        $collector->setRange($parameters['start_date'], $parameters['end_date']);
-        $journals = $collector->getExtractedJournals();
-
-        /** @var array $journal */
-        foreach ($journals as $journal) {
-            Log::debug('Start of new journal.');
-            $ruleEngine->processJournalArray($journal);
-            Log::debug('Done with all rules for this group + done with journal.');
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $ruleEngine->fire();
+
         return response()->json([], 204);
     }
 
@@ -310,6 +315,6 @@ class RuleController extends Controller
 
         $resource = new Item($rule, $transformer, 'rules');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/RuleGroupController.php

@@ -24,17 +24,15 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use Exception;
-use FireflyIII\Api\V1\Requests\RuleGroupRequest;
+use FireflyIII\Api\V1\Requests\RuleGroupUpdateRequest;
+use FireflyIII\Api\V1\Requests\RuleGroupStoreRequest;
 use FireflyIII\Api\V1\Requests\RuleGroupTestRequest;
 use FireflyIII\Api\V1\Requests\RuleGroupTriggerRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
-use FireflyIII\TransactionRules\Engine\RuleEngine;
-use FireflyIII\TransactionRules\TransactionMatcher;
+use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\RuleGroupTransformer;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -45,7 +43,6 @@ use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use Log;
 
 /**
  * Class RuleGroupController
@@ -126,7 +123,7 @@ class RuleGroupController extends Controller
         $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -146,7 +143,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -166,7 +163,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -197,7 +194,7 @@ class RuleGroupController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -218,18 +215,18 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
     /**
      * Store new object.
      *
-     * @param RuleGroupRequest $request
+     * @param RuleGroupStoreRequest $request
      *
      * @return JsonResponse
      */
-    public function store(RuleGroupRequest $request): JsonResponse
+    public function store(RuleGroupStoreRequest $request): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->store($request->getAll());
         $manager   = $this->getManager();
@@ -240,7 +237,7 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -248,57 +245,54 @@ class RuleGroupController extends Controller
      * @param RuleGroupTestRequest $request
      * @param RuleGroup            $group
      *
+     * @return JsonResponse
      * @throws FireflyException
      *
-     * @return JsonResponse
      */
     public function testGroup(RuleGroupTestRequest $request, RuleGroup $group): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        Log::debug('Now in testGroup()');
         /** @var Collection $rules */
         $rules = $this->ruleGroupRepository->getActiveRules($group);
         if (0 === $rules->count()) {
             throw new FireflyException('200023: No rules in this rule group.');
         }
-        $parameters           = $request->getTestParameters();
-        $matchingTransactions = [];
+        $parameters = $request->getTestParameters();
 
-        Log::debug(sprintf('Going to test %d rules', $rules->count()));
-        /** @var Rule $rule */
-        foreach ($rules as $rule) {
-            Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
-            /** @var TransactionMatcher $matcher */
-            $matcher = app(TransactionMatcher::class);
-            // set all parameters:
-            $matcher->setRule($rule);
-            $matcher->setStartDate($parameters['start_date']);
-            $matcher->setEndDate($parameters['end_date']);
-            $matcher->setSearchLimit($parameters['search_limit']);
-            $matcher->setTriggeredLimit($parameters['trigger_limit']);
-            $matcher->setAccounts($parameters['accounts']);
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules($rules);
 
-            $result = $matcher->findTransactionsByRule();
-            /** @noinspection AdditionOperationOnArraysInspection */
-            $matchingTransactions = $result + $matchingTransactions;
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
-        // make paginator out of results.
-        $count        = count($matchingTransactions);
-        $transactions = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+        }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
 
-        // make paginator:
-        $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $parameters['page']);
+        // file the rule(s)
+        $transactions = $ruleEngine->find();
+        $count        = $transactions->count();
+
+        $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams());
 
-        $manager     = $this->getManager();
+        // resulting list is presented as JSON thing.
+        $manager = $this->getManager();
+        /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -307,40 +301,40 @@ class RuleGroupController extends Controller
      * @param RuleGroupTriggerRequest $request
      * @param RuleGroup               $group
      *
-     * @throws Exception
      * @return JsonResponse
+     * @throws Exception
      */
     public function triggerGroup(RuleGroupTriggerRequest $request, RuleGroup $group): JsonResponse
     {
+        /** @var Collection $rules */
+        $rules = $this->ruleGroupRepository->getActiveRules($group);
+        if (0 === $rules->count()) {
+            throw new FireflyException('200023: No rules in this rule group.');
+        }
+
+        // Get parameters specified by the user
         $parameters = $request->getTriggerParameters();
 
-        /** @var Collection $collection */
-        $collection = $this->ruleGroupRepository->getActiveRules($group);
-        $rules      = [];
-        /** @var Rule $item */
-        foreach ($collection as $item) {
-            $rules[] = $item->id;
+        /** @var RuleEngineInterface $ruleEngine */
+        $ruleEngine = app(RuleEngineInterface::class);
+        $ruleEngine->setRules($rules);
+
+        // overrule the rule(s) if necessary.
+        if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
-        // start looping.
-        /** @var RuleEngine $ruleEngine */
-        $ruleEngine = app(RuleEngine::class);
-        $ruleEngine->setUser(auth()->user());
-        $ruleEngine->setRulesToApply($rules);
-        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts($parameters['accounts']);
-        $collector->setRange($parameters['start_date'], $parameters['end_date']);
-        $journals = $collector->getExtractedJournals();
-
-        /** @var array $journal */
-        foreach ($journals as $journal) {
-            Log::debug('Start of new journal.');
-            $ruleEngine->processJournalArray($journal);
-            Log::debug('Done with all rules for this group + done with journal.');
+        if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
+            // add a range:
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
+        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => $parameters['accounts']]);
+        }
+
+        // file the rule(s)
+        $ruleEngine->fire();
 
         return response()->json([], 204);
     }
@@ -348,12 +342,12 @@ class RuleGroupController extends Controller
     /**
      * Update a rule group.
      *
-     * @param RuleGroupRequest $request
+     * @param RuleGroupUpdateRequest $request
      * @param RuleGroup        $ruleGroup
      *
      * @return JsonResponse
      */
-    public function update(RuleGroupRequest $request, RuleGroup $ruleGroup): JsonResponse
+    public function update(RuleGroupUpdateRequest $request, RuleGroup $ruleGroup): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll());
         $manager   = $this->getManager();
@@ -364,6 +358,6 @@ class RuleGroupController extends Controller
 
         $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/Search/AccountController.php

@@ -97,6 +97,6 @@ class AccountController extends Controller
         $resource = new FractalCollection($accounts, $transformer, 'accounts');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/Search/TransactionController.php

@@ -45,13 +45,14 @@ class TransactionController extends Controller
      */
     public function search(Request $request, SearchInterface $searcher): JsonResponse
     {
-        $manager = $this->getManager();
-        $fullQuery = (string) $request->get('query');
-        $page      = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
-
+        $manager   = $this->getManager();
+        $fullQuery = (string)$request->get('query');
+        $page      = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
+        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize  = 0 === (int)$request->get('limit') ? $pageSize : (int)$request->get('limit');
         $searcher->parseQuery($fullQuery);
         $searcher->setPage($page);
-        $searcher->setLimit((int) config('firefly.search_result_limit'));
+        $searcher->setLimit($pageSize);
         $groups     = $searcher->searchTransactions();
         $parameters = ['search' => $fullQuery];
         $url        = route('api.v1.search.transactions') . '?' . http_build_query($parameters);
@@ -65,6 +66,6 @@ class TransactionController extends Controller
         $resource = new Collection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($groups));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/SummaryController.php

@@ -47,24 +47,12 @@ use Illuminate\Http\JsonResponse;
  */
 class SummaryController extends Controller
 {
-    /** @var AvailableBudgetRepositoryInterface */
-    private $abRepository;
-
-    /** @var AccountRepositoryInterface */
-    private $accountRepository;
-
-    /** @var BillRepositoryInterface */
-    private $billRepository;
-
-    /** @var BudgetRepositoryInterface */
-    private $budgetRepository;
-
-    /** @var CurrencyRepositoryInterface */
-    private $currencyRepos;
-
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
-
+    private AvailableBudgetRepositoryInterface $abRepository;
+    private AccountRepositoryInterface $accountRepository;
+    private BillRepositoryInterface $billRepository;
+    private BudgetRepositoryInterface $budgetRepository;
+    private CurrencyRepositoryInterface $currencyRepos;
+    private OperationsRepositoryInterface $opsRepository;
 
     /**
      * SummaryController constructor.
@@ -101,8 +89,8 @@ class SummaryController extends Controller
     /**
      * @param DateRequest $request
      *
-     * @throws Exception
      * @return JsonResponse
+     * @throws Exception
      */
     public function basic(DateRequest $request): JsonResponse
     {
@@ -130,30 +118,6 @@ class SummaryController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * Check if date is outside session range.
-     *
-     * @param Carbon $date
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return bool
-     */
-    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
-    {
-        $result = false;
-        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            $result = true;
-        }
-        // start and end in the past? use $end
-        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            $result = true;
-        }
-
-        return $result;
-    }
-
     /**
      * @param Carbon $start
      * @param Carbon $end
@@ -221,7 +185,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('balance-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => round($sums[$currencyId] ?? 0, $currency->decimal_places),
+                'monetary_value'          => round((float) $sums[$currencyId] ?? 0, $currency->decimal_places),
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -234,7 +198,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('spent-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => round($expenses[$currencyId] ?? 0, $currency->decimal_places),
+                'monetary_value'          => round((float) ($expenses[$currencyId] ?? 0), $currency->decimal_places),
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -246,7 +210,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('earned-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => round($incomes[$currencyId] ?? 0, $currency->decimal_places),
+                'monetary_value'          => round((float) ($incomes[$currencyId] ?? 0), $currency->decimal_places),
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -284,7 +248,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('bills-paid-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => round($amount, $currency->decimal_places),
+                'monetary_value'          => round((float) $amount, $currency->decimal_places),
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -304,7 +268,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => round($amount, $currency->decimal_places),
+                'monetary_value'          => round((float) $amount, $currency->decimal_places),
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -322,13 +286,13 @@ class SummaryController extends Controller
      * @param Carbon $start
      * @param Carbon $end
      *
-     * @throws Exception
      * @return array
+     * @throws Exception
      */
     private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
     {
         $return    = [];
-        $today     = new Carbon;
+        $today     = today(config('app.timezone'));
         $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
         $budgets   = $this->budgetRepository->getActiveBudgets();
         $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
@@ -348,7 +312,7 @@ class SummaryController extends Controller
             $return[] = [
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
-                'monetary_value'          => round($leftToSpend, $row['currency_decimal_places']),
+                'monetary_value'          => round((float) $leftToSpend, $row['currency_decimal_places']),
                 'currency_id'             => $row['currency_id'],
                 'currency_code'           => $row['currency_code'],
                 'currency_symbol'         => $row['currency_symbol'],
@@ -408,7 +372,7 @@ class SummaryController extends Controller
         foreach ($netWorthSet as $data) {
             /** @var TransactionCurrency $currency */
             $currency = $data['currency'];
-            $amount   = round($data['balance'], $currency->decimal_places);
+            $amount   = round((float) $data['balance'], $currency->decimal_places);
             if (0.0 === $amount) {
                 continue;
             }
@@ -429,4 +393,28 @@ class SummaryController extends Controller
 
         return $return;
     }
+
+    /**
+     * Check if date is outside session range.
+     *
+     * @param Carbon $date
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return bool
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }

app/Api/V1/Controllers/TagController.php

@@ -115,7 +115,7 @@ class TagController extends Controller
         $resource = new FractalCollection($rules, $transformer, 'tags');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -145,7 +145,7 @@ class TagController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -165,7 +165,7 @@ class TagController extends Controller
 
         $resource = new Item($tag, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -186,7 +186,7 @@ class TagController extends Controller
 
         $resource = new Item($rule, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -239,7 +239,7 @@ class TagController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -260,7 +260,7 @@ class TagController extends Controller
 
         $resource = new Item($rule, $transformer, 'tags');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/TransactionController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\TransactionStoreRequest;
 use FireflyIII\Api\V1\Requests\TransactionUpdateRequest;
+use FireflyIII\Events\DestroyedTransactionGroup;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Exceptions\DuplicateTransactionException;
@@ -36,6 +37,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalAPIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Rules\IsDuplicateTransaction;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
@@ -45,11 +47,13 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Validation\ValidationException;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Validator;
 
 /**
  * Class TransactionController
@@ -59,9 +63,7 @@ class TransactionController extends Controller
     use TransactionFilter;
 
     private TransactionGroupRepositoryInterface $groupRepository;
-
     private JournalAPIRepositoryInterface       $journalAPIRepository;
-
     private JournalRepositoryInterface          $repository;
 
 
@@ -110,7 +112,7 @@ class TransactionController extends Controller
 
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -130,7 +132,7 @@ class TransactionController extends Controller
 
         $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -144,6 +146,8 @@ class TransactionController extends Controller
     public function delete(TransactionGroup $transactionGroup): JsonResponse
     {
         $this->repository->destroyGroup($transactionGroup);
+        // trigger just after destruction
+        event(new DestroyedTransactionGroup($transactionGroup));
 
         return response()->json([], 204);
     }
@@ -173,7 +177,7 @@ class TransactionController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -211,7 +215,7 @@ class TransactionController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -234,7 +238,20 @@ class TransactionController extends Controller
 
         $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show a single transaction, by transaction journal.
+     *
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function showByJournal(TransactionJournal $transactionJournal): JsonResponse
+    {
+        return $this->show($transactionJournal->transactionGroup);
     }
 
     /**
@@ -269,20 +286,7 @@ class TransactionController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show a single transaction, by transaction journal.
-     *
-     * @param TransactionJournal $transactionJournal
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function showByJournal(TransactionJournal $transactionJournal): JsonResponse
-    {
-        return $this->show($transactionJournal->transactionGroup);
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -291,7 +295,7 @@ class TransactionController extends Controller
      * @param TransactionStoreRequest $request
      *
      * @return JsonResponse
-     * @throws FireflyException
+     * @throws FireflyException|ValidationException
      */
     public function store(TransactionStoreRequest $request): JsonResponse
     {
@@ -306,29 +310,16 @@ class TransactionController extends Controller
             $transactionGroup = $this->groupRepository->store($data);
         } catch (DuplicateTransactionException $e) {
             Log::warning('Caught a duplicate transaction. Return error message.');
-            // return bad validation message.
-            // TODO use Laravel's internal validation thing to do this.
-            $response = [
-                'message' => 'The given data was invalid.',
-                'errors'  => [
-                    'transactions.0.description' => [$e->getMessage()],
-                ],
-            ];
-
-            return response()->json($response, 422);
+            $validator = Validator::make(
+                ['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction]
+            );
+            throw new ValidationException($validator);
         } catch (FireflyException $e) {
             Log::warning('Caught an exception. Return error message.');
             Log::error($e->getMessage());
-            // return bad validation message.
-            // TODO use Laravel's internal validation thing to do this.
-            $response = [
-                'message' => 'The given data was invalid.',
-                'errors'  => [
-                    'transactions.0.description' => [sprintf('Internal exception: %s', $e->getMessage())],
-                ],
-            ];
-
-            return response()->json($response, 422);
+            $message   = sprintf('Internal exception: %s', $e->getMessage());
+            $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction]);
+            throw new ValidationException($validator);
         }
         app('preferences')->mark();
         event(new StoredTransactionGroup($transactionGroup, $data['apply_rules'] ?? true));
@@ -355,7 +346,7 @@ class TransactionController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 
@@ -398,6 +389,6 @@ class TransactionController extends Controller
         $transformer->setParameters($this->parameters);
         $resource = new Item($selectedGroup, $transformer, 'transactions');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/TransactionLinkController.php

@@ -126,7 +126,7 @@ class TransactionLinkController extends Controller
         $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -148,7 +148,7 @@ class TransactionLinkController extends Controller
 
         $resource = new Item($journalLink, $transformer, 'transaction_links');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
@@ -157,8 +157,8 @@ class TransactionLinkController extends Controller
      *
      * @param TransactionLinkRequest $request
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function store(TransactionLinkRequest $request): JsonResponse
     {
@@ -179,7 +179,7 @@ class TransactionLinkController extends Controller
 
         $resource = new Item($journalLink, $transformer, 'transaction_links');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -188,8 +188,8 @@ class TransactionLinkController extends Controller
      * @param TransactionLinkRequest $request
      * @param TransactionJournalLink $journalLink
      *
-     * @throws FireflyException
      * @return JsonResponse
+     * @throws FireflyException
      */
     public function update(TransactionLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
     {
@@ -209,7 +209,7 @@ class TransactionLinkController extends Controller
 
         $resource = new Item($journalLink, $transformer, 'transaction_links');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 }

app/Api/V1/Controllers/UserController.php

@@ -68,9 +68,9 @@ class UserController extends Controller
      *
      * @param User $user
      *
+     * @return JsonResponse
      * @throws FireflyException
      * @codeCoverageIgnore
-     * @return JsonResponse
      */
     public function delete(User $user): JsonResponse
     {
@@ -113,7 +113,7 @@ class UserController extends Controller
         $resource = new FractalCollection($users, $transformer, 'users');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -135,7 +135,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -159,7 +159,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -182,7 +182,7 @@ class UserController extends Controller
 
         $resource = new Item($user, $transformer, 'users');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 

app/Api/V1/Controllers/Webhook/CreateController.php

@@ -0,0 +1,80 @@
+<?php
+declare(strict_types=1);
+/*
+ * CreateController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Webhook;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Webhook\CreateRequest;
+use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class CreateController
+ */
+class CreateController extends Controller
+{
+    private WebhookRepositoryInterface $repository;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var WebhookRepositoryInterface repository */
+                $this->repository = app(WebhookRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param CreateRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(CreateRequest $request): JsonResponse
+    {
+        $data    = $request->getData();
+        $webhook = $this->repository->store($data);
+        $manager = $this->getManager();
+        /** @var WebhookTransformer $transformer */
+        $transformer = app(WebhookTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($webhook, $transformer, 'webhooks');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

app/Api/V1/Controllers/Webhook/DeleteController.php

@@ -0,0 +1,75 @@
+<?php
+declare(strict_types=1);
+/*
+ * DeleteController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Webhook;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Webhook;
+use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DeleteController
+ */
+class DeleteController extends Controller
+{
+    private WebhookRepositoryInterface $repository;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var WebhookRepositoryInterface repository */
+                $this->repository = app(WebhookRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Webhook $webhook
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function destroy(Webhook $webhook): JsonResponse
+    {
+        $this->repository->destroy($webhook);
+
+        return response()->json([], 204);
+    }
+
+
+}

app/Api/V1/Controllers/Webhook/EditController.php

@@ -0,0 +1,81 @@
+<?php
+declare(strict_types=1);
+/*
+ * EditController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Webhook;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Webhook\UpdateRequest;
+use FireflyIII\Models\Webhook;
+use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class EditController
+ */
+class EditController extends Controller
+{
+    private WebhookRepositoryInterface $repository;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var WebhookRepositoryInterface repository */
+                $this->repository = app(WebhookRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Webhook       $webhook
+     * @param UpdateRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function update(Webhook $webhook, UpdateRequest $request): JsonResponse
+    {
+        $data    = $request->getData();
+        $webhook = $this->repository->update($webhook, $data);
+        $manager = $this->getManager();
+        /** @var WebhookTransformer $transformer */
+        $transformer = app(WebhookTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($webhook, $transformer, 'webhooks');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V1/Controllers/Webhook/IndexController.php

@@ -0,0 +1,88 @@
+<?php
+declare(strict_types=1);
+/*
+ * IndexController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Webhook;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+/**
+ * Class IndexController
+ */
+class IndexController extends Controller
+{
+    private WebhookRepositoryInterface $repository;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var WebhookRepositoryInterface repository */
+                $this->repository = app(WebhookRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(): JsonResponse
+    {
+        $webhooks  = $this->repository->all();
+        $manager   = $this->getManager();
+        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $count     = $webhooks->count();
+        $bills     = $webhooks->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator = new LengthAwarePaginator($webhooks, $count, $pageSize, $this->parameters->get('page'));
+
+        /** @var WebhookTransformer $transformer */
+        $transformer = app(WebhookTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'webhooks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

app/Api/V1/Middleware/ApiDemoUser.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Middleware;
 
 use Closure;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\Request;
 

app/Api/V1/Requests/AccountStoreRequest.php

@@ -26,7 +26,10 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\UniqueAccountNumber;
+use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -37,18 +40,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AccountStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, AppendsLocationData;
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
 
     /**
      * @return array
@@ -108,12 +100,13 @@ class AccountStoreRequest extends FormRequest
         $accountRoles   = implode(',', config('firefly.accountRoles'));
         $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+        $type           = $this->string('type');
         $rules          = [
             'name'                 => 'required|min:1|uniqueAccountForUser',
             'type'                 => 'required|' . sprintf('in:%s', $types),
-            'iban'                 => 'iban|nullable',
+            'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
             'bic'                  => 'bic|nullable',
-            'account_number'       => 'between:1,255|nullable|uniqueAccountNumberForUser',
+            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber(null, $type)],
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
@@ -132,8 +125,7 @@ class AccountStoreRequest extends FormRequest
             'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
             'notes'                => 'min:0|max:65536',
         ];
-        $rules          = Location::requestRules($rules);
 
-        return $rules;
+        return Location::requestRules($rules);
     }
 }

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -26,7 +26,10 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\UniqueAccountNumber;
+use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -37,17 +40,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AccountUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, AppendsLocationData;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
 
     /**
      * @return array
@@ -112,9 +105,9 @@ class AccountUpdateRequest extends FormRequest
         $rules = [
             'name'                 => sprintf('min:1|uniqueAccountForUser:%d', $account->id),
             'type'                 => sprintf('in:%s', $types),
-            'iban'                 => 'iban|nullable',
+            'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->nullableString('type'))],
             'bic'                  => 'bic|nullable',
-            'account_number'       => sprintf('between:1,255|nullable|uniqueAccountNumberForUser:%d', $account->id),
+            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber($account, $this->nullableString('type'))],
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
@@ -133,8 +126,7 @@ class AccountUpdateRequest extends FormRequest
             'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
             'notes'                => 'min:0|max:65536',
         ];
-        $rules = Location::requestRules($rules);
 
-        return $rules;
+        return Location::requestRules($rules);
     }
 }

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsValidAttachmentModel;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -34,17 +35,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AttachmentStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -33,17 +34,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AttachmentUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Autocomplete;
 
 
+use FireflyIII\Models\AccountType;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -32,18 +34,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AutocompleteRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * @return array
@@ -58,6 +49,9 @@ class AutocompleteRequest extends FormRequest
         $limit = $this->integer('limit');
         $limit = 0 === $limit ? 10 : $limit;
 
+        // remove 'initial balance' from allowed types. its internal
+        $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
+
         return [
             'types' => $array,
             'query' => $this->string('query'),

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -33,17 +34,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AvailableBudgetRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/BillStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * BillRequest.php
+ * BillStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -25,30 +25,19 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 /**
- * Class BillRequest
- *
- * TODO AFTER 4.8,0: split this into two request classes.
+ * Class BillStoreRequest
  *
  * @codeCoverageIgnore
  */
-class BillRequest extends FormRequest
+class BillStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -84,7 +73,7 @@ class BillRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'name'          => 'between:1,255|uniqueObjectForUser:bills,name',
             'amount_min'    => 'numeric|gt:0',
             'amount_max'    => 'numeric|gt:0',
@@ -96,17 +85,6 @@ class BillRequest extends FormRequest
             'active'        => [new IsBoolean],
             'notes'         => 'between:1,65536',
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $bill          = $this->route()->parameter('bill');
-                $rules['name'] .= ',' . $bill->id;
-                break;
-        }
-
-        return $rules;
     }
 
     /**

app/Api/V1/Requests/BillUpdateRequest.php

@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * BillUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class BillUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class BillUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
+        return [
+            'name'          => $this->string('name'),
+            'amount_min'    => $this->string('amount_min'),
+            'amount_max'    => $this->string('amount_max'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+            'date'          => $this->date('date'),
+            'repeat_freq'   => $this->string('repeat_freq'),
+            'skip'          => $this->integer('skip'),
+            'active'        => $active,
+            'order'         => $this->integer('order'),
+            'notes'         => $this->nlString('notes'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $bill          = $this->route()->parameter('bill');
+        return [
+            'name'          => sprintf('between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id),
+            'amount_min'    => 'numeric|gt:0',
+            'amount_max'    => 'numeric|gt:0',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'date'          => 'date',
+            'repeat_freq'   => 'in:weekly,monthly,quarterly,half-year,yearly',
+            'skip'          => 'between:0,31',
+            'active'        => [new IsBoolean],
+            'notes'         => 'between:1,65536',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            static function (Validator $validator) {
+                $data = $validator->getData();
+                $min  = (float) ($data['amount_min'] ?? 0);
+                $max  = (float) ($data['amount_max'] ?? 0);
+                if ($min > $max) {
+                    $validator->errors()->add('amount_min', (string) trans('validation.amount_min_over_max'));
+                }
+            }
+        );
+    }
+}

app/Api/V1/Requests/BudgetLimitStoreRequest.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * BudgetLimitStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class BudgetLimitStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class BudgetLimitStoreRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'budget_id'     => $this->integer('budget_id'),
+            'start'         => $this->date('start'),
+            'end'           => $this->date('end'),
+            'amount'        => $this->string('amount'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'budget_id'     => 'required|exists:budgets,id|belongsToUser:budgets,id',
+            'start'         => 'required|before:end|date',
+            'end'           => 'required|after:start|date',
+            'amount'        => 'required|gt:0',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+        ];
+    }
+
+}

app/Api/V1/Requests/BudgetLimitUpdateRequest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * BudgetLimitRequest.php
+ * BudgetLimitUpdateRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -23,29 +23,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
- * Class BudgetLimitRequest
+ * Class BudgetLimitUpdateRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class BudgetLimitRequest extends FormRequest
+class BudgetLimitUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -85,21 +74,12 @@ class BudgetLimitRequest extends FormRequest
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $rules['budget_id'] = 'required|exists:budgets,id|belongsToUser:budgets,id';
-                break;
-        }
         // if request has a budget already, drop the rule.
         $budget = $this->route()->parameter('budget');
         if (null !== $budget) {
             unset($rules['budget_id']);
         }
 
-
         return $rules;
     }
 

app/Api/V1/Requests/BudgetStoreRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
@@ -36,17 +37,7 @@ use Illuminate\Validation\Validator;
  */
 class BudgetStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, ValidatesAutoBudgetRequest;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/BudgetUpdateRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
@@ -36,17 +37,7 @@ use Illuminate\Validation\Validator;
  */
 class BudgetUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, ValidatesAutoBudgetRequest;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/CategoryStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * CategoryRequest.php
+ * CategoryStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Models\Category;
+use FireflyIII\Rules\ZeroOrMore;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -31,21 +32,10 @@ use Illuminate\Foundation\Http\FormRequest;
  * Class CategoryRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class CategoryRequest extends FormRequest
+class CategoryStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -55,7 +45,8 @@ class CategoryRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'name' => $this->string('name'),
+            'name'  => $this->string('name'),
+            'notes' => $this->nlString('notes'),
         ];
     }
 
@@ -66,20 +57,8 @@ class CategoryRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var Category $category */
-                $category      = $this->route()->parameter('category');
-                $rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id);
-                break;
-        }
-
-        return $rules;
     }
 }

app/Api/V1/Requests/CategoryUpdateRequest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * CategoryUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class CategoryUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class CategoryUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $notes = null;
+        $all   = $this->all();
+        if (array_key_exists('notes', $all)) {
+            $notes = $this->nlString('notes');
+        }
+
+        return [
+            'name'  => $this->string('name'),
+            'notes' => $notes,
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $category = $this->route()->parameter('category');
+
+        return [
+            'name' => sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id),
+        ];
+    }
+}

app/Api/V1/Requests/ConfigurationRequest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -35,17 +36,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class ConfigurationRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.
@@ -56,6 +49,8 @@ class ConfigurationRequest extends FormRequest
     {
         $name = $this->route()->parameter('configName');
         switch ($name) {
+            default:
+                break;
             case 'is_demo_site':
             case 'single_user_mode':
                 return ['value' => $this->boolean('value')];
@@ -75,6 +70,8 @@ class ConfigurationRequest extends FormRequest
     {
         $name = $this->route()->parameter('configName');
         switch ($name) {
+            default:
+                break;
             case 'is_demo_site':
             case 'single_user_mode':
                 return ['value' => ['required', new IsBoolean]];

app/Api/V1/Requests/CurrencyStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * CurrencyRequest.php
+ * CurrencyStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -24,29 +24,19 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 
 /**
- * Class CurrencyRequest
+ * Class CurrencyStoreRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class CurrencyRequest extends FormRequest
+class CurrencyStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -81,7 +71,7 @@ class CurrencyRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'name'           => 'required|between:1,255|unique:transaction_currencies,name',
             'code'           => 'required|between:3,3|unique:transaction_currencies,code',
             'symbol'         => 'required|between:1,8|unique:transaction_currencies,symbol',
@@ -90,20 +80,5 @@ class CurrencyRequest extends FormRequest
             'default'        => [new IsBoolean()],
 
         ];
-
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $currency        = $this->route()->parameter('currency_code');
-                $rules['name']   = 'required|between:1,255|unique:transaction_currencies,name,' . $currency->id;
-                $rules['code']   = 'required|between:3,3|unique:transaction_currencies,code,' . $currency->id;
-                $rules['symbol'] = 'required|between:1,8|unique:transaction_currencies,symbol,' . $currency->id;
-                break;
-        }
-
-        return $rules;
-
     }
 }

app/Api/V1/Requests/CurrencyUpdateRequest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * CurrencyUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+
+/**
+ * Class CurrencyUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class CurrencyUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $enabled = true;
+        $default = false;
+        if (null !== $this->get('enabled')) {
+            $enabled = $this->boolean('enabled');
+        }
+        if (null !== $this->get('default')) {
+            $default = $this->boolean('default');
+        }
+
+        return [
+            'name'           => $this->string('name'),
+            'code'           => $this->string('code'),
+            'symbol'         => $this->string('symbol'),
+            'decimal_places' => $this->integer('decimal_places'),
+            'default'        => $default,
+            'enabled'        => $enabled,
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $currency        = $this->route()->parameter('currency_code');
+        return [
+            'name'           => sprintf('required|between:1,255|unique:transaction_currencies,name,%d', $currency->id),
+            'code'           => sprintf('required|between:3,3|unique:transaction_currencies,code,%d', $currency->id),
+            'symbol'         => sprintf('required|between:1,8|unique:transaction_currencies,symbol,%d', $currency->id),
+            'decimal_places' => 'between:0,20|numeric|min:0|max:20',
+            'enabled'        => [new IsBoolean()],
+            'default'        => [new IsBoolean()],
+        ];
+    }
+}

app/Api/V1/Requests/DataDestroyRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -31,17 +32,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class DataDestroyRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check() && !auth()->user()->hasRole('demo');
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -64,7 +55,7 @@ class DataDestroyRequest extends FormRequest
                  ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers';
 
         return [
-            'objects' => sprintf('min:1|string|in:%s', $valid),
+            'objects' => sprintf('required|min:1|string|in:%s', $valid),
         ];
     }
 }

app/Api/V1/Requests/DateRequest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -35,17 +36,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class DateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/LinkTypeStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * LinkTypeRequest.php
+ * LinkTypeStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -24,29 +24,19 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\LinkType;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
 /**
- * Class LinkTypeRequest
+ * Class LinkTypeStoreRequest
  *
  * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
  */
-class LinkTypeRequest extends FormRequest
+class LinkTypeStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -71,26 +61,10 @@ class LinkTypeRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'name'    => 'required|unique:link_types,name|min:1',
             'outward' => 'required|unique:link_types,outward|min:1|different:inward',
             'inward'  => 'required|unique:link_types,inward|min:1|different:outward',
         ];
-
-
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var LinkType $linkType */
-                $linkType         = $this->route()->parameter('linkType');
-                $rules['name']    = ['required', Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'];
-                $rules['outward'] = ['required', 'different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'];
-                $rules['inward']  = ['required', 'different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'];
-                break;
-        }
-
-        return $rules;
     }
 }

app/Api/V1/Requests/LinkTypeUpdateRequest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * LinkTypeUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Models\LinkType;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+/**
+ * Class LinkTypeUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class LinkTypeUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'    => $this->string('name'),
+            'outward' => $this->string('outward'),
+            'inward'  => $this->string('inward'),
+        ];
+
+
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $linkType         = $this->route()->parameter('linkType');
+        return [
+            'name'    => ['required', Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'],
+            'outward' => ['required', 'different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'],
+            'inward'  => ['required', 'different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'],
+        ];
+    }
+}

app/Api/V1/Requests/ObjectGroupUpdateRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -34,17 +35,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class ObjectGroupUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * @return array

app/Api/V1/Requests/PiggyBankRequest.php

@@ -1,106 +0,0 @@
-<?php
-/**
- * PiggyBankRequest.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * 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;
-
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Rules\IsAssetAccountId;
-use FireflyIII\Rules\LessThanPiggyTarget;
-use FireflyIII\Rules\ZeroOrMore;
-use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Foundation\Http\FormRequest;
-
-/**
- * Class PiggyBankRequest
- *
- * @codeCoverageIgnore
- * TODO AFTER 4.8,0: split this into two request classes.
- */
-class PiggyBankRequest extends FormRequest
-{
-    use ConvertsDataTypes;
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
-
-    /**
-     * Get all data from the request.
-     *
-     * @return array
-     */
-    public function getAll(): array
-    {
-        return [
-            'name'           => $this->string('name'),
-            'account_id'     => $this->integer('account_id'),
-            'targetamount'   => $this->string('target_amount'),
-            'current_amount' => $this->string('current_amount'),
-            'startdate'      => $this->date('start_date'),
-            'targetdate'     => $this->date('target_date'),
-            'notes'          => $this->nlString('notes'),
-            'order'          => $this->integer('order'),
-        ];
-    }
-
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'name'           => 'required|between:1,255|uniquePiggyBankForUser',
-            'current_amount' => ['numeric', new ZeroOrMore, 'lte:target_amount'],
-            'start_date'     => 'date|nullable',
-            'target_date'    => 'date|nullable|after:start_date',
-            'notes'          => 'max:65000',
-        ];
-
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var PiggyBank $piggyBank */
-                $piggyBank               = $this->route()->parameter('piggyBank');
-                $rules['name']           = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
-                $rules['account_id']     = ['belongsToUser:accounts', new IsAssetAccountId];
-                $rules['target_amount']  = 'numeric|gt:0';
-                $rules['current_amount'] = ['numeric', new ZeroOrMore, new LessThanPiggyTarget];
-                break;
-        }
-
-
-        return $rules;
-    }
-
-}

app/Api/V1/Requests/PiggyBankStoreRequest.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Rules\ZeroOrMore;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -34,17 +34,7 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class PiggyBankStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -75,10 +65,10 @@ class PiggyBankStoreRequest extends FormRequest
     {
         return [
             'name'            => 'required|between:1,255|uniquePiggyBankForUser',
-            'current_amount'  => ['numeric', new ZeroOrMore, 'lte:target_amount'],
+            'current_amount'  => ['numeric', 'gte:0', 'lte:target_amount'],
             'account_id'      => 'required|numeric|belongsToUser:accounts,id',
             'object_group_id' => 'numeric|belongsToUser:object_groups,id',
-            'target_amount'   => ['numeric', new ZeroOrMore, 'lte:target_amount', 'required'],
+            'target_amount'   => ['numeric', 'gte:0', 'lte:target_amount', 'required'],
             'start_date'      => 'date|nullable',
             'target_date'     => 'date|nullable|after:start_date',
             'notes'           => 'max:65000',

app/Api/V1/Requests/PiggyBankUpdateRequest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * PiggyBankUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Rules\IsAssetAccountId;
+use FireflyIII\Rules\LessThanPiggyTarget;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class PiggyBankUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class PiggyBankUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        // if the value isn't present, dont return it at all.
+        // TODO this should be the way to collect fields for all API things.
+        // TODO make sure piggy bank uses 'start_date' etc. until right up to DB update.
+        // TODO can we configure this and return it from config?
+
+        // TODO this is the way.
+        $fields = [
+            'name'            => ['name', 'string'],
+            'account_id'      => ['account_id', 'integer'],
+            'targetamount'    => ['target_amount', 'string'],
+            'current_amount'  => ['current_amount', 'string'],
+            'startdate'       => ['start_date', 'date'],
+            'targetdate'      => ['target_date', 'string'],
+            'notes'           => ['notes', 'nlString'],
+            'order'           => ['order', 'integer'],
+            'object_group'    => ['object_group', 'string'],
+            'object_group_id' => ['object_group_id', 'integer'],
+        ];
+        return $this->getAllData($fields);
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $piggyBank = $this->route()->parameter('piggyBank');
+
+        return [
+            'name'           => 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id,
+            'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget],
+            'target_amount'  => 'numeric|gt:0',
+            'start_date'     => 'date|nullable',
+            'target_date'    => 'date|nullable|after:start_date',
+            'notes'          => 'max:65000',
+            'account_id'     => ['belongsToUser:accounts', new IsAssetAccountId],
+        ];
+    }
+
+}

app/Api/V1/Requests/PreferenceRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -33,18 +34,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class PreferenceRequest extends FormRequest
 {
-    use ConvertsDataTypes;
+    use ConvertsDataTypes, ChecksLogin;
+
 
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/RecurrenceStoreRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests;
 use Carbon\Carbon;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRecurrenceData;
 use FireflyIII\Validation\CurrencyValidation;
@@ -39,17 +40,9 @@ use Illuminate\Validation\Validator;
  */
 class RecurrenceStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.
@@ -83,6 +76,56 @@ class RecurrenceStoreRequest extends FormRequest
         ];
     }
 
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleRecurrenceData($transaction);
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array
+     */
+    private function getRepetitionData(): array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return [];
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $return[] = [
+                'type'    => $repetition['type'],
+                'moment'  => $repetition['moment'],
+                'skip'    => (int) $repetition['skip'],
+                'weekend' => (int) $repetition['weekend'],
+            ];
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -150,54 +193,4 @@ class RecurrenceStoreRequest extends FormRequest
             }
         );
     }
-
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     *
-     * @return array
-     */
-    private function getRepetitionData(): array
-    {
-        $return = [];
-        // repetition data:
-        /** @var array $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return [];
-        }
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $return[] = [
-                'type'    => $repetition['type'],
-                'moment'  => $repetition['moment'],
-                'skip'    => (int) $repetition['skip'],
-                'weekend' => (int) $repetition['weekend'],
-            ];
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
-     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
-     *
-     * @return array
-     */
-    private function getTransactionData(): array
-    {
-        $return = [];
-        // transaction data:
-        /** @var array $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return [];
-        }
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleRecurrenceData($transaction);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRecurrenceData;
 use FireflyIII\Validation\CurrencyValidation;
@@ -39,18 +40,9 @@ use Illuminate\Validation\Validator;
  */
 class RecurrenceUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData;
+    use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin;
+
 
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
 
     /**
      * Get all data from the request.
@@ -85,6 +77,56 @@ class RecurrenceUpdateRequest extends FormRequest
         ];
     }
 
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleRecurrenceData($transaction);
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array
+     */
+    private function getRepetitionData(): array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return [];
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $return[] = [
+                'type'    => $repetition['type'],
+                'moment'  => $repetition['moment'],
+                'skip'    => (int) $repetition['skip'],
+                'weekend' => (int) $repetition['weekend'],
+            ];
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -153,54 +195,4 @@ class RecurrenceUpdateRequest extends FormRequest
             }
         );
     }
-
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     *
-     * @return array
-     */
-    private function getRepetitionData(): array
-    {
-        $return = [];
-        // repetition data:
-        /** @var array $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return [];
-        }
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $return[] = [
-                'type'    => $repetition['type'],
-                'moment'  => $repetition['moment'],
-                'skip'    => (int) $repetition['skip'],
-                'weekend' => (int) $repetition['weekend'],
-            ];
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
-     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
-     *
-     * @return array
-     */
-    private function getTransactionData(): array
-    {
-        $return = [];
-        // transaction data:
-        /** @var array $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return [];
-        }
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleRecurrenceData($transaction);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/RuleGroupStoreRequest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * RuleGroupRequest.php
+ * RuleGroupStoreRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -25,28 +25,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 
 /**
  * @codeCoverageIgnore
- * Class RuleGroupRequest
- * TODO AFTER 4.8,0: split this into two request classes.
+ * Class RuleGroupStoreRequest
  */
-class RuleGroupRequest extends FormRequest
+class RuleGroupStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data from the request.
@@ -75,22 +65,10 @@ class RuleGroupRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'title'       => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
             'description' => 'between:1,5000|nullable',
             'active'      => [new IsBoolean],
         ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var RuleGroup $ruleGroup */
-                $ruleGroup      = $this->route()->parameter('ruleGroup');
-                $rules['title'] = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id;
-                break;
-        }
-
-        return $rules;
     }
 }

app/Api/V1/Requests/RuleGroupTestRequest.php

@@ -26,30 +26,19 @@ namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class RuleGroupTestRequest
  */
 class RuleGroupTestRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * @return array
@@ -57,47 +46,12 @@ class RuleGroupTestRequest extends FormRequest
     public function getTestParameters(): array
     {
         return [
-            'page'          => $this->getPage(),
-            'start_date'    => $this->getDate('start_date'),
-            'end_date'      => $this->getDate('end_date'),
-            'search_limit'  => $this->getSearchLimit(),
-            'trigger_limit' => $this->getTriggerLimit(),
-            'accounts'      => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string) $this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int) $accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
     /**
      * @param string $field
      *
@@ -105,45 +59,28 @@ class RuleGroupTestRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @return int
+     * @return Collection
      */
-    private function getPage(): int
+    private function getAccounts(): string
     {
-        return 0 === (int) $this->query('page') ? 1 : (int) $this->query('page');
-
+        return (string) $this->query('accounts');
     }
 
     /**
-     * @return int
+     * @return array
      */
-    private function getSearchLimit(): int
+    public function rules(): array
     {
-        return 0 === (int) $this->query('search_limit') ? (int) config('firefly.test-triggers.limit') : (int) $this->query('search_limit');
-    }
-
-    /**
-     * @return int
-     */
-    private function getTriggerLimit(): int
-    {
-        return 0 === (int) $this->query('triggered_limit') ? (int) config('firefly.test-triggers.range') : (int) $this->query('triggered_limit');
-    }
-
-    /**
-     * @param Account|null $account
-     *
-     * @return bool
-     */
-    private function validAccount(?Account $account): bool
-    {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleGroupTriggerRequest.php

@@ -26,30 +26,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class RuleGroupTriggerRequest
  */
 class RuleGroupTriggerRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * @return array
@@ -57,47 +45,12 @@ class RuleGroupTriggerRequest extends FormRequest
     public function getTriggerParameters(): array
     {
         return [
-            'start_date' => $this->getDate('start_date'),
-            'end_date'   => $this->getDate('end_date'),
-            'accounts'   => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [
-            'start_date' => 'required|date',
-            'end_date'   => 'required|date|after:start_date',
-        ];
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string) $this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int) $accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
     /**
      * @param string $field
      *
@@ -105,20 +58,26 @@ class RuleGroupTriggerRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @param Account|null $account
-     *
-     * @return bool
+     * @return string
      */
-    private function validAccount(?Account $account): bool
+    private function getAccounts(): string
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start' => 'date',
+            'end'   => 'date|after:start',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleGroupUpdateRequest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * RuleGroupUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * 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;
+
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+
+/**
+ * @codeCoverageIgnore
+ * Class RuleGroupUpdateRequest
+ */
+class RuleGroupUpdateRequest extends FormRequest
+{
+    use ConvertsDataTypes, ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active = true;
+
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
+        return [
+            'title'       => $this->string('title'),
+            'description' => $this->string('description'),
+            'active'      => $active,
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $ruleGroup = $this->route()->parameter('ruleGroup');
+        return [
+            'title'       => 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id,
+            'description' => 'between:1,5000|nullable',
+            'active'      => [new IsBoolean],
+        ];
+    }
+}

app/Api/V1/Requests/RuleStoreRequest.php

@@ -24,7 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 use function is_array;
@@ -35,17 +37,9 @@ use function is_array;
  */
 class RuleStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.
@@ -81,6 +75,48 @@ class RuleStoreRequest extends FormRequest
         ];
     }
 
+    /**
+     * @return array
+     */
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string) ($trigger['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string) ($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleActions(): array
+    {
+        $actions = $this->get('actions');
+        $return  = [];
+        if (is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string) ($action['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string) ($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -88,11 +124,11 @@ class RuleStoreRequest extends FormRequest
      */
     public function rules(): array
     {
-        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validTriggers = $this->getTriggers();
         $validActions  = array_keys(config('firefly.rule-actions'));
 
         // some triggers and actions require text:
-        $contextTriggers = implode(',', config('firefly.context-rule-triggers'));
+        $contextTriggers = implode(',', $this->getTriggersWithContext());
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
@@ -132,21 +168,6 @@ class RuleStoreRequest extends FormRequest
         );
     }
 
-    /**
-     * Adds an error to the validator when there are no repetitions in the array of data.
-     *
-     * @param Validator $validator
-     */
-    protected function atLeastOneAction(Validator $validator): void
-    {
-        $data    = $validator->getData();
-        $actions = $data['actions'] ?? [];
-        // need at least one trigger
-        if (0 === count($actions)) {
-            $validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
-        }
-    }
-
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -163,44 +184,17 @@ class RuleStoreRequest extends FormRequest
     }
 
     /**
-     * @return array
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
      */
-    private function getRuleActions(): array
+    protected function atLeastOneAction(Validator $validator): void
     {
-        $actions = $this->get('actions');
-        $return  = [];
-        if (is_array($actions)) {
-            foreach ($actions as $action) {
-                $return[] = [
-                    'type'            => $action['type'],
-                    'value'           => $action['value'],
-                    'active'          => $this->convertBoolean((string) ($action['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string) ($action['stop_processing'] ?? 'false')),
-                ];
-            }
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? [];
+        // need at least one trigger
+        if (0 === count($actions)) {
+            $validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
         }
-
-        return $return;
-    }
-
-    /**
-     * @return array
-     */
-    private function getRuleTriggers(): array
-    {
-        $triggers = $this->get('triggers');
-        $return   = [];
-        if (is_array($triggers)) {
-            foreach ($triggers as $trigger) {
-                $return[] = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $this->convertBoolean((string) ($trigger['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string) ($trigger['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
     }
 }

app/Api/V1/Requests/RuleTestRequest.php

@@ -26,30 +26,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class RuleTestRequest
  */
 class RuleTestRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * @return array
@@ -57,60 +45,14 @@ class RuleTestRequest extends FormRequest
     public function getTestParameters(): array
     {
         return [
-            'page'          => $this->getPage(),
-            'start_date'    => $this->getDate('start_date'),
-            'end_date'      => $this->getDate('end_date'),
-            'search_limit'  => $this->getSearchLimit(),
-            'trigger_limit' => $this->getTriggerLimit(),
-            'accounts'      => $this->getAccounts(),
+            'page'     => $this->getPage(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
+
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string) $this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int) $accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
-    /**
-     * @param string $field
-     *
-     * @return Carbon|null
-     */
-    private function getDate(string $field): ?Carbon
-    {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
-    }
-
     /**
      * @return int
      */
@@ -121,29 +63,34 @@ class RuleTestRequest extends FormRequest
     }
 
     /**
-     * @return int
-     */
-    private function getSearchLimit(): int
-    {
-        return 0 === (int) $this->query('search_limit') ? (int) config('firefly.test-triggers.limit') : (int) $this->query('search_limit');
-    }
-
-    /**
-     * @return int
-     */
-    private function getTriggerLimit(): int
-    {
-        return 0 === (int) $this->query('triggered_limit') ? (int) config('firefly.test-triggers.range') : (int) $this->query('triggered_limit');
-    }
-
-    /**
-     * @param Account|null $account
+     * @param string $field
      *
-     * @return bool
+     * @return Carbon|null
      */
-    private function validAccount(?Account $account): bool
+    private function getDate(string $field): ?Carbon
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+    }
+
+    /**
+     * @return string
+     */
+    private function getAccounts(): string
+    {
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleTriggerRequest.php

@@ -26,30 +26,18 @@ namespace FireflyIII\Api\V1\Requests;
 
 
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class RuleTriggerRequest
  */
 class RuleTriggerRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * @return array
@@ -57,47 +45,12 @@ class RuleTriggerRequest extends FormRequest
     public function getTriggerParameters(): array
     {
         return [
-            'start_date' => $this->getDate('start_date'),
-            'end_date'   => $this->getDate('end_date'),
-            'accounts'   => $this->getAccounts(),
+            'start'    => $this->getDate('start'),
+            'end'      => $this->getDate('end'),
+            'accounts' => $this->getAccounts(),
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [
-            'start_date' => 'required|date',
-            'end_date'   => 'required|date|after:start_date',
-        ];
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getAccounts(): Collection
-    {
-        $accountList = '' === (string) $this->query('accounts') ? [] : explode(',', $this->query('accounts'));
-        $accounts    = new Collection;
-
-        /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app(AccountRepositoryInterface::class);
-
-        foreach ($accountList as $accountId) {
-            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
-            $account = $accountRepository->findNull((int) $accountId);
-            if ($this->validAccount($account)) {
-                /** @noinspection NullPointerExceptionInspection */
-                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
-                $accounts->push($account);
-            }
-        }
-
-        return $accounts;
-    }
-
     /**
      * @param string $field
      *
@@ -105,20 +58,28 @@ class RuleTriggerRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        /** @var Carbon $result */
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
-
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
-     * @param Account|null $account
-     *
-     * @return bool
+     * @return string
      */
-    private function validAccount(?Account $account): bool
+    private function getAccounts(): string
     {
-        return null !== $account && AccountType::ASSET === $account->accountType->type;
+        return (string) $this->query('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 
 }

app/Api/V1/Requests/RuleUpdateRequest.php

@@ -24,7 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 use function is_array;
@@ -35,17 +37,9 @@ use function is_array;
  */
 class RuleUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.
@@ -81,6 +75,54 @@ class RuleUpdateRequest extends FormRequest
         ];
     }
 
+    /**
+     * @return array|null
+     */
+    private function getRuleTriggers(): ?array
+    {
+        if (!$this->has('triggers')) {
+            return null;
+        }
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string) ($trigger['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string) ($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array|null
+     */
+    private function getRuleActions(): ?array
+    {
+        if (!$this->has('actions')) {
+            return null;
+        }
+        $actions = $this->get('actions');
+        $return  = [];
+        if (is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string) ($action['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string) ($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -88,12 +130,12 @@ class RuleUpdateRequest extends FormRequest
      */
     public function rules(): array
     {
-        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validTriggers = $this->getTriggers();
         $validActions  = array_keys(config('firefly.rule-actions'));
         $rule          = $this->route()->parameter('rule');
 
         // some triggers and actions require text:
-        $contextTriggers = implode(',', config('firefly.context-rule-triggers'));
+        $contextTriggers = implode(',', $this->getTriggersWithContext());
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
@@ -133,21 +175,6 @@ class RuleUpdateRequest extends FormRequest
         );
     }
 
-    /**
-     * Adds an error to the validator when there are no repetitions in the array of data.
-     *
-     * @param Validator $validator
-     */
-    protected function atLeastOneAction(Validator $validator): void
-    {
-        $data    = $validator->getData();
-        $actions = $data['actions'] ?? null;
-        // need at least one action
-        if (is_array($actions) && 0 === count($actions)) {
-            $validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
-        }
-    }
-
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -164,50 +191,17 @@ class RuleUpdateRequest extends FormRequest
     }
 
     /**
-     * @return array|null
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
      */
-    private function getRuleActions(): ?array
+    protected function atLeastOneAction(Validator $validator): void
     {
-        if (!$this->has('actions')) {
-            return null;
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? null;
+        // need at least one action
+        if (is_array($actions) && 0 === count($actions)) {
+            $validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
         }
-        $actions = $this->get('actions');
-        $return  = [];
-        if (is_array($actions)) {
-            foreach ($actions as $action) {
-                $return[] = [
-                    'type'            => $action['type'],
-                    'value'           => $action['value'],
-                    'active'          => $this->convertBoolean((string) ($action['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string) ($action['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * @return array|null
-     */
-    private function getRuleTriggers(): ?array
-    {
-        if (!$this->has('triggers')) {
-            return null;
-        }
-        $triggers = $this->get('triggers');
-        $return   = [];
-        if (is_array($triggers)) {
-            foreach ($triggers as $trigger) {
-                $return[] = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $this->convertBoolean((string) ($trigger['active'] ?? 'false')),
-                    'stop_processing' => $this->convertBoolean((string) ($trigger['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
     }
 }

app/Api/V1/Requests/TagStoreRequest.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -34,17 +36,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TagStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin, AppendsLocationData;
+
 
     /**
      * Get all data from the request.
@@ -53,20 +46,15 @@ class TagStoreRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $hasLocation = false;
-        if ($this->has('longitude') && $this->has('latitude') && $this->has('zoom_level')) {
-            $hasLocation = true;
-        }
-
-        return [
+        $data = [
             'tag'          => $this->string('tag'),
             'date'         => $this->date('date'),
             'description'  => $this->string('description'),
-            'has_location' => $hasLocation,
-            'longitude'    => $this->string('longitude'),
-            'latitude'     => $this->string('latitude'),
-            'zoom_level'   => $this->integer('zoom_level'),
+            'has_location' => true,
         ];
+        $data = $this->appendLocationData($data, null);
+
+        return $data;
     }
 
     /**

app/Api/V1/Requests/TagUpdateRequest.php

@@ -25,6 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Location;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -35,17 +37,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TagUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin, AppendsLocationData;
+
 
     /**
      * Get all data from the request.
@@ -54,20 +47,15 @@ class TagUpdateRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $updateLocation = false;
-        if ($this->has('longitude') && $this->has('latitude') && $this->has('zoom_level')) {
-            $updateLocation = true;
-        }
-
-        return [
+        $data = [
             'tag'          => $this->string('tag'),
             'date'         => $this->date('date'),
             'description'  => $this->string('description'),
-            'has_location' => $updateLocation,
-            'longitude'    => '' === $this->string('longitude') ? null : $this->string('longitude'),
-            'latitude'     => '' === $this->string('latitude') ? null : $this->string('latitude'),
-            'zoom_level'   => '' === $this->string('zoom_level') ? null : $this->integer('zoom_level'),
+            'has_location' => true, // pretend location is present.
         ];
+        $data = $this->appendLocationData($data, null);
+
+        return $data;
     }
 
     /**

app/Api/V1/Requests/TransactionLinkRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Foundation\Http\FormRequest;
@@ -35,17 +36,9 @@ use Illuminate\Validation\Validator;
  */
 class TransactionLinkRequest extends FormRequest
 {
-    use ConvertsDataTypes;
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use ConvertsDataTypes, ChecksLogin;
+
+
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/TransactionStoreRequest.php

@@ -28,6 +28,7 @@ use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
 use FireflyIII\Support\NullArrayObject;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\CurrencyValidation;
 use FireflyIII\Validation\GroupValidation;
@@ -41,20 +42,7 @@ use Log;
  */
 class TransactionStoreRequest extends FormRequest
 {
-    use TransactionValidation, GroupValidation, CurrencyValidation, ConvertsDataTypes;
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        Log::debug('Authorize TransactionStoreRequest');
-
-        // Only allow authenticated users
-        return auth()->check();
-    }
+    use TransactionValidation, GroupValidation, CurrencyValidation, ConvertsDataTypes, ChecksLogin;
 
     /**
      * Get all data. Is pretty complex because of all the ??-statements.
@@ -73,6 +61,105 @@ class TransactionStoreRequest extends FormRequest
         ];
     }
 
+    /**
+     * Get transaction data.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        /**
+         * @var array $transaction
+         */
+        foreach ($this->get('transactions') as $transaction) {
+            $object   = new NullArrayObject($transaction);
+            $return[] = [
+                'type'  => $this->stringFromValue($object['type']),
+                'date'  => $this->dateFromValue($object['date']),
+                'order' => $this->integerFromValue((string) $object['order']),
+
+                'currency_id'           => $this->integerFromValue((string) $object['currency_id']),
+                'currency_code'         => $this->stringFromValue($object['currency_code']),
+
+                // foreign currency info:
+                'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
+                'foreign_currency_code' => $this->stringFromValue((string) $object['foreign_currency_code']),
+
+                // amount and foreign amount. Cannot be 0.
+                'amount'                => $this->stringFromValue((string) $object['amount']),
+                'foreign_amount'        => $this->stringFromValue((string) $object['foreign_amount']),
+
+                // description.
+                'description'           => $this->stringFromValue($object['description']),
+
+                // source of transaction. If everything is null, assume cash account.
+                'source_id'             => $this->integerFromValue((string) $object['source_id']),
+                'source_name'           => $this->stringFromValue((string) $object['source_name']),
+                'source_iban'           => $this->stringFromValue((string) $object['source_iban']),
+                'source_number'         => $this->stringFromValue((string) $object['source_number']),
+                'source_bic'            => $this->stringFromValue((string) $object['source_bic']),
+
+                // destination of transaction. If everything is null, assume cash account.
+                'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
+                'destination_name'      => $this->stringFromValue((string) $object['destination_name']),
+                'destination_iban'      => $this->stringFromValue((string) $object['destination_iban']),
+                'destination_number'    => $this->stringFromValue((string) $object['destination_number']),
+                'destination_bic'       => $this->stringFromValue((string) $object['destination_bic']),
+
+                // budget info
+                'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
+                'budget_name'           => $this->stringFromValue((string) $object['budget_name']),
+
+                // category info
+                'category_id'           => $this->integerFromValue((string) $object['category_id']),
+                'category_name'         => $this->stringFromValue((string) $object['category_name']),
+
+                // journal bill reference. Optional. Will only work for withdrawals
+                'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
+                'bill_name'             => $this->stringFromValue((string) $object['bill_name']),
+
+                // piggy bank reference. Optional. Will only work for transfers
+                'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->stringFromValue((string) $object['piggy_bank_name']),
+
+                // some other interesting properties
+                'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
+                'notes'                 => $this->nlStringFromValue((string) $object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
+
+                // all custom fields:
+                'internal_reference'    => $this->stringFromValue((string) $object['internal_reference']),
+                'external_id'           => $this->stringFromValue((string) $object['external_id']),
+                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->stringFromValue((string) $object['bunq_payment_id']),
+                'external_uri'          => $this->stringFromValue((string) $object['external_uri']),
+
+                'sepa_cc'       => $this->stringFromValue($object['sepa_cc']),
+                'sepa_ct_op'    => $this->stringFromValue($object['sepa_ct_op']),
+                'sepa_ct_id'    => $this->stringFromValue($object['sepa_ct_id']),
+                'sepa_db'       => $this->stringFromValue($object['sepa_db']),
+                'sepa_country'  => $this->stringFromValue($object['sepa_country']),
+                'sepa_ep'       => $this->stringFromValue($object['sepa_ep']),
+                'sepa_ci'       => $this->stringFromValue($object['sepa_ci']),
+                'sepa_batch_id' => $this->stringFromValue($object['sepa_batch_id']),
+
+
+                // custom date fields. Must be Carbon objects. Presence is optional.
+                'interest_date' => $this->dateFromValue($object['interest_date']),
+                'book_date'     => $this->dateFromValue($object['book_date']),
+                'process_date'  => $this->dateFromValue($object['process_date']),
+                'due_date'      => $this->dateFromValue($object['due_date']),
+                'payment_date'  => $this->dateFromValue($object['payment_date']),
+                'invoice_date'  => $this->dateFromValue($object['invoice_date']),
+
+            ];
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -175,6 +262,10 @@ class TransactionStoreRequest extends FormRequest
     {
         $validator->after(
             function (Validator $validator) {
+
+                // must be valid array.
+                $this->validateTransactionArray($validator);
+
                 // must submit at least one transaction.
                 $this->validateOneTransaction($validator);
 
@@ -199,104 +290,4 @@ class TransactionStoreRequest extends FormRequest
             }
         );
     }
-
-    /**
-     * Get transaction data.
-     *
-     * @return array
-     */
-    private function getTransactionData(): array
-    {
-        $return = [];
-        /**
-         * @var int   $index
-         * @var array $transaction
-         */
-        foreach ($this->get('transactions') as $index => $transaction) {
-            $object   = new NullArrayObject($transaction);
-            $return[] = [
-                'type'  => $this->stringFromValue($object['type']),
-                'date'  => $this->dateFromValue($object['date']),
-                'order' => $this->integerFromValue((string) $object['order']),
-
-                'currency_id'           => $this->integerFromValue((string) $object['currency_id']),
-                'currency_code'         => $this->stringFromValue($object['currency_code']),
-
-                // foreign currency info:
-                'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
-                'foreign_currency_code' => $this->stringFromValue((string) $object['foreign_currency_code']),
-
-                // amount and foreign amount. Cannot be 0.
-                'amount'                => $this->stringFromValue((string) $object['amount']),
-                'foreign_amount'        => $this->stringFromValue((string) $object['foreign_amount']),
-
-                // description.
-                'description'           => $this->stringFromValue($object['description']),
-
-                // source of transaction. If everything is null, assume cash account.
-                'source_id'             => $this->integerFromValue((string) $object['source_id']),
-                'source_name'           => $this->stringFromValue((string) $object['source_name']),
-                'source_iban'           => $this->stringFromValue((string) $object['source_iban']),
-                'source_number'         => $this->stringFromValue((string) $object['source_number']),
-                'source_bic'            => $this->stringFromValue((string) $object['source_bic']),
-
-                // destination of transaction. If everything is null, assume cash account.
-                'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
-                'destination_name'      => $this->stringFromValue((string) $object['destination_name']),
-                'destination_iban'      => $this->stringFromValue((string) $object['destination_iban']),
-                'destination_number'    => $this->stringFromValue((string) $object['destination_number']),
-                'destination_bic'       => $this->stringFromValue((string) $object['destination_bic']),
-
-                // budget info
-                'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
-                'budget_name'           => $this->stringFromValue((string) $object['budget_name']),
-
-                // category info
-                'category_id'           => $this->integerFromValue((string) $object['category_id']),
-                'category_name'         => $this->stringFromValue((string) $object['category_name']),
-
-                // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
-                'bill_name'             => $this->stringFromValue((string) $object['bill_name']),
-
-                // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->stringFromValue((string) $object['piggy_bank_name']),
-
-                // some other interesting properties
-                'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
-                'notes'                 => $this->nlStringFromValue((string) $object['notes']),
-                'tags'                  => $this->arrayFromValue($object['tags']),
-
-                // all custom fields:
-                'internal_reference'    => $this->stringFromValue((string) $object['internal_reference']),
-                'external_id'           => $this->stringFromValue((string) $object['external_id']),
-                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
-                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'       => $this->stringFromValue((string) $object['bunq_payment_id']),
-                'external_uri'          => $this->stringFromValue((string) $object['external_uri']),
-
-                'sepa_cc'       => $this->stringFromValue($object['sepa_cc']),
-                'sepa_ct_op'    => $this->stringFromValue($object['sepa_ct_op']),
-                'sepa_ct_id'    => $this->stringFromValue($object['sepa_ct_id']),
-                'sepa_db'       => $this->stringFromValue($object['sepa_db']),
-                'sepa_country'  => $this->stringFromValue($object['sepa_country']),
-                'sepa_ep'       => $this->stringFromValue($object['sepa_ep']),
-                'sepa_ci'       => $this->stringFromValue($object['sepa_ci']),
-                'sepa_batch_id' => $this->stringFromValue($object['sepa_batch_id']),
-
-
-                // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date' => $this->dateFromValue($object['interest_date']),
-                'book_date'     => $this->dateFromValue($object['book_date']),
-                'process_date'  => $this->dateFromValue($object['process_date']),
-                'due_date'      => $this->dateFromValue($object['due_date']),
-                'payment_date'  => $this->dateFromValue($object['payment_date']),
-                'invoice_date'  => $this->dateFromValue($object['invoice_date']),
-
-            ];
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/TransactionUpdateRequest.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
@@ -40,37 +41,17 @@ use Log;
  */
 class TransactionUpdateRequest extends FormRequest
 {
-    use TransactionValidation, GroupValidation, ConvertsDataTypes;
+    use TransactionValidation, GroupValidation, ConvertsDataTypes, ChecksLogin;
+
+    private array $arrayFields;
+    private array $booleanFields;
+    private array $dateFields;
+    private array $integerFields;
+    private array $stringFields;
+    private array $textareaFields;
 
-    /** @var array Array values. */
-    private $arrayFields;
-
-    /** @var array Boolean values. */
-    private $booleanFields;
-
-    /** @var array Fields that contain date values. */
-    private $dateFields;
-
-    /** @var array Fields that contain integer values. */
-    private $integerFields;
-
-    /** @var array Fields that contain string values. */
-    private $stringFields;
-
-    /** @var array Fields that contain text (with newlines) */
-    private $textareaFields;
 
 
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
 
     /**
      * Get all data. Is pretty complex because of all the ??-statements.
@@ -157,6 +138,139 @@ class TransactionUpdateRequest extends FormRequest
         return $data;
     }
 
+    /**
+     * Get transaction data.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        Log::debug('Now in getTransactionData()');
+        $return = [];
+        /**
+         * @var int   $index
+         * @var array $transaction
+         */
+        foreach ($this->get('transactions') as $transaction) {
+            // default response is to update nothing in the transaction:
+            $current  = [];
+            $current  = $this->getIntegerData($current, $transaction);
+            $current  = $this->getStringData($current, $transaction);
+            $current  = $this->getNlStringData($current, $transaction);
+            $current  = $this->getDateData($current, $transaction);
+            $current  = $this->getBooleanData($current, $transaction);
+            $current  = $this->getArrayData($current, $transaction);
+            $return[] = $current;
+        }
+
+        return $return;
+    }
+
+    /**
+     * For each field, add it to the array if a reference is present in the request:
+     *
+     * @param array $current
+     *
+     * @return array
+     */
+    private function getIntegerData(array $current, array $transaction): array
+    {
+        foreach ($this->integerFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->integerFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     *
+     * @return array
+     */
+    private function getStringData(array $current, array $transaction): array
+    {
+        foreach ($this->stringFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->stringFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     *
+     * @return array
+     */
+    private function getNlStringData(array $current, array $transaction): array
+    {
+        foreach ($this->textareaFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->nlStringFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     *
+     * @return array
+     */
+    private function getDateData(array $current, array $transaction): array
+    {
+        foreach ($this->dateFields as $fieldName) {
+            Log::debug(sprintf('Now at date field %s', $fieldName));
+            if (array_key_exists($fieldName, $transaction)) {
+                Log::debug(sprintf('New value: "%s"', (string) $transaction[$fieldName]));
+                $current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     *
+     * @return array
+     */
+    private function getBooleanData(array $current, array $transaction): array
+    {
+        foreach ($this->booleanFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->convertBoolean((string) $transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     *
+     * @return array
+     */
+    private function getArrayData(array $current, array $transaction): array
+    {
+        foreach ($this->arrayFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $current[$fieldName] = $this->arrayFromValue($transaction[$fieldName]);
+            }
+        }
+
+        return $current;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -177,12 +291,12 @@ class TransactionUpdateRequest extends FormRequest
             // currency info
             'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
             'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
 
             // amount
             'transactions.*.amount'                => 'numeric|gt:0|max:100000000000',
-            'transactions.*.foreign_amount'        => 'numeric|gte:0',
+            'transactions.*.foreign_amount'        => 'nullable|numeric|gte:0',
 
             // description
             'transactions.*.description'           => 'nullable|between:1,1000',
@@ -260,160 +374,11 @@ class TransactionUpdateRequest extends FormRequest
                 // validate source/destination is equal, depending on the transaction journal type.
                 $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
 
-                // If type is set, source + destination info is mandatory.
-                // Not going to do this. Not sure where the demand came from.
-
                 // validate that the currency fits the source and/or destination account.
                 // validate all account info
                 $this->validateAccountInformationUpdate($validator);
 
-                // The currency info must match the accounts involved.
-                // Instead will ignore currency info as much as possible.
-
-                // TODO if the transaction_journal_id is empty, some fields are mandatory, like the amount!
-
-                // all journals must have a description
-
-                //                // validate foreign currency info
-                //
-
-                //
-                //                // make sure all splits have valid source + dest info
-                //                 the group must have a description if > 1 journal.
             }
         );
     }
-
-    /**
-     * @param array $current
-     * @param array $transaction
-     *
-     * @return array
-     */
-    private function getArrayData(array $current, array $transaction): array
-    {
-        foreach ($this->arrayFields as $fieldName) {
-            if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->arrayFromValue($transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * @param array $current
-     * @param array $transaction
-     *
-     * @return array
-     */
-    private function getBooleanData(array $current, array $transaction): array
-    {
-        foreach ($this->booleanFields as $fieldName) {
-            if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->convertBoolean((string) $transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * @param array $current
-     * @param array $transaction
-     *
-     * @return array
-     */
-    private function getDateData(array $current, array $transaction): array
-    {
-        foreach ($this->dateFields as $fieldName) {
-            Log::debug(sprintf('Now at date field %s', $fieldName));
-            if (array_key_exists($fieldName, $transaction)) {
-                Log::debug(sprintf('New value: "%s"', (string) $transaction[$fieldName]));
-                $current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * For each field, add it to the array if a reference is present in the request:
-     *
-     * @param array $current
-     *
-     * @return array
-     */
-    private function getIntegerData(array $current, array $transaction): array
-    {
-        foreach ($this->integerFields as $fieldName) {
-            if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->integerFromValue((string) $transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * @param array $current
-     * @param array $transaction
-     *
-     * @return array
-     */
-    private function getNlStringData(array $current, array $transaction): array
-    {
-        foreach ($this->textareaFields as $fieldName) {
-            if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->nlStringFromValue((string) $transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * @param array $current
-     * @param array $transaction
-     *
-     * @return array
-     */
-    private function getStringData(array $current, array $transaction): array
-    {
-        foreach ($this->stringFields as $fieldName) {
-            if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->stringFromValue((string) $transaction[$fieldName]);
-            }
-        }
-
-        return $current;
-    }
-
-    /**
-     * Get transaction data.
-     *
-     * @return array
-     */
-    private function getTransactionData(): array
-    {
-        Log::debug('Now in getTransactionData()');
-        $return = [];
-        /**
-         * @var int   $index
-         * @var array $transaction
-         */
-        foreach ($this->get('transactions') as $transaction) {
-            // default response is to update nothing in the transaction:
-            $current  = [];
-            $current  = $this->getIntegerData($current, $transaction);
-            $current  = $this->getStringData($current, $transaction);
-            $current  = $this->getNlStringData($current, $transaction);
-            $current  = $this->getDateData($current, $transaction);
-            $current  = $this->getBooleanData($current, $transaction);
-            $current  = $this->getArrayData($current, $transaction);
-            $return[] = $current;
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/UserStoreRequest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -34,9 +35,10 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UserStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes;
+    use ConvertsDataTypes, ChecksLogin;
+
     /**
-     * Authorize logged in users.
+     * Logged in + owner
      *
      * @return bool
      */