Merge branch 'release/v6.0.20'

chore(deps-dev): bump phpstan/phpstan-deprecation-rules from 1.1.3 to 1.1.4

.ci/.env.ci

@@ -301,7 +301,6 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 USE_ENCRYPTION=false
-IS_HEROKU=false
 FIREFLY_III_LAYOUT=v1
 
 #

.ci/php-cs-fixer/.gitignore

@@ -1 +1,2 @@
 vendor
+.php-cs-fixer.cache

.ci/php-cs-fixer/composer.lock

@@ -379,16 +379,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.18.0",
+            "version": "v3.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "b123395c9fa3a70801f816f13606c0f3a7ada8df"
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b123395c9fa3a70801f816f13606c0f3a7ada8df",
-                "reference": "b123395c9fa3a70801f816f13606c0f3a7ada8df",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
+                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
                 "shasum": ""
             },
             "require": {
@@ -412,6 +412,7 @@
                 "symfony/stopwatch": "^5.4 || ^6.0"
             },
             "require-dev": {
+                "facile-it/paraunit": "^1.3 || ^2.0",
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^2.0",
                 "mikey179/vfsstream": "^1.6.11",
@@ -463,7 +464,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.18.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0"
             },
             "funding": [
                 {
@@ -471,7 +472,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-18T22:25:45+00:00"
+            "time": "2023-07-16T23:08:06+00:00"
         },
         {
             "name": "psr/cache",
@@ -744,16 +745,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7"
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/aa5d64ad3f63f2e48964fc81ee45cb318a723898",
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898",
                 "shasum": ""
             },
             "require": {
@@ -814,7 +815,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.0"
+                "source": "https://github.com/symfony/console/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -830,7 +831,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2023-07-19T20:17:28+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -901,16 +902,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa"
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
                 "shasum": ""
             },
             "require": {
@@ -961,7 +962,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -977,7 +978,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T14:41:17+00:00"
+            "time": "2023-07-06T06:56:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1057,16 +1058,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.3.0",
+            "version": "v6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "97b698e1d77d356304def77a8d0cd73090b359ea"
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/97b698e1d77d356304def77a8d0cd73090b359ea",
-                "reference": "97b698e1d77d356304def77a8d0cd73090b359ea",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
                 "shasum": ""
             },
             "require": {
@@ -1100,7 +1101,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.0"
+                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
             },
             "funding": [
                 {
@@ -1116,20 +1117,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-30T17:12:32+00:00"
+            "time": "2023-06-01T08:30:39+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.3.0",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2"
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
                 "shasum": ""
             },
             "require": {
@@ -1164,7 +1165,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.0"
+                "source": "https://github.com/symfony/finder/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -1180,7 +1181,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-02T01:25:41+00:00"
+            "time": "2023-07-31T08:31:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -1743,16 +1744,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
                 "shasum": ""
             },
             "require": {
@@ -1784,7 +1785,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.0"
+                "source": "https://github.com/symfony/process/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -1800,7 +1801,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T08:06:44+00:00"
+            "time": "2023-07-12T16:00:22+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1948,16 +1949,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68",
                 "shasum": ""
             },
             "require": {
@@ -2014,7 +2015,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.0"
+                "source": "https://github.com/symfony/string/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -2030,7 +2031,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-21T21:06:29+00:00"
+            "time": "2023-07-05T08:41:27+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpcs.sh

@@ -30,12 +30,9 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
-composer update
+composer update --quiet
 rm -f .php-cs-fixer.cache
-echo 'Removed cache...'
-echo 'Running...'
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
-echo 'Done!'
 cd $SCRIPT_DIR/..
 
 exit 0

.ci/phpmd.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+#
+# phpmd.sh
+# Copyright (c) 2023 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/>.
+#
+
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+cd $SCRIPT_DIR/phpmd
+composer update --quiet
+./vendor/bin/phpmd \
+  $SCRIPT_DIR/../app text phpmd.xml \
+  --exclude $SCRIPT_DIR/../app/resources/** \
+  --exclude $SCRIPT_DIR/../app/frontend/** \
+  --exclude $SCRIPT_DIR/../app/public/** \
+  --exclude $SCRIPT_DIR/../app/vendor/** \
+
+cd $SCRIPT_DIR/..
+
+exit 0

.ci/phpmd/.gitignore

@@ -0,0 +1 @@
+vendor

.ci/phpmd/composer.json

@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "phpmd/phpmd": "^2.13"
+    }
+}

.ci/phpmd/phpmd.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpmd.xml
+  ~ Copyright (c) 2023 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/>.
+  -->
+
+<ruleset name="pcsg-generated-ruleset"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+	<description>Bla bla</description>
+
+	<!--
+Commando vanuit firefly directory:
+phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/report.html
+	-->
+
+	<!-- Import the entire controversial code rule set -->
+	<rule ref="rulesets/controversial.xml">
+		<exclude name="CamelCasePropertyName" />
+	</rule>
+
+	<!-- clean code -->
+	<rule ref="rulesets/codesize.xml" />
+	<rule ref="rulesets/design.xml" />
+	<rule ref="rulesets/naming.xml" />
+	<rule ref="rulesets/unusedcode.xml" />
+
+	<rule ref="rulesets/codesize.xml/CyclomaticComplexity">
+		<properties>
+			<property name="reportLevel" value="5"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/NPathComplexity">
+		<properties>
+			<property name="minimum" value="128"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
+		<properties>
+			<property name="minimum" value="40"/>
+		</properties>
+	</rule>
+	<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
+		<properties>
+			<property name="minimum" value="5"/>
+		</properties>
+	</rule>
+
+	<!-- include clean code manually -->
+	<rule ref="rulesets/cleancode.xml/BooleanArgumentFlag" />
+	<rule ref="rulesets/cleancode.xml/ElseExpression" />
+
+	<!-- no this one -->
+	<!--<rule ref="rulesets/cleancode.xml/StaticAccess" />-->
+</ruleset>

.ci/phpunit.sh

@@ -59,3 +59,5 @@ fi
 
 # restore .env file
 mv $SCRIPT_DIR/../.env.backup $SCRIPT_DIR/../.env
+
+cd $SCRIPT_DIR/..

.deploy/heroku/.env.heroku

@@ -1,321 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=heroku
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=false
-
-# This should be your email address.
-# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
-SITE_OWNER=heroku@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=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
-
-#
-# Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
-#
-# If text is still in English, remember that not everything may have been translated.
-DEFAULT_LANGUAGE=en_US
-
-# The locale defines how numbers are formatted.
-# by default this value is the same as whatever the language is.
-DEFAULT_LOCALE=equal
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-# For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-TZ=UTC
-
-# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
-# Set it to ** and reverse proxies work just fine.
-TRUSTED_PROXIES=**
-
-# The log channel defines where your log entries go to.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
-# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
-# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
-
-# - Docker + versions <= 4.8.1.8 and before: use "stdout"
-# - Docker + versions >  4.8.1.8           : use "docker_out"
-# - Docker + versions >=  5.1.1            : use "stack"
-# - For everything else (als not Docker)   : use 'stack'
-
-LOG_CHANNEL=stdout
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=notice
-
-# 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
-# Use "pgsql" for PostgreSQL
-# Use "mysql" for MySQL and MariaDB.
-# Use "sqlite" for SQLite.
-DB_CONNECTION=pgsql
-
-
-# MySQL supports SSL. You can configure it here.
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MYSQL_USE_SSL=false
-MYSQL_SSL_VERIFY_SERVER_CERT=true
-# You need to set at least of these options
-MYSQL_SSL_CAPATH=/etc/ssl/certs/
-MYSQL_SSL_CA=
-MYSQL_SSL_CERT=
-MYSQL_SSL_KEY=
-MYSQL_SSL_CIPHER=
-
-# PostgreSQL supports SSL. You can configure it here.
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-PGSQL_SSL_MODE=prefer
-PGSQL_SSL_ROOT_CERT=null
-PGSQL_SSL_CERT=null
-PGSQL_SSL_KEY=null
-PGSQL_SSL_CRL_FILE=null
-
-# If you're looking for performance improvements, you could install memcached.
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-# If you set either of these to 'redis', you might want to update these settings too
-# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
-# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
-
-# can be tcp, unix or http
-REDIS_SCHEME=tcp
-
-# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
-REDIS_PATH=
-
-# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-
-REDIS_PASSWORD=null
-# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
-REDIS_DB="0"
-REDIS_CACHE_DB="1"
-
-# Cookie settings. Should not be necessary to change these.
-# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
-# the value from a file instead of from an environment variable
-COOKIE_PATH="/"
-COOKIE_DOMAIN=
-COOKIE_SECURE=false
-
-# If you want Firefly III to mail you, update these settings
-# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_MAILER=log
-MAIL_HOST=null
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-# Other mail drivers:
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
-
-
-# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-MAILGUN_ENDPOINT=api.mailgun.net
-
-# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MANDRILL_SECRET=
-SPARKPOST_SECRET=
-
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-
-# These messages contain (sensitive) transaction information:
-SEND_REPORT_JOURNALS=true
-
-# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-MAPBOX_API_KEY=
-
-# The map will default to this location:
-MAP_DEFAULT_LAT=51.983333
-MAP_DEFAULT_LONG=5.916667
-MAP_DEFAULT_ZOOM=6
-
-# Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer", and "ratesapi".
-# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
-CER_PROVIDER=ratesapi
-
-# If you have select "fixer" as default currency exchange rates,
-# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
-# the free API up to the point where you might as well offer nothing.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-FIXER_API_KEY=
-
-# Firefly III has two options for user authentication. "eloquent" is the default,
-# and "ldap" for LDAP servers.
-# For full instructions on these settings please visit:
-# https://docs.firefly-iii.org/advanced-installation/authentication
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-LOGIN_PROVIDER=eloquent
-
-#
-# It's also possible to change the way users are authenticated. You could use Authelia for example.
-# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
-#
-# If you do this please read the documentation for instructions and warnings:
-# https://docs.firefly-iii.org/advanced-installation/authentication
-#
-# This function is available in Firefly III v5.3.0 and higher.
-AUTHENTICATION_GUARD=web
-
-#
-# Likewise, 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
-#
-CUSTOM_LOGOUT_URL=
-
-# LDAP connection configuration
-# OpenLDAP, FreeIPA or ActiveDirectory
-# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-ADLDAP_CONNECTION_SCHEME=OpenLDAP
-ADLDAP_AUTO_CONNECT=true
-
-# LDAP connection settings
-# You can set the following variables from a file by appending them with _FILE:
-# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
-ADLDAP_CONTROLLERS=
-ADLDAP_PORT=389
-ADLDAP_TIMEOUT=5
-ADLDAP_BASEDN=""
-ADLDAP_FOLLOW_REFFERALS=false
-
-# SSL/TLS settings
-ADLDAP_USE_SSL=false
-ADLDAP_USE_TLS=false
-ADLDAP_SSL_CACERTDIR=
-ADLDAP_SSL_CACERTFILE=
-ADLDAP_SSL_CERTFILE=
-ADLDAP_SSL_KEYFILE=
-ADLDAP_SSL_CIPHER_SUITE=
-ADLDAP_SSL_REQUIRE_CERT=
-
-# You can set the following variables from a file by appending them with _FILE:
-ADLDAP_ADMIN_USERNAME=
-ADLDAP_ADMIN_PASSWORD=
-
-# You can set the following variables from a file by appending them with _FILE:
-ADLDAP_ACCOUNT_PREFIX=
-ADLDAP_ACCOUNT_SUFFIX=
-
-
-# LDAP authentication settings.
-ADLDAP_PASSWORD_SYNC=false
-ADLDAP_LOGIN_FALLBACK=false
-
-ADLDAP_DISCOVER_FIELD=distinguishedname
-ADLDAP_AUTH_FIELD=distinguishedname
-
-# Will allow SSO if your server provides an AUTH_USER field.
-# You can set the following variables from a file by appending them with _FILE:
-WINDOWS_SSO_ENABLED=false
-WINDOWS_SSO_DISCOVER=samaccountname
-WINDOWS_SSO_KEY=AUTH_USER
-
-# field to sync as local username.
-# You can set the following variable from a file by appending it with _FILE:
-ADLDAP_SYNC_FIELD=userprincipalname
-
-# You can disable the X-Frame-Options header if it interferes with tools like
-# Organizr. This is at your own risk. Applications running in frames run the risk
-# of leaking information to their parent frame.
-DISABLE_FRAME_HEADER=false
-
-# You can disable the Content Security Policy header when you're using an ancient browser
-# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
-# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
-# This is at your own risk.
-DISABLE_CSP_HEADER=false
-
-# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
-# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
-# Do not prepend the TRACKER_URL with http:// or https://
-# The only tracker supported is Matomo.
-# You can set the following variables from a file by appending them with _FILE:
-TRACKER_SITE_ID=
-TRACKER_URL=
-
-# 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.
-# Set each value to true to enable, or false to disable.
-
-# Check if the SQLite database exists. Can be skipped if you're not using SQLite.
-# Won't significantly speed up things.
-DKR_CHECK_SQLITE=true
-
-# Run database creation and migration commands. Disable this only if you're 100% sure the DB exists
-# and is up to date.
-DKR_RUN_MIGRATION=true
-
-# Run database upgrade commands. Disable this only when you're 100% sure your DB is up-to-date
-# with the latest fixes (outside of migrations!)
-DKR_RUN_UPGRADE=true
-
-# Verify database integrity. Includes all data checks and verifications.
-# Disabling this makes Firefly III assume your DB is intact.
-DKR_RUN_VERIFY=true
-
-# Run database reporting commands. When disabled, Firefly III won't go over your data to report current state.
-# Disabling this should have no impact on data integrity or safety but it won't warn you of possible issues.
-DKR_RUN_REPORT=true
-
-# Generate OAuth2 keys.
-# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
-# you had previously generated keys already and they're stored in your database for restoration.
-DKR_RUN_PASSPORT_INSTALL=true
-
-# Leave the following configuration vars as is.
-# Unless you like to tinker and know what you're doing.
-APP_NAME=FireflyIII
-ADLDAP_CONNECTION=default
-BROADCAST_DRIVER=log
-QUEUE_DRIVER=sync
-CACHE_PREFIX=firefly
-SEARCH_RESULT_LIMIT=50
-PUSHER_KEY=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-USE_ENCRYPTION=false
-IS_HEROKU=false
-FIREFLY_III_LAYOUT=v1
-
-#
-# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
-# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
-# This configuration value WILL NOT HELP.
-#
-# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
-# So when configuring anything WEB related this variable doesn't do anything. Nothing
-#
-# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
-#
-APP_URL=http://localhost

.deploy/heroku/.locales

@@ -1,32 +0,0 @@
-bg_BG
-ca_ES
-cs_CZ
-da_DK
-de_DE
-el_GR
-en_GB
-en_US
-es_ES
-fi_FI
-fr_FR
-hu_HU
-id_ID
-it_IT
-ja_JP
-ko_KR
-nb_NO
-nl_NL
-nn_NO
-pl_PL
-pt_BR
-pt_PT
-ro_RO
-ru_RU
-sk_SK
-sl_SI
-sv_SE
-tr_TR
-uk_UA
-vi_VN
-zh-hans_CN
-zh-hant_CN

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -143,6 +143,7 @@ MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_SENDMAIL_COMMAND=
 
 # Other mail drivers:
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -240,7 +241,7 @@ ALLOW_WEBHOOKS=false
 #
 # The static cron job token can be useful when you use Docker and wish to manage cron jobs.
 # 1. Set this token to any 32-character value (this is important!).
-# 2. Use this token in the cron URL instead of a user's command line token.
+# 2. Use this token in the cron URL instead of a user's command line token that you can find in /profile
 #
 # For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
 #
@@ -297,7 +298,6 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_HEROKU=false
 FIREFLY_III_LAYOUT=v1
 
 #

.gitattributes

@@ -1,8 +1,11 @@
-* text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+* text=auto eol=lf
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore
-/tests       export-ignore
-/phpunit.xml export-ignore
-/.ci export-ignore
+.styleci.yml export-ignore

.github/code_of_conduct.md

@@ -2,7 +2,10 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making
+participation in our project and our community a harassment-free experience for everyone, regardless of age, body size,
+disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
 
 ## Our Standards
 
@@ -24,23 +27,35 @@ Examples of unacceptable behavior by participants include:
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take
+appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
+issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the
+project or its community. Examples of representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed representative at an online or offline
+event. Representation of a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at
+james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it
+deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the
+reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent
+repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available
+at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
+
 [version]: http://contributor-covenant.org/version/1/4/

.github/its_you_not_me.md

@@ -2,9 +2,11 @@
 
 Sometimes bugs reported to Firefly III are configuration and system problems on the user's side.
 
-If you run into any of the following problems, there's a good chance it's not a Firefly III issue, but a configuration issue.
+If you run into any of the following problems, there's a good chance it's not a Firefly III issue, but a configuration
+issue.
 
-- ⚠️ Firefly III can't connect to the database when starting or the password is wrong, even though you're sure it's correct.
+- ⚠️ Firefly III can't connect to the database when starting or the password is wrong, even though you're sure it's
+  correct.
 - ⚠️ Errors about a missing `APP_KEY` or other encryption/hash problems
 - ⚠️ You can't login due to `419` errors (page expired)
 - ⚠️ Any `500` error when starting Firefly III
@@ -13,4 +15,6 @@ If you run into any of the following problems, there's a good chance it's not a
 - ⚠️ Firefly III does not work behind your reverse proxy
 - ⚠️ You can't connect to the Data Importer due to 404's or authentication issues.
 
-If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions) or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we can fix rather quickly :+1:
+If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions)
+or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we
+can fix rather quickly :+1:

.github/support.md

@@ -9,7 +9,8 @@ First of all: thank you for reporting a bug instead of ditching the tool altoget
 1. Open bugs will have open issues, so search for one first.
 2. If your feature request is already there, vote on it with :+1: or :-1: reactions.
 3. Do NOT hijack old issues with the bug you found, open your own issue.
-4. If relevant, take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from your issue.
+4. If relevant, take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from your
+   issue.
 5. If relevant, read the [documentation](https://docs.firefly-iii.org/).
 
 Please follow these guidelines when opening new issues:
@@ -25,7 +26,8 @@ Only then [create a new issue](https://github.com/firefly-iii/firefly-iii/issues
 ## Issue closure and abandonment policy
 
 - Issues can be converted into discussions if it's not a bug or feature request.
-- Features that won't be implemented will be labelled "wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
+- Features that won't be implemented will be labelled "
+  wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
 - Issues can be closed if they're duplicates of other issues.
 - Issues can be closed if the answer is in the FAQ.
 - Issues will be closed automatically after 14 days.

.github/workflows/closed-issues.yml

@@ -7,8 +7,7 @@ jobs:
   auto_comment:
     runs-on: ubuntu-latest
     steps:
-      -
-        uses: aws-actions/closed-issue-message@v1
+      - uses: aws-actions/closed-issue-message@v1
         with:
           message: |
             Hi there! This is an automatic reply. `Share and enjoy`

.github/workflows/sonarcloud.yml

@@ -1,5 +1,6 @@
 name: Sonarcloud
 on:
+  pull_request: 
   push:
     branches:
       - main
@@ -12,6 +13,33 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP with Xdebug
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          coverage: xdebug
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
+
+      - name: Copy environment file
+        run: cp .env.example .env
+
+      - name: Generate app key
+        run: php artisan key:generate
+
+      - name: "Run tests with coverage"
+        run: composer coverage
+
+      - name: Fix code coverage paths
+        run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
+
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         env:

.gitignore

@@ -7,4 +7,4 @@ npm-debug.log
 yarn-error.log
 .env
 /.ci/php-cs-fixer/vendor
-/.ci/coverage
+coverage.xml

app.json

@@ -1,65 +0,0 @@
-{
-  "name": "Firefly III",
-  "description": "A free and open source personal finances manager",
-  "repository": "https://github.com/firefly-iii/firefly-iii",
-  "website": "https://firefly-iii.org/",
-  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/public/mstile-150x150.png",
-  "keywords": [
-    "finance",
-    "finances",
-    "manager",
-    "management",
-    "euro",
-    "dollar",
-    "laravel",
-    "money",
-    "currency",
-    "financials",
-    "financial",
-    "budgets",
-    "administration",
-    "tool",
-    "tooling",
-    "help",
-    "helper",
-    "assistant",
-    "planning",
-    "organizing",
-    "bills",
-    "personal finance",
-    "budgets",
-    "budgeting",
-    "budgeting tool",
-    "budgeting application",
-    "transactions",
-    "self hosted",
-    "self-hosted",
-    "transfers",
-    "management"
-  ],
-  "addons": [
-    {
-      "plan": "heroku-postgresql",
-      "options": {
-        "version": "12"
-      }
-    }
-  ],
-  "scripts": {
-    "postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
-  },
-  "buildpacks": [
-    {
-      "url": "heroku/php"
-    },
-    {
-      "url": "https://github.com/heroku/heroku-buildpack-locale"
-    }
-  ],
-  "env": {
-    "APP_KEY": {
-      "description": "This key is used to create app cookies en secure attachments.",
-      "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
-    }
-  }
-}

app/Api/V1/Controllers/Controller.php

@@ -74,42 +74,6 @@ abstract class Controller extends BaseController
         );
     }
 
-    /**
-     * Method to help build URL'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;
-    }
-
     /**
      * Method to grab all parameters from the URL.
      *
@@ -211,4 +175,40 @@ abstract class Controller extends BaseController
 
         return $bag;
     }
+
+    /**
+     * Method to help build URL'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/Data/DestroyController.php

@@ -201,6 +201,94 @@ class DestroyController extends Controller
         return response()->json([], 204);
     }
 
+    /**
+     *
+     */
+    private function destroyBudgets(): void
+    {
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository->destroyAll();
+
+        /** @var BudgetLimitRepositoryInterface $blRepository */
+        $blRepository = app(BudgetLimitRepositoryInterface::class);
+        $blRepository->destroyAll();
+
+        /** @var BudgetRepositoryInterface $budgetRepository */
+        $budgetRepository = app(BudgetRepositoryInterface::class);
+        $budgetRepository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyBills(): void
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyPiggyBanks(): void
+    {
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyRules(): void
+    {
+        /** @var RuleGroupRepositoryInterface $repository */
+        $repository = app(RuleGroupRepositoryInterface::class);
+        $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();
+    }
+
+    /**
+     *
+     */
+    private function destroyTags(): void
+    {
+        /** @var TagRepositoryInterface $tagRepository */
+        $tagRepository = app(TagRepositoryInterface::class);
+        $tagRepository->destroyAll();
+    }
+
+    /**
+     * @return void
+     */
+    private function destroyObjectGroups(): void
+    {
+        /** @var ObjectGroupRepositoryInterface $repository */
+        $repository = app(ObjectGroupRepositoryInterface::class);
+        $repository->deleteAll();
+    }
+
     /**
      * @param array $types
      */
@@ -226,91 +314,6 @@ class DestroyController extends Controller
         }
     }
 
-    /**
-     *
-     */
-    private function destroyBills(): void
-    {
-        /** @var BillRepositoryInterface $repository */
-        $repository = app(BillRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyBudgets(): void
-    {
-        /** @var AvailableBudgetRepositoryInterface $abRepository */
-        $abRepository = app(AvailableBudgetRepositoryInterface::class);
-        $abRepository->destroyAll();
-
-        /** @var BudgetLimitRepositoryInterface $blRepository */
-        $blRepository = app(BudgetLimitRepositoryInterface::class);
-        $blRepository->destroyAll();
-
-        /** @var BudgetRepositoryInterface $budgetRepository */
-        $budgetRepository = app(BudgetRepositoryInterface::class);
-        $budgetRepository->destroyAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyCategories(): void
-    {
-        /** @var CategoryRepositoryInterface $categoryRepos */
-        $categoryRepos = app(CategoryRepositoryInterface::class);
-        $categoryRepos->destroyAll();
-    }
-
-    private function destroyObjectGroups(): void
-    {
-        /** @var ObjectGroupRepositoryInterface $repository */
-        $repository = app(ObjectGroupRepositoryInterface::class);
-        $repository->deleteAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyPiggyBanks(): void
-    {
-        /** @var PiggyBankRepositoryInterface $repository */
-        $repository = app(PiggyBankRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyRecurringTransactions(): void
-    {
-        /** @var RecurringRepositoryInterface $repository */
-        $repository = app(RecurringRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyRules(): void
-    {
-        /** @var RuleGroupRepositoryInterface $repository */
-        $repository = app(RuleGroupRepositoryInterface::class);
-        $repository->destroyAll();
-    }
-
-    /**
-     *
-     */
-    private function destroyTags(): void
-    {
-        /** @var TagRepositoryInterface $tagRepository */
-        $tagRepository = app(TagRepositoryInterface::class);
-        $tagRepository->destroyAll();
-    }
-
     /**
      * @param array $types
      */

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -29,6 +29,8 @@ use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ExportController
@@ -69,6 +71,36 @@ class ExportController extends Controller
         return $this->returnExport('accounts');
     }
 
+    /**
+     * @param string $key
+     *
+     * @return LaravelResponse
+     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    private function returnExport(string $key): LaravelResponse
+    {
+        $date     = date('Y-m-d-H-i-s');
+        $fileName = sprintf('%s-export-%s.csv', $date, $key);
+        $data     = $this->exporter->export();
+
+        /** @var LaravelResponse $response */
+        $response = response($data[$key]);
+        $response
+            ->header('Content-Description', 'File Transfer')
+            ->header('Content-Type', 'application/octet-stream')
+            ->header('Content-Disposition', 'attachment; filename=' . $fileName)
+            ->header('Content-Transfer-Encoding', 'binary')
+            ->header('Connection', 'Keep-Alive')
+            ->header('Expires', '0')
+            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+            ->header('Pragma', 'public')
+            ->header('Content-Length', (string)strlen($data[$key]));
+
+        return $response;
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
@@ -200,32 +232,4 @@ class ExportController extends Controller
 
         return $this->returnExport('transactions');
     }
-
-    /**
-     * @param  string  $key
-     *
-     * @return LaravelResponse
-     * @throws FireflyException
-     */
-    private function returnExport(string $key): LaravelResponse
-    {
-        $date     = date('Y-m-d-H-i-s');
-        $fileName = sprintf('%s-export-%s.csv', $date, $key);
-        $data     = $this->exporter->export();
-
-        /** @var LaravelResponse $response */
-        $response = response($data[$key]);
-        $response
-            ->header('Content-Description', 'File Transfer')
-            ->header('Content-Type', 'application/octet-stream')
-            ->header('Content-Disposition', 'attachment; filename='.$fileName)
-            ->header('Content-Transfer-Encoding', 'binary')
-            ->header('Connection', 'Keep-Alive')
-            ->header('Expires', '0')
-            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-            ->header('Pragma', 'public')
-            ->header('Content-Length', (string)strlen($data[$key]));
-
-        return $response;
-    }
 }

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

@@ -37,6 +37,9 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Http\JsonResponse;
 
+/**
+ * Class PurgeController
+ */
 class PurgeController extends Controller
 {
     /**

app/Api/V1/Controllers/Models/Transaction/ShowController.php

@@ -97,6 +97,21 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/getTransactionByJournal
+     *
+     * Show a single transaction, by transaction journal.
+     *
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return JsonResponse
+     */
+    public function showJournal(TransactionJournal $transactionJournal): JsonResponse
+    {
+        return $this->show($transactionJournal->transactionGroup);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/getTransaction
@@ -133,19 +148,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/transactions/getTransactionByJournal
-     *
-     * Show a single transaction, by transaction journal.
-     *
-     * @param  TransactionJournal  $transactionJournal
-     *
-     * @return JsonResponse
-     */
-    public function showJournal(TransactionJournal $transactionJournal): JsonResponse
-    {
-        return $this->show($transactionJournal->transactionGroup);
-    }
 }

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -79,6 +79,7 @@ class UpdateController extends Controller
     {
         Log::debug('Now in update routine for transaction group!');
         $data = $request->getAll();
+
         $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
         $manager          = $this->getManager();
 

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -97,35 +97,6 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/enableCurrency
-     *
-     * Enable a currency.
-     *
-     * @param  TransactionCurrency  $currency
-     *
-     * @return JsonResponse
-     * @throws FireflyException
-     * @throws JsonException
-     */
-    public function enable(TransactionCurrency $currency): JsonResponse
-    {
-        $this->repository->enable($currency);
-        $manager = $this->getManager();
-
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
-
-        /** @var CurrencyTransformer $transformer */
-        $transformer = app(CurrencyTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($currency, $transformer, 'currencies');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-    }
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/defaultCurrency
@@ -157,6 +128,35 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/enableCurrency
+     *
+     * Enable a currency.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     * @throws JsonException
+     */
+    public function enable(TransactionCurrency $currency): JsonResponse
+    {
+        $this->repository->enable($currency);
+        $manager = $this->getManager();
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/updateCurrency

app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php

@@ -30,6 +30,9 @@ use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
+/**
+ * Class DestroyController
+ */
 class DestroyController extends Controller
 {
     private LinkTypeRepositoryInterface $repository;

app/Api/V1/Controllers/Models/TransactionLink/ShowController.php

@@ -37,6 +37,9 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class ShowController
+ */
 class ShowController extends Controller
 {
     private LinkTypeRepositoryInterface $repository;

app/Api/V1/Controllers/Models/TransactionLink/StoreController.php

@@ -35,6 +35,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class StoreController
+ */
 class StoreController extends Controller
 {
     use TransactionFilter;

app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php

@@ -34,6 +34,9 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class UpdateController
+ */
 class UpdateController extends Controller
 {
     private JournalRepositoryInterface  $journalRepository;

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

@@ -33,7 +33,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Log;
-use JsonException;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 

app/Api/V1/Controllers/Summary/BasicController.php

@@ -121,30 +121,6 @@ class BasicController 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
@@ -346,17 +322,12 @@ class BasicController extends Controller
                 'currency_decimal_places' => $row['currency_decimal_places'],
                 'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),
                 'local_icon'              => 'money',
-                'sub_title'               => (string)trans(
-                    'firefly.box_spend_per_day',
-                    [
-                        'amount' => app('amount')->formatFlat(
+                'sub_title'               => app('amount')->formatFlat(
                     $row['currency_symbol'],
                     $row['currency_decimal_places'],
                     $perDay,
                     false
                 ),
-                    ]
-                ),
             ];
         }
 
@@ -422,4 +393,28 @@ class BasicController 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/System/ConfigurationController.php

@@ -94,6 +94,42 @@ class ConfigurationController extends Controller
         return response()->json($return);
     }
 
+    /**
+     * Get all config values.
+     *
+     * @return array
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    private function getDynamicConfiguration(): array
+    {
+        $isDemoSite  = app('fireflyconfig')->get('is_demo_site');
+        $updateCheck = app('fireflyconfig')->get('permission_update_check');
+        $lastCheck   = app('fireflyconfig')->get('last_update_check');
+        $singleUser  = app('fireflyconfig')->get('single_user_mode');
+
+        return [
+            'is_demo_site'            => $isDemoSite?->data,
+            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
+            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
+            'single_user_mode'        => $singleUser?->data,
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getStaticConfiguration(): array
+    {
+        $list   = EitherConfigKey::$static;
+        $return = [];
+        foreach ($list as $key) {
+            $return[$key] = config($key);
+        }
+
+        return $return;
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getSingleConfiguration
@@ -102,7 +138,6 @@ class ConfigurationController extends Controller
      *
      * @return JsonResponse
      * @throws ContainerExceptionInterface
-     * @throws FireflyException
      * @throws NotFoundExceptionInterface
      */
     public function show(string $configKey): JsonResponse
@@ -164,40 +199,4 @@ class ConfigurationController extends Controller
 
         return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
-
-    /**
-     * Get all config values.
-     *
-     * @return array
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
-     */
-    private function getDynamicConfiguration(): array
-    {
-        $isDemoSite  = app('fireflyconfig')->get('is_demo_site');
-        $updateCheck = app('fireflyconfig')->get('permission_update_check');
-        $lastCheck   = app('fireflyconfig')->get('last_update_check');
-        $singleUser  = app('fireflyconfig')->get('single_user_mode');
-
-        return [
-            'is_demo_site'            => $isDemoSite?->data,
-            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
-            'single_user_mode'        => $singleUser?->data,
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function getStaticConfiguration(): array
-    {
-        $list   = EitherConfigKey::$static;
-        $return = [];
-        foreach ($list as $key) {
-            $return[$key] = config($key);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Controllers/System/CronController.php

@@ -28,6 +28,8 @@ use FireflyIII\Api\V1\Requests\System\CronRequest;
 use FireflyIII\Support\Http\Controllers\CronRunner;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class CronController
@@ -44,6 +46,8 @@ class CronController extends Controller
      * @param string      $token
      *
      * @return JsonResponse
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function cron(CronRequest $request, string $token): JsonResponse
     {
@@ -54,7 +58,7 @@ class CronController extends Controller
         $return                           = [];
         $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);
         $return['auto_budgets']           = $this->runAutoBudget($config['force'], $config['date']);
-        if (true === config('cer.enabled')) {
+        if (true === config('cer.download_enabled')) {
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
         $return['bill_warnings'] = $this->billWarningCronJob($config['force'], $config['date']);

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

@@ -35,6 +35,9 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
+/**
+ * Class MessageController
+ */
 class MessageController extends Controller
 {
     public const RESOURCE_KEY = 'webhook_messages';

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

@@ -127,6 +127,7 @@ class ShowController extends Controller
      */
     public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
     {
+        app('log')->debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));
         /** @var MessageGeneratorInterface $engine */
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser(auth()->user());
@@ -141,6 +142,7 @@ class ShowController extends Controller
         $engine->generateMessages();
 
         // trigger event to send them:
+        app('log')->debug('send event RequestedSendWebhookMessages');
         event(new RequestedSendWebhookMessages());
 
         return response()->json([], 204);

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -38,6 +38,9 @@ class ExportRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    /**
+     * @return array
+     */
     public function getAll(): array
     {
         $result     = [

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -82,6 +82,28 @@ class GenericRequest extends FormRequest
         return $return;
     }
 
+    /**
+     *
+     */
+    private function parseAccounts(): void
+    {
+        if (0 !== $this->accounts->count()) {
+            return;
+        }
+        $repository = app(AccountRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array = $this->get('accounts');
+        if (is_array($array)) {
+            foreach ($array as $accountId) {
+                $accountId = (int)$accountId;
+                $account   = $repository->find($accountId);
+                if (null !== $account) {
+                    $this->accounts->push($account);
+                }
+            }
+        }
+    }
+
     /**
      * @return Collection
      */
@@ -92,6 +114,28 @@ class GenericRequest extends FormRequest
         return $this->bills;
     }
 
+    /**
+     *
+     */
+    private function parseBills(): void
+    {
+        if (0 !== $this->bills->count()) {
+            return;
+        }
+        $repository = app(BillRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array = $this->get('bills');
+        if (is_array($array)) {
+            foreach ($array as $billId) {
+                $billId = (int)$billId;
+                $bill   = $repository->find($billId);
+                if (null !== $bill) {
+                    $this->bills->push($bill);
+                }
+            }
+        }
+    }
+
     /**
      * @return Collection
      */
@@ -102,6 +146,28 @@ class GenericRequest extends FormRequest
         return $this->budgets;
     }
 
+    /**
+     *
+     */
+    private function parseBudgets(): void
+    {
+        if (0 !== $this->budgets->count()) {
+            return;
+        }
+        $repository = app(BudgetRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array = $this->get('budgets');
+        if (is_array($array)) {
+            foreach ($array as $budgetId) {
+                $budgetId = (int)$budgetId;
+                $budget   = $repository->find($budgetId);
+                if (null !== $budget) {
+                    $this->budgets->push($budget);
+                }
+            }
+        }
+    }
+
     /**
      * @return Collection
      */
@@ -112,6 +178,28 @@ class GenericRequest extends FormRequest
         return $this->categories;
     }
 
+    /**
+     *
+     */
+    private function parseCategories(): void
+    {
+        if (0 !== $this->categories->count()) {
+            return;
+        }
+        $repository = app(CategoryRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $array = $this->get('categories');
+        if (is_array($array)) {
+            foreach ($array as $categoryId) {
+                $categoryId = (int)$categoryId;
+                $category   = $repository->find($categoryId);
+                if (null !== $category) {
+                    $this->categories->push($category);
+                }
+            }
+        }
+    }
+
     /**
      * @return Carbon
      */
@@ -180,114 +268,6 @@ class GenericRequest extends FormRequest
         return $this->tags;
     }
 
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        // this is cheating, but it works to initialize the collections.
-        $this->accounts   = new Collection();
-        $this->budgets    = new Collection();
-        $this->categories = new Collection();
-        $this->bills      = new Collection();
-        $this->tags       = new Collection();
-
-        return [
-            'start' => 'required|date',
-            'end'   => 'required|date|after_or_equal:start',
-        ];
-    }
-
-    /**
-     *
-     */
-    private function parseAccounts(): void
-    {
-        if (0 !== $this->accounts->count()) {
-            return;
-        }
-        $repository = app(AccountRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array = $this->get('accounts');
-        if (is_array($array)) {
-            foreach ($array as $accountId) {
-                $accountId = (int)$accountId;
-                $account   = $repository->find($accountId);
-                if (null !== $account) {
-                    $this->accounts->push($account);
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private function parseBills(): void
-    {
-        if (0 !== $this->bills->count()) {
-            return;
-        }
-        $repository = app(BillRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array = $this->get('bills');
-        if (is_array($array)) {
-            foreach ($array as $billId) {
-                $billId = (int)$billId;
-                $bill   = $repository->find($billId);
-                if (null !== $bill) {
-                    $this->bills->push($bill);
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private function parseBudgets(): void
-    {
-        if (0 !== $this->budgets->count()) {
-            return;
-        }
-        $repository = app(BudgetRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array = $this->get('budgets');
-        if (is_array($array)) {
-            foreach ($array as $budgetId) {
-                $budgetId = (int)$budgetId;
-                $budget   = $repository->find($budgetId);
-                if (null !== $budget) {
-                    $this->budgets->push($budget);
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private function parseCategories(): void
-    {
-        if (0 !== $this->categories->count()) {
-            return;
-        }
-        $repository = app(CategoryRepositoryInterface::class);
-        $repository->setUser(auth()->user());
-        $array = $this->get('categories');
-        if (is_array($array)) {
-            foreach ($array as $categoryId) {
-                $categoryId = (int)$categoryId;
-                $category   = $repository->find($categoryId);
-                if (null !== $category) {
-                    $this->categories->push($category);
-                }
-            }
-        }
-    }
-
     /**
      *
      */
@@ -309,4 +289,24 @@ class GenericRequest extends FormRequest
             }
         }
     }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        // this is cheating, but it works to initialize the collections.
+        $this->accounts   = new Collection();
+        $this->budgets    = new Collection();
+        $this->categories = new Collection();
+        $this->bills      = new Collection();
+        $this->tags       = new Collection();
+
+        return [
+            'start' => 'required|date',
+            'end'   => 'required|date|after_or_equal:start',
+        ];
+    }
 }

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -73,6 +73,65 @@ class StoreRequest 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|null $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return [];
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleTransactionData($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|null $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return [];
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $current = [];
+            if (array_key_exists('type', $repetition)) {
+                $current['type'] = $repetition['type'];
+            }
+            if (array_key_exists('moment', $repetition)) {
+                $current['moment'] = $repetition['moment'];
+            }
+            if (array_key_exists('skip', $repetition)) {
+                $current['skip'] = (int)$repetition['skip'];
+            }
+            if (array_key_exists('weekend', $repetition)) {
+                $current['weekend'] = (int)$repetition['weekend'];
+            }
+
+            $return[] = $current;
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -139,63 +198,4 @@ class StoreRequest 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|null $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return [];
-        }
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $current = [];
-            if (array_key_exists('type', $repetition)) {
-                $current['type'] = $repetition['type'];
-            }
-            if (array_key_exists('moment', $repetition)) {
-                $current['moment'] = $repetition['moment'];
-            }
-            if (array_key_exists('skip', $repetition)) {
-                $current['skip'] = (int)$repetition['skip'];
-            }
-            if (array_key_exists('weekend', $repetition)) {
-                $current['weekend'] = (int)$repetition['weekend'];
-            }
-
-            $return[] = $current;
-        }
-
-        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|null $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return [];
-        }
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleTransactionData($transaction);
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -80,6 +80,70 @@ class UpdateRequest extends FormRequest
         return $return;
     }
 
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array|null
+     */
+    private function getRepetitionData(): ?array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array|null $repetitions */
+        $repetitions = $this->get('repetitions');
+        if (null === $repetitions) {
+            return null;
+        }
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $current = [];
+            if (array_key_exists('type', $repetition)) {
+                $current['type'] = $repetition['type'];
+            }
+
+            if (array_key_exists('moment', $repetition)) {
+                $current['moment'] = (string)$repetition['moment'];
+            }
+
+            if (array_key_exists('skip', $repetition)) {
+                $current['skip'] = (int)$repetition['skip'];
+            }
+
+            if (array_key_exists('weekend', $repetition)) {
+                $current['weekend'] = (int)$repetition['weekend'];
+            }
+            $return[] = $current;
+        }
+        if (0 === count($return)) {
+            return null;
+        }
+
+        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|null
+     */
+    private function getTransactionData(): ?array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array|null $transactions */
+        $transactions = $this->get('transactions');
+        if (null === $transactions) {
+            return null;
+        }
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = $this->getSingleTransactionData($transaction);
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -154,68 +218,4 @@ class UpdateRequest extends FormRequest
         );
     }
 
-    /**
-     * Returns the repetition data as it is found in the submitted data.
-     *
-     * @return array|null
-     */
-    private function getRepetitionData(): ?array
-    {
-        $return = [];
-        // repetition data:
-        /** @var array|null $repetitions */
-        $repetitions = $this->get('repetitions');
-        if (null === $repetitions) {
-            return null;
-        }
-        /** @var array $repetition */
-        foreach ($repetitions as $repetition) {
-            $current = [];
-            if (array_key_exists('type', $repetition)) {
-                $current['type'] = $repetition['type'];
-            }
-
-            if (array_key_exists('moment', $repetition)) {
-                $current['moment'] = (string)$repetition['moment'];
-            }
-
-            if (array_key_exists('skip', $repetition)) {
-                $current['skip'] = (int)$repetition['skip'];
-            }
-
-            if (array_key_exists('weekend', $repetition)) {
-                $current['weekend'] = (int)$repetition['weekend'];
-            }
-            $return[] = $current;
-        }
-        if (0 === count($return)) {
-            return null;
-        }
-
-        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|null
-     */
-    private function getTransactionData(): ?array
-    {
-        $return = [];
-        // transaction data:
-        /** @var array|null $transactions */
-        $transactions = $this->get('transactions');
-        if (null === $transactions) {
-            return null;
-        }
-        /** @var array $transaction */
-        foreach ($transactions as $transaction) {
-            $return[] = $this->getSingleTransactionData($transaction);
-        }
-
-        return $return;
-    }
-
 }

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -67,6 +67,48 @@ class StoreRequest extends FormRequest
         return $data;
     }
 
+    /**
+     * @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'] ?? 'true')),
+                    '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'] ?? 'true')),
+                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
     /**
      * The rules that the incoming request must be matched against.
      *
@@ -120,6 +162,21 @@ class StoreRequest extends FormRequest
         );
     }
 
+    /**
+     * Adds an error to the validator when there are no triggers in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneTrigger(Validator $validator): void
+    {
+        $data     = $validator->getData();
+        $triggers = $data['triggers'] ?? [];
+        // need at least one trigger
+        if (!is_countable($triggers) || 0 === count($triggers)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
+        }
+    }
+
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -135,35 +192,6 @@ class StoreRequest extends FormRequest
         }
     }
 
-    /**
-     * Adds an error to the validator when there are no ACTIVE actions in the array of data.
-     *
-     * @param  Validator  $validator
-     */
-    protected function atLeastOneActiveAction(Validator $validator): void
-    {
-        $data    = $validator->getData();
-        $actions = $data['actions'] ?? [];
-        // need at least one trigger
-        if (!is_countable($actions) || 0 === count($actions)) {
-            return;
-        }
-        $allInactive   = true;
-        $inactiveIndex = 0;
-        foreach ($actions as $index => $action) {
-            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
-            if (true === $active) {
-                $allInactive = false;
-            }
-            if (false === $active) {
-                $inactiveIndex = $index;
-            }
-        }
-        if (true === $allInactive) {
-            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
-        }
-    }
-
     /**
      * Adds an error to the validator when there are no ACTIVE triggers in the array of data.
      *
@@ -194,59 +222,31 @@ class StoreRequest extends FormRequest
     }
 
     /**
-     * Adds an error to the validator when there are no triggers in the array of data.
+     * Adds an error to the validator when there are no ACTIVE actions in the array of data.
      *
      * @param Validator $validator
      */
-    protected function atLeastOneTrigger(Validator $validator): void
+    protected function atLeastOneActiveAction(Validator $validator): void
     {
         $data    = $validator->getData();
-        $triggers = $data['triggers'] ?? [];
+        $actions = $data['actions'] ?? [];
         // need at least one trigger
-        if (!is_countable($triggers) || 0 === count($triggers)) {
-            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
+        if (!is_countable($actions) || 0 === count($actions)) {
+            return;
+        }
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        foreach ($actions as $index => $action) {
+            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
             }
         }
-
-    /**
-     * @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'] ?? 'true')),
-                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
-                ];
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_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'] ?? 'true')),
-                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
-                ];
-            }
-        }
-
-        return $return;
-    }
 }

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -52,24 +52,11 @@ class TestRequest extends FormRequest
     }
 
     /**
-     * @return array
+     * @return int
      */
-    public function rules(): array
+    private function getPage(): int
     {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function getAccounts(): array
-    {
-        return $this->get('accounts');
+        return 0 === (int)$this->query('page') ? 1 : (int)$this->query('page');
     }
 
     /**
@@ -83,10 +70,23 @@ class TestRequest extends FormRequest
     }
 
     /**
-     * @return int
+     * @return array
      */
-    private function getPage(): int
+    private function getAccounts(): array
     {
-        return 0 === (int)$this->query('page') ? 1 : (int)$this->query('page');
+        return $this->get('accounts');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 }

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -50,16 +50,13 @@ class TriggerRequest extends FormRequest
     }
 
     /**
-     * @return array
+     * @param string $field
+     *
+     * @return Carbon|null
      */
-    public function rules(): array
+    private function getDate(string $field): ?Carbon
     {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
-        ];
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($this->query($field), 0, 10));
     }
 
     /**
@@ -71,12 +68,15 @@ class TriggerRequest extends FormRequest
     }
 
     /**
-     * @param  string  $field
-     *
-     * @return Carbon|null
+     * @return array
      */
-    private function getDate(string $field): ?Carbon
+    public function rules(): array
     {
-        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($this->query($field), 0, 10));
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 }

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -73,6 +73,56 @@ class UpdateRequest extends FormRequest
         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) {
+                $active         = array_key_exists('active', $trigger) ? $trigger['active'] : true;
+                $stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
+                $return[]       = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $active,
+                    'stop_processing' => $stopProcessing,
+                ];
+            }
+        }
+
+        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.
      *
@@ -130,21 +180,6 @@ class UpdateRequest 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.
      *
@@ -160,36 +195,6 @@ class UpdateRequest extends FormRequest
         }
     }
 
-    /**
-     * Adds an error to the validator when there are no repetitions in the array of data.
-     *
-     * @param  Validator  $validator
-     */
-    protected function atLeastOneValidAction(Validator $validator): void
-    {
-        $data          = $validator->getData();
-        $actions       = $data['actions'] ?? [];
-        $allInactive   = true;
-        $inactiveIndex = 0;
-        // need at least one action
-        if (is_array($actions) && 0 === count($actions)) {
-            return;
-        }
-
-        foreach ($actions as $index => $action) {
-            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
-            if (true === $active) {
-                $allInactive = false;
-            }
-            if (false === $active) {
-                $inactiveIndex = $index;
-            }
-        }
-        if (true === $allInactive) {
-            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
-        }
-    }
-
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -220,52 +225,47 @@ class UpdateRequest 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
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
      */
-    private function getRuleTriggers(): ?array
+    protected function atLeastOneValidAction(Validator $validator): void
     {
-        if (!$this->has('triggers')) {
-            return null;
-        }
-        $triggers = $this->get('triggers');
-        $return   = [];
-        if (is_array($triggers)) {
-            foreach ($triggers as $trigger) {
-                $active         = array_key_exists('active', $trigger) ? $trigger['active'] : true;
-                $stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
-                $return[]       = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
-                    'active'          => $active,
-                    'stop_processing' => $stopProcessing,
-                ];
-            }
+        $data          = $validator->getData();
+        $actions       = $data['actions'] ?? [];
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        // need at least one action
+        if (is_array($actions) && 0 === count($actions)) {
+            return;
         }
 
-        return $return;
+        foreach ($actions as $index => $action) {
+            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
+            }
+        }
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
+        }
     }
 }

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -50,16 +50,13 @@ class TestRequest extends FormRequest
     }
 
     /**
-     * @return array
+     * @param string $field
+     *
+     * @return Carbon|null
      */
-    public function rules(): array
+    private function getDate(string $field): ?Carbon
     {
-        return [
-            'start'      => 'date',
-            'end'        => 'date|after_or_equal:start',
-            'accounts'   => '',
-            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
-        ];
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
@@ -71,12 +68,15 @@ class TestRequest extends FormRequest
     }
 
     /**
-     * @param  string  $field
-     *
-     * @return Carbon|null
+     * @return array
      */
-    private function getDate(string $field): ?Carbon
+    public function rules(): array
     {
-        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+        return [
+            'start'      => 'date',
+            'end'        => 'date|after_or_equal:start',
+            'accounts'   => '',
+            'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
+        ];
     }
 }

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -50,14 +50,13 @@ class TriggerRequest extends FormRequest
     }
 
     /**
-     * @return array
+     * @param string $field
+     *
+     * @return Carbon|null
      */
-    public function rules(): array
+    private function getDate(string $field): ?Carbon
     {
-        return [
-            'start' => 'date',
-            'end'   => 'date|after_or_equal:start',
-        ];
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
     }
 
     /**
@@ -69,12 +68,13 @@ class TriggerRequest extends FormRequest
     }
 
     /**
-     * @param  string  $field
-     *
-     * @return Carbon|null
+     * @return array
      */
-    private function getDate(string $field): ?Carbon
+    public function rules(): array
     {
-        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+        return [
+            'start' => 'date',
+            'end'   => 'date|after_or_equal:start',
+        ];
     }
 }

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -69,6 +69,103 @@ class StoreRequest extends FormRequest
         // TODO include location and ability to process it.
     }
 
+    /**
+     * 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->clearString($object['type'], false),
+                'date'  => $this->dateFromValue($object['date']),
+                'order' => $this->integerFromValue((string)$object['order']),
+
+                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
+                'currency_code'         => $this->clearString((string)$object['currency_code'], false),
+
+                // foreign currency info:
+                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code'], false),
+
+                // amount and foreign amount. Cannot be 0.
+                'amount'                => $this->clearString((string)$object['amount'], false),
+                'foreign_amount'        => $this->clearString((string)$object['foreign_amount'], false),
+
+                // description.
+                'description'           => $this->clearString($object['description'], false),
+
+                // source of transaction. If everything is null, assume cash account.
+                'source_id'             => $this->integerFromValue((string)$object['source_id']),
+                'source_name'           => $this->clearString((string)$object['source_name'], false),
+                'source_iban'           => $this->clearString((string)$object['source_iban'], false),
+                'source_number'         => $this->clearString((string)$object['source_number'], false),
+                'source_bic'            => $this->clearString((string)$object['source_bic'], false),
+
+                // destination of transaction. If everything is null, assume cash account.
+                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
+                'destination_name'      => $this->clearString((string)$object['destination_name'], false),
+                'destination_iban'      => $this->clearString((string)$object['destination_iban'], false),
+                'destination_number'    => $this->clearString((string)$object['destination_number'], false),
+                'destination_bic'       => $this->clearString((string)$object['destination_bic'], false),
+
+                // budget info
+                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
+                'budget_name'           => $this->clearString((string)$object['budget_name'], false),
+
+                // category info
+                'category_id'           => $this->integerFromValue((string)$object['category_id']),
+                'category_name'         => $this->clearString((string)$object['category_name'], false),
+
+                // journal bill reference. Optional. Will only work for withdrawals
+                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
+                'bill_name'             => $this->clearString((string)$object['bill_name'], false),
+
+                // piggy bank reference. Optional. Will only work for transfers
+                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name'], false),
+
+                // some other interesting properties
+                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
+                'notes'                 => $this->clearString((string)$object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
+
+                // all custom fields:
+                'internal_reference'    => $this->clearString((string)$object['internal_reference'], false),
+                'external_id'           => $this->clearString((string)$object['external_id'], false),
+                '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->clearString((string)$object['bunq_payment_id'], false),
+                'external_url'          => $this->clearString((string)$object['external_url'], false),
+
+                'sepa_cc'       => $this->clearString((string)$object['sepa_cc'], false),
+                'sepa_ct_op'    => $this->clearString((string)$object['sepa_ct_op'], false),
+                'sepa_ct_id'    => $this->clearString((string)$object['sepa_ct_id'], false),
+                'sepa_db'       => $this->clearString((string)$object['sepa_db'], false),
+                'sepa_country'  => $this->clearString((string)$object['sepa_country'], false),
+                'sepa_ep'       => $this->clearString((string)$object['sepa_ep'], false),
+                'sepa_ci'       => $this->clearString((string)$object['sepa_ci'], false),
+                'sepa_batch_id' => $this->clearString((string)$object['sepa_batch_id'], false),
+                // 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.
      *
@@ -197,101 +294,4 @@ class StoreRequest 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->clearString($object['type'], false),
-                'date'  => $this->dateFromValue($object['date']),
-                'order' => $this->integerFromValue((string)$object['order']),
-
-                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
-                'currency_code'         => $this->clearString((string)$object['currency_code'], false),
-
-                // foreign currency info:
-                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
-                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code'], false),
-
-                // amount and foreign amount. Cannot be 0.
-                'amount'                => $this->clearString((string)$object['amount'], false),
-                'foreign_amount'        => $this->clearString((string)$object['foreign_amount'], false),
-
-                // description.
-                'description'           => $this->clearString($object['description'], false),
-
-                // source of transaction. If everything is null, assume cash account.
-                'source_id'             => $this->integerFromValue((string)$object['source_id']),
-                'source_name'           => $this->clearString((string)$object['source_name'], false),
-                'source_iban'           => $this->clearString((string)$object['source_iban'], false),
-                'source_number'         => $this->clearString((string)$object['source_number'], false),
-                'source_bic'            => $this->clearString((string)$object['source_bic'], false),
-
-                // destination of transaction. If everything is null, assume cash account.
-                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
-                'destination_name'      => $this->clearString((string)$object['destination_name'], false),
-                'destination_iban'      => $this->clearString((string)$object['destination_iban'], false),
-                'destination_number'    => $this->clearString((string)$object['destination_number'], false),
-                'destination_bic'       => $this->clearString((string)$object['destination_bic'], false),
-
-                // budget info
-                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
-                'budget_name'           => $this->clearString((string)$object['budget_name'], false),
-
-                // category info
-                'category_id'           => $this->integerFromValue((string)$object['category_id']),
-                'category_name'         => $this->clearString((string)$object['category_name'], false),
-
-                // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
-                'bill_name'             => $this->clearString((string)$object['bill_name'], false),
-
-                // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name'], false),
-
-                // some other interesting properties
-                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
-                'notes'                 => $this->clearString((string)$object['notes']),
-                'tags'                  => $this->arrayFromValue($object['tags']),
-
-                // all custom fields:
-                'internal_reference'    => $this->clearString((string)$object['internal_reference'], false),
-                'external_id'           => $this->clearString((string)$object['external_id'], false),
-                '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->clearString((string)$object['bunq_payment_id'], false),
-                'external_url'          => $this->clearString((string)$object['external_url'], false),
-
-                'sepa_cc'       => $this->clearString((string)$object['sepa_cc'], false),
-                'sepa_ct_op'    => $this->clearString((string)$object['sepa_ct_op'], false),
-                'sepa_ct_id'    => $this->clearString((string)$object['sepa_ct_id'], false),
-                'sepa_db'       => $this->clearString((string)$object['sepa_db'], false),
-                'sepa_country'  => $this->clearString((string)$object['sepa_country'], false),
-                'sepa_ep'       => $this->clearString((string)$object['sepa_ep'], false),
-                'sepa_ci'       => $this->clearString((string)$object['sepa_ci'], false),
-                'sepa_batch_id' => $this->clearString((string)$object['sepa_batch_id'], false),
-                // 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/Models/Transaction/UpdateRequest.php

@@ -59,6 +59,7 @@ class UpdateRequest extends FormRequest
      * Get all data. Is pretty complex because of all the ??-statements.
      *
      * @return array
+     * @throws FireflyException
      */
     public function getAll(): array
     {
@@ -152,6 +153,7 @@ class UpdateRequest extends FormRequest
      * Get transaction data.
      *
      * @return array
+     * @throws FireflyException
      */
     private function getTransactionData(): array
     {
@@ -322,7 +324,7 @@ class UpdateRequest extends FormRequest
 
         return [
             // basic fields for group:
-            'group_title'                           => 'between:1,1000',
+            'group_title'                           => 'between:1,1000|nullable',
             'apply_rules'                           => [new IsBoolean()],
 
             // transaction rules (in array for splits):
@@ -335,8 +337,8 @@ class UpdateRequest extends FormRequest
 
 
             // currency info
-            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code',
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.currency_code'          => 'min:3|max:51|exists:transaction_currencies,code|nullable',
             'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:51|exists:transaction_currencies,code',
 
@@ -356,9 +358,9 @@ class UpdateRequest extends FormRequest
             'transactions.*.destination_name'       => 'between:1,255|nullable',
 
             // budget, category, bill and piggy
-            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser()],
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
             'transactions.*.budget_name'            => ['between:1,255', 'nullable', new BelongsUser()],
-            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser()],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
             'transactions.*.category_name'          => 'between:1,255|nullable',
             'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
             'transactions.*.bill_name'              => ['between:1,255', 'nullable', new BelongsUser()],
@@ -366,7 +368,7 @@ class UpdateRequest extends FormRequest
             // other interesting fields
             'transactions.*.reconciled'             => [new IsBoolean()],
             'transactions.*.notes'                  => 'min:1|max:50000|nullable',
-            'transactions.*.tags'                   => 'between:0,255',
+            'transactions.*.tags'                   => 'between:0,255|nullable',
 
             // meta info fields
             'transactions.*.internal_reference'     => 'min:1|max:255|nullable',

app/Api/V1/Requests/User/PreferenceStoreRequest.php

@@ -27,6 +27,9 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
+/**
+ * Class PreferenceStoreRequest
+ */
 class PreferenceStoreRequest extends FormRequest
 {
     use ChecksLogin;

app/Api/V1/Requests/User/PreferenceUpdateRequest.php

@@ -28,6 +28,9 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
+/**
+ * Class PreferenceUpdateRequest
+ */
 class PreferenceUpdateRequest extends FormRequest
 {
     use ChecksLogin;

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

@@ -32,9 +32,7 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use JsonException;
 
 /**
  * Class AccountController
@@ -66,12 +64,16 @@ class AccountController extends Controller
 
     /**
      * Documentation for this endpoint:
-     * TODO endpoint is not documented.
+     * TODO list of checks
+     * 1. use dates from ParameterBag
+     * 2. Request validates dates
+     * 3. Request includes user_group_id as administration_id
+     * 4. Endpoint is documented.
+     * 5. Collector uses administration_id
      *
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse
-     * @throws JsonException
      * @throws FireflyException
      * @throws FireflyException
      */
@@ -80,7 +82,7 @@ class AccountController extends Controller
         $data  = $request->getData();
         $types = $data['types'];
         $query = $data['query'];
-        $date  = $data['date'] ?? today(config('app.timezone'));
+        $date  = $this->parameters->get('date') ?? today(config('app.timezone'));
         $this->adminRepository->setAdministrationId($data['administration_id']);
 
         $return          = [];

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

@@ -27,10 +27,12 @@ namespace FireflyIII\Api\V2\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
 use Illuminate\Http\JsonResponse;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -40,7 +42,7 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class AccountController extends Controller
 {
-    use ConvertsExchangeRates;
+    use CleansChartData;
 
     private AccountRepositoryInterface $repository;
 
@@ -53,7 +55,7 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-
+                $this->repository->setAdministrationId(auth()->user()->user_group_id);
                 return $next($request);
             }
         );
@@ -63,24 +65,32 @@ class AccountController extends Controller
      * This endpoint is documented at
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/charts/getChartAccountOverview
      *
+     * The native currency is the preferred currency on the page /currencies.
+     *
+     * If a transaction has foreign currency = native currency, the foreign amount will be used, no conversion
+     * will take place.
+     *
+     * TODO validate and set administration_id from request
+     *
      * @param DateRequest $request
      *
      * @return JsonResponse
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
+     * @throws FireflyException
      */
     public function dashboard(DateRequest $request): JsonResponse
     {
-        // parameters for chart:
-        $dates = $request->getAll();
         /** @var Carbon $start */
-        $start = $dates['start'];
+        $start = $this->parameters->get('start');
         /** @var Carbon $end */
-        $end = $dates['end'];
+        $end = $this->parameters->get('end');
+        $end->endOfDay();
 
         // user's preferences
         $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT])->pluck('id')->toArray();
         $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
+        /** @var TransactionCurrency $default */
         $default   = app('amount')->getDefaultCurrency();
         $accounts  = $this->repository->getAccountsById($frontPage->data);
         $chartData = [];
@@ -89,7 +99,6 @@ class AccountController extends Controller
             $frontPage->data = $defaultSet;
             $frontPage->save();
         }
-
         /** @var Account $account */
         foreach ($accounts as $account) {
             $currency = $this->repository->getAccountCurrency($account);
@@ -98,38 +107,45 @@ class AccountController extends Controller
             }
             $currentSet     = [
                 'label'                   => $account->name,
+                // the currency that belongs to the account.
                 'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'native_id'               => null,
-                'native_code'             => null,
-                'native_symbol'           => null,
-                'native_decimal_places'   => null,
-                'start_date'              => $start->toAtomString(),
-                'end_date'                => $end->toAtomString(),
-                'type'                    => 'line', // line, area or bar
-                'yAxisID'                 => 0, // 0, 1, 2
+
+                // the default currency of the user (could be the same!)
+                'native_id'               => (int)$default->id,
+                'native_code'             => $default->code,
+                'native_symbol'           => $default->symbol,
+                'native_decimal_places'   => (int)$default->decimal_places,
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => '1D',
                 'entries'                 => [],
+                'native_entries'          => [],
             ];
             $currentStart   = clone $start;
-            $range        = app('steam')->balanceInRange($account, $start, clone $end);
-
-            // 2022-10-11: this method no longer converts to floats
+            $range          = app('steam')->balanceInRange($account, $start, clone $end, $currency);
+            $rangeConverted = app('steam')->balanceInRangeConverted($account, $start, clone $end, $default);
 
             $previous          = array_values($range)[0];
+            $previousConverted = array_values($rangeConverted)[0];
             while ($currentStart <= $end) {
                 $format            = $currentStart->format('Y-m-d');
                 $label             = $currentStart->toAtomString();
                 $balance           = array_key_exists($format, $range) ? $range[$format] : $previous;
+                $balanceConverted  = array_key_exists($format, $rangeConverted) ? $rangeConverted[$format] : $previousConverted;
                 $previous          = $balance;
+                $previousConverted = $balanceConverted;
+
                 $currentStart->addDay();
                 $currentSet['entries'][$label]        = $balance;
+                $currentSet['native_entries'][$label] = $balanceConverted;
             }
-            $currentSet  = $this->cerChartSet($currentSet);
             $chartData[] = $currentSet;
         }
 
-        return response()->json($chartData);
+        return response()->json($this->clean($chartData));
     }
+
 }

app/Api/V2/Controllers/Chart/BalanceController.php

@@ -0,0 +1,260 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * BalanceController.php
+ * Copyright (c) 2023 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\V2\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Chart\BalanceChartRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BalanceController
+ */
+class BalanceController extends Controller
+{
+    use CleansChartData;
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * The code is practically a duplicate of ReportController::operations.
+     *
+     * Currency is up to the account/transactions in question, but conversion to the default
+     * currency is possible.
+     *
+     * If the transaction being processed is already in native currency OR if the
+     * foreign amount is in the native currency, the amount will not be converted.
+     *
+     * TODO validate and set administration_id
+     * TODO collector set group, not user
+     *
+     * @param BalanceChartRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function balance(BalanceChartRequest $request): JsonResponse
+    {
+        $params = $request->getAll();
+        /** @var Carbon $start */
+        $start = $this->parameters->get('start');
+        /** @var Carbon $end */
+        $end = $this->parameters->get('end');
+        $end->endOfDay();
+        /** @var Collection $accounts */
+        $accounts       = $params['accounts'];
+        $preferredRange = $params['period'];
+
+        // set some formats, based on input parameters.
+        $format = app('navigation')->preferredCarbonFormatByPeriod($preferredRange);
+
+        // prepare for currency conversion and data collection:
+        $ids = $accounts->pluck('id')->toArray();
+        /** @var TransactionCurrency $default */
+        $default    = app('amount')->getDefaultCurrency();
+        $converter  = new ExchangeRateConverter();
+        $currencies = [(int)$default->id => $default,]; // currency cache
+        $data       = [];
+        $chartData  = [];
+
+        // get journals for entire period:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setRange($start, $end)->withAccountInformation();
+        $collector->setXorAccounts($accounts);
+        $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::RECONCILIATION, TransactionType::TRANSFER]);
+        $journals = $collector->getExtractedJournals();
+
+        // set array for default currency (even if unused later on)
+        $defaultCurrencyId        = (int)$default->id;
+        $data[$defaultCurrencyId] = [
+            'currency_id'             => $defaultCurrencyId,
+            'currency_symbol'         => $default->symbol,
+            'currency_code'           => $default->code,
+            'currency_name'           => $default->name,
+            'currency_decimal_places' => (int)$default->decimal_places,
+            'native_id'               => $defaultCurrencyId,
+            'native_symbol'           => $default->symbol,
+            'native_code'             => $default->code,
+            'native_name'             => $default->name,
+            'native_decimal_places'   => (int)$default->decimal_places,
+        ];
+
+
+        // loop. group by currency and by period.
+        /** @var array $journal */
+        foreach ($journals as $journal) {
+            // format the date according to the period
+            $period = $journal['date']->format($format);
+
+            // collect (and cache) currency information for this journal.
+            $currencyId              = (int)$journal['currency_id'];
+            $currency                = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
+            $currencies[$currencyId] = $currency; // may just re-assign itself, don't mind.
+
+            // set the array with monetary info, if it does not exist.
+            $data[$currencyId] = $data[$currencyId] ?? [
+                'currency_id'             => $currencyId,
+                'currency_symbol'         => $journal['currency_symbol'],
+                'currency_code'           => $journal['currency_code'],
+                'currency_name'           => $journal['currency_name'],
+                'currency_decimal_places' => $journal['currency_decimal_places'],
+                // native currency info (could be the same)
+                'native_id'               => (int)$default->id,
+                'native_code'             => $default->code,
+                'native_symbol'           => $default->symbol,
+                'native_decimal_places'   => (int)$default->decimal_places,
+            ];
+
+            // set the array (in monetary info) with spent/earned in this $period, if it does not exist.
+            $data[$currencyId][$period] = $data[$currencyId][$period] ?? [
+                'period'        => $period,
+                'spent'         => '0',
+                'earned'        => '0',
+                'native_spent'  => '0',
+                'native_earned' => '0',
+            ];
+            // is this journal's amount in- our outgoing?
+            $key    = 'spent';
+            $amount = app('steam')->negative($journal['amount']);
+            // deposit = incoming
+            // transfer or reconcile or opening balance, and these accounts are the destination.
+            if (
+                TransactionType::DEPOSIT === $journal['transaction_type_type']
+                ||
+
+                (
+                    (
+                        TransactionType::TRANSFER === $journal['transaction_type_type']
+                        || TransactionType::RECONCILIATION === $journal['transaction_type_type']
+                        || TransactionType::OPENING_BALANCE === $journal['transaction_type_type']
+                    )
+                    && in_array($journal['destination_account_id'], $ids, true)
+                )
+            ) {
+                $key    = 'earned';
+                $amount = app('steam')->positive($journal['amount']);
+            }
+            // get conversion rate
+            $rate            = $converter->getCurrencyRate($currency, $default, $journal['date']);
+            $amountConverted = bcmul($amount, $rate);
+
+            // perhaps transaction already has the foreign amount in the native currency.
+            if ((int)$journal['foreign_currency_id'] === (int)$default->id) {
+                $amountConverted = $journal['foreign_amount'] ?? '0';
+                $amountConverted = 'earned' === $key ? app('steam')->positive($amountConverted) : app('steam')->negative($amountConverted);
+            }
+
+            // add normal entry
+            $data[$currencyId][$period][$key] = bcadd($data[$currencyId][$period][$key], $amount);
+
+            // add converted entry
+            $convertedKey                              = sprintf('native_%s', $key);
+            $data[$currencyId][$period][$convertedKey] = bcadd($data[$currencyId][$period][$convertedKey], $amountConverted);
+        }
+
+        // loop this data, make chart bars for each currency:
+        /** @var array $currency */
+        foreach ($data as $currency) {
+            // income and expense array prepped:
+            $income  = [
+                'label'                   => 'earned',
+                'currency_id'             => $currency['currency_id'],
+                'currency_symbol'         => $currency['currency_symbol'],
+                'currency_code'           => $currency['currency_code'],
+                'currency_decimal_places' => $currency['currency_decimal_places'],
+                'native_id'               => $currency['native_id'],
+                'native_symbol'           => $currency['native_symbol'],
+                'native_code'             => $currency['native_code'],
+                'native_decimal_places'   => $currency['native_decimal_places'],
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => $preferredRange,
+                'entries'                 => [],
+                'native_entries'          => [],
+            ];
+            $expense = [
+                'label'                   => 'spent',
+                'currency_id'             => $currency['currency_id'],
+                'currency_symbol'         => $currency['currency_symbol'],
+                'currency_code'           => $currency['currency_code'],
+                'currency_decimal_places' => $currency['currency_decimal_places'],
+                'native_id'               => $currency['native_id'],
+                'native_symbol'           => $currency['native_symbol'],
+                'native_code'             => $currency['native_code'],
+                'native_decimal_places'   => $currency['native_decimal_places'],
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => $preferredRange,
+                'entries'                 => [],
+                'native_entries'          => [],
+
+            ];
+            // loop all possible periods between $start and $end, and add them to the correct dataset.
+            $currentStart = clone $start;
+            while ($currentStart <= $end) {
+                $key   = $currentStart->format($format);
+                $label = $currentStart->toAtomString();
+                // normal entries
+                $income['entries'][$label]  = app('steam')->bcround(($currency[$key]['earned'] ?? '0'), $currency['currency_decimal_places']);
+                $expense['entries'][$label] = app('steam')->bcround(($currency[$key]['spent'] ?? '0'), $currency['currency_decimal_places']);
+
+                // converted entries
+                $income['native_entries'][$label]  = app('steam')->bcround(($currency[$key]['native_earned'] ?? '0'), $currency['native_decimal_places']);
+                $expense['native_entries'][$label] = app('steam')->bcround(($currency[$key]['native_spent'] ?? '0'), $currency['native_decimal_places']);
+
+                // next loop
+                $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
+            }
+
+            $chartData[] = $income;
+            $chartData[] = $expense;
+        }
+        return response()->json($this->clean($chartData));
+    }
+
+}

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

@@ -0,0 +1,313 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * BudgetController.php
+ * Copyright (c) 2023 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\V2\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Administration\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Administration\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    use CleansChartData;
+
+    protected OperationsRepositoryInterface $opsRepository;
+    private BudgetLimitRepositoryInterface  $blRepository;
+    private array                           $currencies = [];
+    private TransactionCurrency             $currency;
+    private BudgetRepositoryInterface       $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->currency      = app('amount')->getDefaultCurrency();
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param DateRequest $request
+     *
+     * TODO see autocomplete/accountcontroller
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function dashboard(DateRequest $request): JsonResponse
+    {
+        // get user.
+        /** @var User $user */
+        $user = auth()->user();
+        // group ID
+        $administrationId = $user->getAdministrationId();
+        $this->repository->setAdministrationId($administrationId);
+        $this->opsRepository->setAdministrationId($administrationId);
+
+        $params = $request->getAll();
+        /** @var Carbon $start */
+        $start = $params['start'];
+        /** @var Carbon $end */
+        $end = $params['end'];
+
+        // code from FrontpageChartGenerator, but not in separate class
+        $budgets = $this->repository->getActiveBudgets();
+        $data    = [];
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            // could return multiple arrays, so merge.
+            $data = array_merge($data, $this->processBudget($budget, $start, $end));
+        }
+        return response()->json($this->clean($data));
+    }
+
+    /**
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function processBudget(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        // get all limits:
+        $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+        $rows   = [];
+
+        // if no limits
+        if (0 === $limits->count()) {
+            // return as a single item in an array
+            $rows = $this->noBudgetLimits($budget, $start, $end);
+        }
+        if ($limits->count() > 0) {
+            $rows = $this->budgetLimits($budget, $limits);
+        }
+        // is always an array
+        $return = [];
+        foreach ($rows as $row) {
+            $current  = [
+                'label'                   => $budget->name,
+                'currency_id'             => $row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_name'           => $row['currency_name'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+                'native_id'               => $row['native_id'],
+                'native_code'             => $row['native_code'],
+                'native_name'             => $row['native_name'],
+                'native_decimal_places'   => $row['native_decimal_places'],
+                'period'                  => null,
+                'start'                   => $row['start'],
+                'end'                     => $row['end'],
+                'entries'                 => [
+                    'spent'     => $row['spent'],
+                    'left'      => $row['left'],
+                    'overspent' => $row['overspent'],
+                ],
+                'native_entries'          => [
+                    'spent'     => $row['native_spent'],
+                    'left'      => $row['native_left'],
+                    'overspent' => $row['native_overspent'],
+                ],
+            ];
+            $return[] = $current;
+        }
+        return $return;
+    }
+
+    /**
+     * When no budget limits are present, the expenses of the whole period are collected and grouped.
+     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
+     *
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $budgetId = (int)$budget->id;
+        $spent    = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+        return $this->processExpenses($budgetId, $spent, $start, $end);
+    }
+
+    /**
+     * Shared between the "noBudgetLimits" function and "processLimit".
+     *
+     * Will take a single set of expenses and return its info.
+     *
+     * @param int   $budgetId
+     * @param array $array
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function processExpenses(int $budgetId, array $array, Carbon $start, Carbon $end): array
+    {
+        $converter = new ExchangeRateConverter();
+        $return    = [];
+
+        /**
+         * This array contains the expenses in this budget. Grouped per currency.
+         * The grouping is on the main currency only.
+         *
+         * @var int   $currencyId
+         * @var array $block
+         */
+        foreach ($array as $currencyId => $block) {
+            $this->currencies[$currencyId] = $this->currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
+            $return[$currencyId]           = $return[$currencyId] ?? [
+                'currency_id'             => $currencyId,
+                'currency_code'           => $block['currency_code'],
+                'currency_name'           => $block['currency_name'],
+                'currency_symbol'         => $block['currency_symbol'],
+                'currency_decimal_places' => (int)$block['currency_decimal_places'],
+                'native_id'               => (int)$this->currency->id,
+                'native_code'             => $this->currency->code,
+                'native_name'             => $this->currency->name,
+                'native_symbol'           => $this->currency->symbol,
+                'native_decimal_places'   => (int)$this->currency->decimal_places,
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'spent'                   => '0',
+                'native_spent'            => '0',
+                'left'                    => '0',
+                'native_left'             => '0',
+                'overspent'               => '0',
+                'native_overspent'        => '0',
+
+            ];
+            $currentBudgetArray            = $block['budgets'][$budgetId];
+            //var_dump($return);
+            /** @var array $journal */
+            foreach ($currentBudgetArray['transaction_journals'] as $journal) {
+
+                // convert the amount to the native currency.
+                $rate            = $converter->getCurrencyRate($this->currencies[$currencyId], $this->currency, $journal['date']);
+                $convertedAmount = bcmul($journal['amount'], $rate);
+                if ($journal['foreign_currency_id'] === $this->currency->id) {
+                    $convertedAmount = $journal['foreign_amount'];
+                }
+
+                $return[$currencyId]['spent']        = bcadd($return[$currencyId]['spent'], $journal['amount']);
+                $return[$currencyId]['native_spent'] = bcadd($return[$currencyId]['native_spent'], $convertedAmount);
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * Function that processes each budget limit (per budget).
+     *
+     * If you have a budget limit in EUR, only transactions in EUR will be considered.
+     * If you have a budget limit in GBP, only transactions in GBP will be considered.
+     *
+     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
+     *
+     * @param Budget     $budget
+     * @param Collection $limits
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function budgetLimits(Budget $budget, Collection $limits): array
+    {
+        app('log')->debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
+        $data = [];
+        /** @var BudgetLimit $limit */
+        foreach ($limits as $limit) {
+            $data = array_merge($data, $this->processLimit($budget, $limit));
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Budget      $budget
+     * @param BudgetLimit $limit
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function processLimit(Budget $budget, BudgetLimit $limit): array
+    {
+        $budgetId = (int)$budget->id;
+        $end      = clone $limit->end_date;
+        $end->endOfDay();
+        $spent                = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
+        $limitCurrencyId      = (int)$limit->transaction_currency_id;
+        $limitCurrency        = $limit->transactionCurrency;
+        $converter            = new ExchangeRateConverter();
+        $filtered             = [];
+        $rate                 = $converter->getCurrencyRate($limitCurrency, $this->currency, $limit->start_date);
+        $convertedLimitAmount = bcmul($limit->amount, $rate);
+
+
+        /** @var array $entry */
+        foreach ($spent as $currencyId => $entry) {
+            // only spent the entry where the entry's currency matches the budget limit's currency
+            // so $filtered will only have 1 or 0 entries
+            if ($entry['currency_id'] === $limitCurrencyId) {
+                $filtered[$currencyId] = $entry;
+            }
+        }
+        $result = $this->processExpenses($budgetId, $filtered, $limit->start_date, $end);
+        if (1 === count($result)) {
+            $compare = bccomp((string)$limit->amount, app('steam')->positive($result[$limitCurrencyId]['spent']));
+            if (1 === $compare) {
+                // convert this amount into the native currency:
+                $result[$limitCurrencyId]['left']        = bcadd($limit->amount, $result[$limitCurrencyId]['spent']);
+                $result[$limitCurrencyId]['native_left'] = bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']);
+            }
+            if ($compare <= 0) {
+                $result[$limitCurrencyId]['overspent']        = app('steam')->positive(bcadd($limit->amount, $result[$limitCurrencyId]['spent']));
+                $result[$limitCurrencyId]['native_overspent'] = app('steam')->positive(bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']));
+            }
+        }
+        return $result;
+    }
+
+
+}

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

@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * BudgetController.php
+ * Copyright (c) 2023 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\V2\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BudgetController
+ */
+class CategoryController extends Controller
+{
+    use CleansChartData;
+
+    private AccountRepositoryInterface  $accountRepos;
+    private CurrencyRepositoryInterface $currencyRepos;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->accountRepos  = app(AccountRepositoryInterface::class);
+                $this->currencyRepos = app(CurrencyRepositoryInterface::class);
+                $this->accountRepos->setAdministrationId(auth()->user()->user_group_id);
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO may be worth to move to a handler but the data is simple enough.
+     * TODO see autoComplete/account controller
+     *
+     * @param DateRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function dashboard(DateRequest $request): JsonResponse
+    {
+        /** @var Carbon $start */
+        $start = $this->parameters->get('start');
+        /** @var Carbon $end */
+        $end        = $this->parameters->get('end');
+        $accounts   = $this->accountRepos->getAccountsByType([AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::ASSET, AccountType::DEFAULT]);
+        $default    = app('amount')->getDefaultCurrency();
+        $converter  = new ExchangeRateConverter();
+        $currencies = [];
+        $return     = [];
+
+        // get journals for entire period:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setRange($start, $end)->withAccountInformation();
+        $collector->setXorAccounts($accounts)->withCategoryInformation();
+        $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::RECONCILIATION]);
+        $journals = $collector->getExtractedJournals();
+
+        /** @var array $journal */
+        foreach ($journals as $journal) {
+            $currencyId              = (int)$journal['currency_id'];
+            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
+            $currencies[$currencyId] = $currency;
+            $categoryName            = null === $journal['category_name'] ? (string)trans('firefly.no_category') : $journal['category_name'];
+            $amount                  = app('steam')->positive($journal['amount']);
+            $nativeAmount            = $converter->convert($default, $currency, $journal['date'], $amount);
+            $key                     = sprintf('%s-%s', $categoryName, $currency->code);
+            if ((int)$journal['foreign_currency_id'] === (int)$default->id) {
+                $nativeAmount = app('steam')->positive($journal['foreign_amount']);
+            }
+            // create arrays
+            $return[$key] = $return[$key] ?? [
+                'label'                   => $categoryName,
+                'currency_id'             => (int)$currency->id,
+                'currency_code'           => $currency->code,
+                'currency_name'           => $currency->name,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => (int)$currency->decimal_places,
+                'native_id'               => (int)$default->id,
+                'native_code'             => $default->code,
+                'native_name'             => $default->name,
+                'native_symbol'           => $default->symbol,
+                'native_decimal_places'   => (int)$default->decimal_places,
+                'period'                  => null,
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'amount'                  => '0',
+                'native_amount'           => '0',
+            ];
+
+
+            // add monies
+            $return[$key]['amount']        = bcadd($return[$key]['amount'], $amount);
+            $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], $nativeAmount);
+        }
+        $return = array_values($return);
+
+        // order by native amount
+        usort($return, function (array $a, array $b) {
+            return (float)$a['native_amount'] < (float)$b['native_amount'] ? 1 : -1;
+        });
+        return response()->json($this->clean($return));
+    }
+
+}

app/Api/V2/Controllers/Controller.php

@@ -64,6 +64,78 @@ class Controller extends BaseController
         }
     }
 
+    /**
+     * TODO duplicate from V1 controller
+     * Method to grab all parameters from the URL.
+     *
+     * @return ParameterBag
+     */
+    private function getParameters(): ParameterBag
+    {
+        $bag = new ParameterBag();
+        try {
+            $page = (int)request()->get('page');
+        } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
+            $page = 1;
+        }
+
+        $integers = ['limit', 'administration'];
+        $dates    = ['start', 'end', 'date'];
+
+        if ($page < 1) {
+            $page = 1;
+        }
+        if ($page > (2 ^ 16)) {
+            $page = (2 ^ 16);
+        }
+        $bag->set('page', $page);
+
+        // some date fields:
+        foreach ($dates as $field) {
+            $date = null;
+            $obj  = null;
+            try {
+                $date = request()->query->get($field);
+            } catch (BadRequestException $e) {
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
+                Log::error($e->getMessage());
+            }
+            if (null !== $date) {
+                try {
+                    $obj = Carbon::parse($date, config('app.timezone'));
+                } catch (InvalidDateException | InvalidFormatException $e) {
+                    // don't care
+                    app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr($date, 0, 20), $e->getMessage()));
+                }
+                // out of range? set to null.
+                if (null !== $obj && ($obj->year <= 1900 || $obj->year > 2099)) {
+                    app('log')->warning(sprintf('Refuse to use date "%s" in API v2 controller parameter check: %s', $field, $obj->toAtomString()));
+                    $obj = null;
+                }
+            }
+            $bag->set($field, $obj);
+        }
+
+        // integer fields:
+        foreach ($integers as $integer) {
+            try {
+                $value = request()->query->get($integer);
+            } catch (BadRequestException $e) {
+                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
+                Log::error($e->getMessage());
+                $value = null;
+            }
+            if (null !== $value) {
+                $bag->set($integer, (int)$value);
+            }
+        }
+
+        // sort fields:
+        //   return $this->getSortParameters($bag);
+
+        return $bag;
+    }
+
     /**
      * @param string               $key
      * @param LengthAwarePaginator $paginator
@@ -80,7 +152,7 @@ class Controller extends BaseController
         $objects = $paginator->getCollection();
 
         // the transformer, at this point, needs to collect information that ALL items in the collection
-        // require, like meta data and stuff like that, and save it for later.
+        // require, like meta-data and stuff like that, and save it for later.
         $transformer->collectMetaData($objects);
 
         $resource = new FractalCollection($objects, $transformer, $key);
@@ -111,72 +183,4 @@ class Controller extends BaseController
 
         return $manager->createData($resource)->toArray();
     }
-
-    /**
-     * TODO duplicate from V1 controller
-     * Method to grab all parameters from the URL.
-     *
-     * @return ParameterBag
-     */
-    private function getParameters(): ParameterBag
-    {
-        $bag = new ParameterBag();
-        try {
-            $page = (int)request()->get('page');
-        } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
-            $page = 1;
-        }
-
-        $integers = ['limit', 'administration'];
-        $dates    = ['start', 'end', 'date'];
-
-        if ($page < 1) {
-            $page = 1;
-        }
-        if ($page > (2 ^ 16)) {
-            $page = (2 ^ 16);
-        }
-        $bag->set('page', $page);
-
-        // some date fields:
-        foreach ($dates as $field) {
-            $date = null;
-            try {
-                $date = request()->query->get($field);
-            } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
-                Log::error($e->getMessage());
-                $value = null;
-            }
-            $obj = null;
-            if (null !== $date) {
-                try {
-                    $obj = Carbon::parse($date);
-                } catch (InvalidDateException|InvalidFormatException $e) {
-                    // don't care
-                    app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr($date, 0, 20), $e->getMessage()));
-                }
-            }
-            $bag->set($field, $obj);
-        }
-
-        // integer fields:
-        foreach ($integers as $integer) {
-            try {
-                $value = request()->query->get($integer);
-            } catch (BadRequestException $e) {
-                Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
-                Log::error($e->getMessage());
-                $value = null;
-            }
-            if (null !== $value) {
-                $bag->set($integer, (int)$value);
-            }
-        }
-
-        // sort fields:
-        //   return $this->getSortParameters($bag);
-
-        return $bag;
-    }
 }

app/Api/V2/Controllers/Model/Bill/ShowController.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ShowController.php
+ * Copyright (c) 2023 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\V2\Controllers\Model\Bill;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\Administration\Bill\BillRepositoryInterface;
+use FireflyIII\Transformers\V2\BillTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setAdministrationId(auth()->user()->user_group_id);
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * TODO see autocomplete/accountcontroller for list.
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $this->repository->correctOrder();
+        $bills       = $this->repository->getBills();
+        $pageSize    = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $count       = $bills->count();
+        $bills       = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $transformer = new BillTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList('subscriptions', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Controllers/Model/Bill/SumController.php

@@ -26,8 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Bill;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
-use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
+use FireflyIII\Repositories\Administration\Bill\BillRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -35,8 +34,6 @@ use Illuminate\Http\JsonResponse;
  */
 class SumController extends Controller
 {
-    use ConvertsExchangeRates;
-
     private BillRepositoryInterface $repository;
 
     /**
@@ -58,35 +55,37 @@ class SumController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsPaidTrSum
      *
+     * TODO see autocomplete/accountcontroller for list.
+     *
      * @param DateRequest $request
      *
      * @return JsonResponse
      */
     public function paid(DateRequest $request): JsonResponse
     {
-        $dates     = $request->getAll();
-        $result    = $this->repository->sumPaidInRange($dates['start'], $dates['end']);
-        $converted = $this->cerSum($result);
+        $this->repository->setAdministrationId(auth()->user()->user_group_id);
+        $result = $this->repository->sumPaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
 
         // convert to JSON response:
-        return response()->api($converted);
+        return response()->api(array_values($result));
     }
 
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/transactions-sum/getBillsUnpaidTrSum
      *
+     * TODO see autocomplete/accountcontroller for list.
+     *
      * @param DateRequest $request
      *
      * @return JsonResponse
      */
     public function unpaid(DateRequest $request): JsonResponse
     {
-        $dates     = $request->getAll();
-        $result    = $this->repository->sumUnpaidInRange($dates['start'], $dates['end']);
-        $converted = $this->cerSum($result);
+        $this->repository->setAdministrationId(auth()->user()->user_group_id);
+        $result = $this->repository->sumUnpaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
 
         // convert to JSON response:
-        return response()->api($converted);
+        return response()->api(array_values($result));
     }
 }

app/Api/V2/Controllers/Model/Budget/ListController.php

@@ -31,6 +31,9 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 
+/**
+ * Class ListController
+ */
 class ListController extends Controller
 {
     private BudgetRepositoryInterface $repository;
@@ -57,6 +60,8 @@ class ListController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
+        echo 'this needs move to Administration';
+        exit;
         $collection = $this->repository->getActiveBudgets();
         $total      = $collection->count();
         $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);

app/Api/V2/Controllers/Model/Budget/ShowController.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ShowController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,13 +21,14 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -35,8 +36,6 @@ use Illuminate\Http\JsonResponse;
  */
 class ShowController extends Controller
 {
-    use ConvertsExchangeRates;
-
     private BudgetRepositoryInterface $repository;
 
     /**
@@ -61,6 +60,7 @@ class ShowController extends Controller
      */
     public function budgeted(DateRequest $request, Budget $budget): JsonResponse
     {
+        die('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -75,6 +75,7 @@ class ShowController extends Controller
      */
     public function spent(DateRequest $request, Budget $budget): JsonResponse
     {
+        die('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));

app/Api/V2/Controllers/Model/Budget/SumController.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -35,8 +34,6 @@ use Illuminate\Http\JsonResponse;
  */
 class SumController extends Controller
 {
-    use ConvertsExchangeRates;
-
     private BudgetRepositoryInterface $repository;
 
     /**
@@ -64,6 +61,7 @@ class SumController extends Controller
      */
     public function budgeted(DateRequest $request): JsonResponse
     {
+        die('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriod($data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -81,6 +79,7 @@ class SumController extends Controller
      */
     public function spent(DateRequest $request): JsonResponse
     {
+        die('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->spentInPeriod($data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));

app/Api/V2/Controllers/Model/BudgetLimit/ListController.php

@@ -32,6 +32,9 @@ use FireflyIII\Transformers\V2\BudgetLimitTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 
+/**
+ * Class ListController
+ */
 class ListController extends Controller
 {
     private BudgetLimitRepositoryInterface $repository;

app/Api/V2/Controllers/Model/PiggyBank/ShowController.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ShowController.php
+ * Copyright (c) 2023 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\V2\Controllers\Model\PiggyBank;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\Administration\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Transformers\V2\PiggyBankTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private PiggyBankRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(PiggyBankRepositoryInterface::class);
+                $this->repository->setAdministrationId(auth()->user()->user_group_id);
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * TODO see autocomplete/accountcontroller for list.
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $piggies     = $this->repository->getPiggyBanks();
+        $pageSize    = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $count       = $piggies->count();
+        $piggies     = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page'));
+        $transformer = new PiggyBankTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList('piggy-banks', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Controllers/NetWorthController.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V2\Controllers;
 
 use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
 use FireflyIII\Helpers\Report\NetWorthInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -34,8 +33,6 @@ use Illuminate\Http\JsonResponse;
  */
 class NetWorthController extends Controller
 {
-    use ConvertsExchangeRates;
-
     private NetWorthInterface $netWorth;
 
     /**
@@ -64,6 +61,7 @@ class NetWorthController extends Controller
      */
     public function get(SingleDateRequest $request): JsonResponse
     {
+        die('deprecated use of thing.');
         $date      = $request->getDate();
         $result    = $this->netWorth->sumNetWorthByCurrency($date);
         $converted = $this->cerSum($result);

app/Api/V2/Controllers/Summary/BasicController.php

@@ -0,0 +1,543 @@
+<?php
+
+/*
+ * SummaryController.php
+ * Copyright (c) 2021 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\V2\Controllers\Summary;
+
+use Carbon\Carbon;
+use Exception;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Helpers\Report\NetWorthInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Administration\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Administration\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Administration\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Administration\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BasicController
+ */
+class BasicController extends Controller
+{
+    private AvailableBudgetRepositoryInterface $abRepository;
+    private AccountRepositoryInterface         $accountRepository;
+    private BillRepositoryInterface            $billRepository;
+    private BudgetRepositoryInterface          $budgetRepository;
+    private CurrencyRepositoryInterface        $currencyRepos;
+    private OperationsRepositoryInterface      $opsRepository;
+
+    /**
+     * BasicController constructor.
+     *
+
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                    = auth()->user();
+                $this->abRepository      = app(AvailableBudgetRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->billRepository    = app(BillRepositoryInterface::class);
+                $this->budgetRepository  = app(BudgetRepositoryInterface::class);
+                $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
+                $this->opsRepository     = app(OperationsRepositoryInterface::class);
+
+                $this->abRepository->setAdministrationId($user->user_group_id);
+                $this->accountRepository->setAdministrationId($user->user_group_id);
+                $this->billRepository->setAdministrationId($user->user_group_id);
+                $this->budgetRepository->setAdministrationId($user->user_group_id);
+                $this->currencyRepos->setUser($user);
+                $this->opsRepository->setAdministrationId($user->user_group_id);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/summary/getBasicSummary
+     *
+     * @param DateRequest $request
+     *
+     * @return JsonResponse
+     * @throws Exception
+     */
+    public function basic(DateRequest $request): JsonResponse
+    {
+        // parameters for boxes:
+        $start = $this->parameters->get('start');
+        $end   = $this->parameters->get('end');
+
+        // balance information:
+        $balanceData  = [];
+        $billData     = [];
+        $spentData    = [];
+        $netWorthData = [];
+        $balanceData  = $this->getBalanceInformation($start, $end);
+        $billData     = $this->getBillInformation($start, $end);
+        $spentData    = $this->getLeftToSpendInfo($start, $end);
+        $netWorthData = $this->getNetWorthInfo($start, $end);
+        $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);
+        return response()->json($total);
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function getBalanceInformation(Carbon $start, Carbon $end): array
+    {
+        // prep some arrays:
+        $incomes    = [];
+        $expenses   = [];
+        $sums       = [];
+        $return     = [];
+        $currencies = [];
+        $converter  = new ExchangeRateConverter();
+        $default    = app('amount')->getDefaultCurrency();
+        /** @var User $user */
+        $user = auth()->user();
+
+        // collect income of user using the new group collector.
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setRange($start, $end)
+            ->setUserGroup($user->userGroup)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes([TransactionType::DEPOSIT])
+            ->setRange($start, $end);
+
+        $set = $collector->getExtractedJournals();
+        /** @var array $transactionJournal */
+        foreach ($set as $transactionJournal) {
+            // transaction info:
+            $currencyId              = (int)$transactionJournal['currency_id'];
+            $amount                  = bcmul($transactionJournal['amount'], '-1');
+            $currency                = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
+            $currencies[$currencyId] = $currency;
+            $nativeAmount            = $converter->convert($currency, $default, $transactionJournal['date'], $amount);
+            if ((int)$transactionJournal['foreign_currency_id'] === (int)$default->id) {
+                // use foreign amount instead
+                $nativeAmount = $transactionJournal['foreign_amount'];
+            }
+            // prep the arrays
+            $incomes[$currencyId] = $incomes[$currencyId] ?? '0';
+            $incomes['native']    = $incomes['native'] ?? '0';
+            $sums[$currencyId]    = $sums[$currencyId] ?? '0';
+            $sums['native']       = $sums['native'] ?? '0';
+
+            // add values:
+            $incomes[$currencyId] = bcadd($incomes[$currencyId], $amount);
+            $sums[$currencyId]    = bcadd($sums[$currencyId], $amount);
+            $incomes['native']    = bcadd($incomes['native'], $nativeAmount);
+            $sums['native']       = bcadd($sums['native'], $nativeAmount);
+        }
+
+        // collect expenses of user using the new group collector.
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setRange($start, $end)
+            ->setUserGroup($user->userGroup)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes([TransactionType::WITHDRAWAL])
+            ->setRange($start, $end);
+        $set = $collector->getExtractedJournals();
+
+        /** @var array $transactionJournal */
+        foreach ($set as $transactionJournal) {
+            // transaction info
+            $currencyId              = (int)$transactionJournal['currency_id'];
+            $amount                  = $transactionJournal['amount'];
+            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
+            $currencies[$currencyId] = $currency;
+            $nativeAmount            = $converter->convert($currency, $default, $transactionJournal['date'], $amount);
+            if ((int)$transactionJournal['foreign_currency_id'] === (int)$default->id) {
+                // use foreign amount instead
+                $nativeAmount = $transactionJournal['foreign_amount'];
+            }
+
+            // prep arrays
+            $expenses[$currencyId] = $expenses[$currencyId] ?? '0';
+            $expenses['native']    = $expenses['native'] ?? '0';
+            $sums[$currencyId]     = $sums[$currencyId] ?? '0';
+            $sums['native']        = $sums['native'] ?? '0';
+
+            // add values
+            $expenses[$currencyId] = bcadd($expenses[$currencyId], $amount);
+            $sums[$currencyId]     = bcadd($sums[$currencyId], $amount);
+            $expenses['native']    = bcadd($expenses['native'], $nativeAmount);
+            $sums['native']        = bcadd($sums['native'], $nativeAmount);
+        }
+
+        // create special array for native currency:
+        $return[] = [
+            'key'                     => 'balance-in-native',
+            'value'                   => $sums['native'],
+            'currency_id'             => $default->id,
+            'currency_code'           => $default->code,
+            'currency_symbol'         => $default->symbol,
+            'currency_decimal_places' => $default->decimal_places,
+        ];
+        $return[] = [
+            'key'                     => 'spent-in-native',
+            'value'                   => $expenses['native'],
+            'currency_id'             => $default->id,
+            'currency_code'           => $default->code,
+            'currency_symbol'         => $default->symbol,
+            'currency_decimal_places' => $default->decimal_places,
+        ];
+        $return[] = [
+            'key'                     => 'earned-in-native',
+            'value'                   => $incomes['native'],
+            'currency_id'             => $default->id,
+            'currency_code'           => $default->code,
+            'currency_symbol'         => $default->symbol,
+            'currency_decimal_places' => $default->decimal_places,
+        ];
+
+        // format amounts:
+        $keys = array_keys($sums);
+        foreach ($keys as $currencyId) {
+            if ('native' === $currencyId) {
+                // skip native entries.
+                continue;
+            }
+            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
+            $currencies[$currencyId] = $currency;
+            // create objects for big array.
+            $return[] = [
+                'key'                     => sprintf('balance-in-%s', $currency->code),
+                'value'                   => $sums[$currencyId] ?? '0',
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+            $return[] = [
+                'key'                     => sprintf('spent-in-%s', $currency->code),
+                'value'                   => $expenses[$currencyId] ?? '0',
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+            $return[] = [
+                'key'                     => sprintf('earned-in-%s', $currency->code),
+                'value'                   => $incomes[$currencyId] ?? '0',
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getBillInformation(Carbon $start, Carbon $end): array
+    {
+        /*
+         * Since both this method and the chart use the exact same data, we can suffice
+         * with calling the one method in the bill repository that will get this amount.
+         */
+        $paidAmount   = $this->billRepository->sumPaidInRange($start, $end);
+        $unpaidAmount = $this->billRepository->sumUnpaidInRange($start, $end);
+
+        $return = [];
+        /**
+         * @var array $info
+         */
+        foreach ($paidAmount as $info) {
+            $amount       = bcmul($info['sum'], '-1');
+            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $return[]     = [
+                'key'                     => sprintf('bills-paid-in-%s', $info['currency_code']),
+                'value'                   => $amount,
+                'currency_id'             => $info['currency_id'],
+                'currency_code'           => $info['currency_code'],
+                'currency_symbol'         => $info['currency_symbol'],
+                'currency_decimal_places' => $info['currency_decimal_places'],
+            ];
+            $return[]     = [
+                'key'                     => 'bills-paid-in-native',
+                'value'                   => $nativeAmount,
+                'currency_id'             => $info['native_id'],
+                'currency_code'           => $info['native_code'],
+                'currency_symbol'         => $info['native_symbol'],
+                'currency_decimal_places' => $info['native_decimal_places'],
+            ];
+        }
+
+        /**
+         * @var array $info
+         */
+        foreach ($unpaidAmount as $info) {
+            $amount       = bcmul($info['sum'], '-1');
+            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $return[]     = [
+                'key'                     => sprintf('bills-unpaid-in-%s', $info['currency_code']),
+                'value'                   => $amount,
+                'currency_id'             => $info['currency_id'],
+                'currency_code'           => $info['currency_code'],
+                'currency_symbol'         => $info['currency_symbol'],
+                'currency_decimal_places' => $info['currency_decimal_places'],
+            ];
+            $return[]     = [
+                'key'                     => 'bills-unpaid-in-native',
+                'value'                   => $nativeAmount,
+                'currency_id'             => $info['native_id'],
+                'currency_code'           => $info['native_code'],
+                'currency_symbol'         => $info['native_symbol'],
+                'currency_decimal_places' => $info['native_decimal_places'],
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     * @throws Exception
+     */
+    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
+    {
+        $return     = [];
+        $today      = today(config('app.timezone'));
+        $available  = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
+        $budgets    = $this->budgetRepository->getActiveBudgets();
+        $spent      = $this->opsRepository->listExpenses($start, $end, null, $budgets);
+        $default    = app('amount')->getDefaultCurrency();
+        $currencies = [];
+        $converter  = new ExchangeRateConverter();
+
+        // native info:
+        $nativeLeft   = [
+            'key'                     => 'left-to-spend-in-native',
+            'value'                   => '0',
+            'currency_id'             => (int)$default->id,
+            'currency_code'           => $default->code,
+            'currency_symbol'         => $default->symbol,
+            'currency_decimal_places' => (int)$default->decimal_places,
+        ];
+        $nativePerDay = [
+            'key'                     => 'left-per-day-to-spend-in-native',
+            'value'                   => '0',
+            'currency_id'             => (int)$default->id,
+            'currency_code'           => $default->code,
+            'currency_symbol'         => $default->symbol,
+            'currency_decimal_places' => (int)$default->decimal_places,
+        ];
+
+        /**
+         * @var int   $currencyId
+         * @var array $row
+         */
+        foreach ($spent as $currencyId => $row) {
+            $spent       = '0';
+            $spentNative = '0';
+            // get the sum from the array of transactions (double loop but who cares)
+            /** @var array $budget */
+            foreach ($row['budgets'] as $budget) {
+                /** @var array $journal */
+                foreach ($budget['transaction_journals'] as $journal) {
+                    $journalCurrencyId       = $journal['currency_id'];
+                    $currency                = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
+                    $currencies[$currencyId] = $currency;
+                    $amount                  = bcmul($journal['amount'], '-1');
+                    $amountNative            = $converter->convert($default, $currency, $start, $amount);
+                    if ((int)$journal['foreign_currency_id'] === (int)$default->id) {
+                        $amountNative = $journal['foreign_amount'];
+                    }
+                    $spent       = bcadd($spent, $amount);
+                    $spentNative = bcadd($spentNative, $amountNative);
+                }
+            }
+
+            // either an amount was budgeted or 0 is available.
+            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
+            $currencies[$currencyId] = $currency;
+            $amount                  = $available[$currencyId]['amount'] ?? '0';
+            $amountNative            = $converter->convert($default, $currency, $start, $amount);
+            $left                    = bcadd($amount, $spent);
+            $leftNative              = bcadd($amountNative, $spentNative);
+
+            // how much left per day?
+            $days         = $today->diffInDays($end) + 1;
+            $perDay       = '0';
+            $perDayNative = '0';
+            if (0 !== $days && bccomp($left, '0') > -1) {
+                $perDay = bcdiv($left, (string)$days);
+            }
+            if (0 !== $days && bccomp($leftNative, '0') > -1) {
+                $perDayNative = bcdiv($leftNative, (string)$days);
+            }
+
+            // left
+            $return[] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                'value'                   => $left,
+                'currency_id'             => $row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_symbol'         => $row['currency_symbol'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+            ];
+            // left (native)
+            $nativeLeft['value'] = $leftNative;
+
+            // left per day:
+            $return[] = [
+                'key'                     => sprintf('left-per-day-to-spend-in-%s', $row['currency_code']),
+                'value'                   => $perDay,
+                'currency_id'             => $row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_symbol'         => $row['currency_symbol'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+            ];
+
+            // left per day (native)
+            $nativePerDay['value'] = $perDayNative;
+        }
+        $return[] = $nativeLeft;
+        $return[] = $nativePerDay;
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getNetWorthInfo(Carbon $start, Carbon $end): array
+    {
+        /** @var UserGroup $userGroup */
+        $userGroup = auth()->user()->userGroup;
+        $date      = today(config('app.timezone'))->startOfDay();
+        // start and end in the future? use $end
+        if ($this->notInDateRange($date, $start, $end)) {
+            /** @var Carbon $date */
+            $date = session('end', today(config('app.timezone'))->endOfMonth());
+        }
+
+        /** @var NetWorthInterface $netWorthHelper */
+        $netWorthHelper = app(NetWorthInterface::class);
+        $netWorthHelper->setUserGroup($userGroup);
+        $allAccounts = $this->accountRepository->getActiveAccountsByType(
+            [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]
+        );
+
+        // filter list on preference of being included.
+        $filtered = $allAccounts->filter(
+            function (Account $account) {
+                $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth');
+
+                return null === $includeNetWorth || '1' === $includeNetWorth;
+            }
+        );
+
+        $netWorthSet = $netWorthHelper->byAccounts($filtered, $date);
+        $return      = [];
+        // in native amount
+        $return[] = [
+            'key'                     => 'net-worth-in-native',
+            'value'                   => $netWorthSet['native']['balance'],
+            'currency_id'             => $netWorthSet['native']['currency_id'],
+            'currency_code'           => $netWorthSet['native']['currency_code'],
+            'currency_symbol'         => $netWorthSet['native']['currency_symbol'],
+            'currency_decimal_places' => $netWorthSet['native']['currency_decimal_places'],
+        ];
+        foreach ($netWorthSet as $key => $data) {
+            if ('native' === $key) {
+                continue;
+            }
+            $return[] = [
+                'key'                     => sprintf('net-worth-in-%s', $data['currency_code']),
+                'value'                   => $data['balance'],
+                'currency_id'             => $data['currency_id'],
+                'currency_code'           => $data['currency_code'],
+                'currency_symbol'         => $data['currency_symbol'],
+                'currency_decimal_places' => $data['currency_decimal_places'],
+            ];
+        }
+
+        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/V2/Controllers/System/ConfigurationController.php

@@ -24,6 +24,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Controllers\System;
 
+/**
+ * Class ConfigurationController
+ */
 class ConfigurationController
 {
 }

app/Api/V2/Controllers/System/DebugController.php

@@ -26,6 +26,9 @@ namespace FireflyIII\Api\V2\Controllers\System;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 
+/**
+ * Class DebugController
+ */
 class DebugController extends Controller
 {
 }

app/Api/V2/Controllers/Transaction/List/AccountController.php

@@ -49,19 +49,17 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      */
-    public function listTransactions(ListRequest $request, Account $account): JsonResponse
+    public function list(ListRequest $request, Account $account): JsonResponse
     {
         // collect transactions:
-        $type  = $request->get('type') ?? 'default';
-        $limit = (int)$request->get('limit');
-        $page  = (int)$request->get('page');
+        $limit = $request->getLimit();
+        $page  = $request->getPage();
         $page  = max($page, 1);
 
         if ($limit > 0 && $limit <= $this->pageSize) {
             $this->pageSize = $limit;
         }
 
-        $types = $this->mapTransactionTypes($type);
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
@@ -69,15 +67,25 @@ class AccountController extends Controller
                   ->withAPIInformation()
                   ->setLimit($this->pageSize)
                   ->setPage($page)
-                  ->setTypes($types);
+                  ->setTypes($request->getTransactionTypes());
 
-        // TODO date filter
-        //if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-        //    $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
-        //}
+        $start = $request->getStartDate();
+        $end   = $request->getEndDate();
+        if (null !== $start) {
+            $collector->setStart($start);
+        }
+        if (null !== $end) {
+            $collector->setEnd($start);
+        }
 
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v2.accounts.transactions', [$account->id])); // TODO  . $this->buildParams()
+        $paginator->setPath(
+            sprintf(
+                '%s?%s',
+                route('api.v2.accounts.transactions', [$account->id]),
+                $request->buildParams()
+            )
+        );
 
         return response()
             ->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer()))

app/Api/V2/Controllers/Transaction/List/TransactionController.php

@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * TransactionController.php
+ * Copyright (c) 2023 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\V2\Controllers\Transaction\List;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Transaction\ListRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Transformers\V2\TransactionGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    /**
+     * @param ListRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function list(ListRequest $request): JsonResponse
+    {
+        // collect transactions:
+        $limit = $request->getLimit();
+        $page  = $request->getPage();
+        $page  = max($page, 1);
+
+        if ($limit > 0 && $limit <= $this->pageSize) {
+            $this->pageSize = $limit;
+        }
+
+
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setUserGroup(auth()->user()->userGroup)
+                  ->withAPIInformation()
+                  ->setLimit($this->pageSize)
+                  ->setPage($page)
+                  ->setTypes($request->getTransactionTypes());
+
+        $start = $this->parameters->get('start');
+        $end   = $this->parameters->get('end');
+        if (null !== $start) {
+            $collector->setStart($start);
+        }
+        if (null !== $end) {
+            $collector->setEnd($end);
+        }
+
+        //        $collector->dumpQuery();
+        //        exit;
+
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(
+            sprintf(
+                '%s?%s',
+                route('api.v2.transactions.list'),
+                $request->buildParams()
+            )
+        );
+
+        return response()
+            ->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer()))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+
+}

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * BalanceChartRequest.php
+ * Copyright (c) 2023 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\V2\Request\Chart;
+
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
+
+class BalanceChartRequest extends FormRequest
+{
+    use ConvertsDataTypes;
+    use ChecksLogin;
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'accounts' => $this->getAccountList(),
+            'period'   => $this->string('period'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'start'      => 'required|date|after:1900-01-01|before:2099-12-31',
+            'end'        => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'accounts.*' => 'required|exists:accounts,id',
+            'period'     => sprintf('required|in:%s', join(',', config('firefly.valid_view_ranges'))),
+        ];
+    }
+
+    /**
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                // validate transaction query data.
+                $data = $validator->getData();
+                if (!array_key_exists('accounts', $data)) {
+                    $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                    return;
+                }
+                if (!is_array($data['accounts'])) {
+                    $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                }
+            }
+        );
+    }
+}

app/Api/V2/Request/Generic/DateRequest.php

@@ -47,7 +47,7 @@ class DateRequest extends FormRequest
     {
         return [
             'start' => $this->getCarbonDate('start'),
-            'end'   => $this->getCarbonDate('end'),
+            'end'   => $this->getCarbonDate('end')->endOfDay(),
         ];
     }
 

app/Api/V2/Request/Transaction/ListRequest.php

@@ -24,15 +24,84 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Transaction;
 
+use Carbon\Carbon;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * Class ListRequest
+ * Used specifically to list transactions.
  */
 class ListRequest extends FormRequest
 {
     use ChecksLogin;
+    use ConvertsDataTypes;
+    use TransactionFilter;
+
+    /**
+     * @return string
+     */
+    public function buildParams(): string
+    {
+        $array = [
+            'page' => $this->getPage(),
+        ];
+
+        $start = $this->getStartDate();
+        $end   = $this->getEndDate();
+        if (null !== $start && null !== $end) {
+            $array['start'] = $start->format('Y-m-d');
+            $array['end']   = $end->format('Y-m-d');
+        }
+        if (0 !== $this->getLimit()) {
+            $array['limit'] = $this->getLimit();
+        }
+        return http_build_query($array);
+    }
+
+    /**
+     * @return int
+     */
+    public function getPage(): int
+    {
+        $page = $this->convertInteger('page');
+        return 0 === $page || $page > 65536 ? 1 : $page;
+    }
+
+    /**
+     * @return Carbon|null
+     */
+    public function getStartDate(): ?Carbon
+    {
+        return $this->getCarbonDate('start');
+    }
+
+    /**
+     * @return Carbon|null
+     */
+    public function getEndDate(): ?Carbon
+    {
+        return $this->getCarbonDate('end');
+    }
+
+    /**
+     * @return int
+     */
+    public function getLimit(): int
+    {
+        return $this->convertInteger('limit');
+    }
+
+    /**
+     * @return array
+     */
+    public function getTransactionTypes(): array
+    {
+        $type = (string)$this->get('type', 'default');
+        return $this->mapTransactionTypes($type);
+    }
 
     /**
      * @return array

app/Console/Commands/Correction/CorrectAmounts.php

@@ -174,6 +174,26 @@ class CorrectAmounts extends Command
         $this->friendlyInfo(sprintf('Corrected %d currency exchange rate(s).', $count));
     }
 
+    /**
+     * @return void
+     */
+    private function fixRepetitions(): void
+    {
+        $set   = PiggyBankRepetition::where('currentamount', '<', 0)->get();
+        $count = $set->count();
+        if (0 === $count) {
+            $this->friendlyPositive('All piggy bank repetition amounts are positive.');
+
+            return;
+        }
+        /** @var PiggyBankRepetition $item */
+        foreach ($set as $item) {
+            $item->currentamount = app('steam')->positive((string)$item->currentamount);
+            $item->save();
+        }
+        $this->friendlyInfo(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
+    }
+
     /**
      * @return void
      */
@@ -217,26 +237,6 @@ class CorrectAmounts extends Command
         $this->friendlyInfo(sprintf('Corrected %d recurring transaction amount(s).', $count));
     }
 
-    /**
-     * @return void
-     */
-    private function fixRepetitions(): void
-    {
-        $set   = PiggyBankRepetition::where('currentamount', '<', 0)->get();
-        $count = $set->count();
-        if (0 === $count) {
-            $this->friendlyPositive('All piggy bank repetition amounts are positive.');
-
-            return;
-        }
-        /** @var PiggyBankRepetition $item */
-        foreach ($set as $item) {
-            $item->currentamount = app('steam')->positive((string)$item->currentamount);
-            $item->save();
-        }
-        $this->friendlyInfo(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
-    }
-
     /**
      * @return void
      */

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -71,6 +71,17 @@ class CorrectOpeningBalanceCurrencies extends Command
         return 0;
     }
 
+    /**
+     * @return Collection
+     */
+    private function getJournals(): Collection
+    {
+        /** @var Collection */
+        return TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->whereNull('transaction_journals.deleted_at')
+                                 ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
+    }
+
     /**
      * @param TransactionJournal $journal
      *
@@ -112,34 +123,10 @@ class CorrectOpeningBalanceCurrencies extends Command
         return null;
     }
 
-    /**
-     * @param  Account  $account
-     *
-     * @return TransactionCurrency
-     */
-    private function getCurrency(Account $account): TransactionCurrency
-    {
-        /** @var AccountRepositoryInterface $repos */
-        $repos = app(AccountRepositoryInterface::class);
-        $repos->setUser($account->user);
-
-        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getJournals(): Collection
-    {
-        /** @var Collection */
-        return TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                 ->whereNull('transaction_journals.deleted_at')
-                                 ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
-    }
-
     /**
      * @param Account            $account
      * @param TransactionJournal $journal
+     *
      * @return int
      */
     private function setCorrectCurrency(Account $account, TransactionJournal $journal): int
@@ -163,4 +150,18 @@ class CorrectOpeningBalanceCurrencies extends Command
 
         return $count;
     }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionCurrency
+     */
+    private function getCurrency(Account $account): TransactionCurrency
+    {
+        /** @var AccountRepositoryInterface $repos */
+        $repos = app(AccountRepositoryInterface::class);
+        $repos->setUser($account->user);
+
+        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
+    }
 }

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -64,30 +64,6 @@ class DeleteEmptyJournals extends Command
         return 0;
     }
 
-    private function deleteEmptyJournals(): void
-    {
-        $count = 0;
-        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                   ->groupBy('transaction_journals.id')
-                                   ->whereNull('transactions.transaction_journal_id')
-                                   ->get(['transaction_journals.id']);
-
-        foreach ($set as $entry) {
-            try {
-                TransactionJournal::find($entry->id)->delete();
-            } catch (QueryException $e) {
-                Log::info(sprintf('Could not delete entry: %s', $e->getMessage()));
-            }
-
-
-            $this->friendlyInfo(sprintf('Deleted empty transaction journal #%d', $entry->id));
-            ++$count;
-        }
-        if (0 === $count) {
-            $this->friendlyPositive('No empty transaction journals.');
-        }
-    }
-
     /**
      * Delete transactions and their journals if they have an uneven number of transactions.
      */
@@ -120,4 +96,31 @@ class DeleteEmptyJournals extends Command
             $this->friendlyPositive('No uneven transaction journals.');
         }
     }
+
+    /**
+     * @return void
+     */
+    private function deleteEmptyJournals(): void
+    {
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->groupBy('transaction_journals.id')
+                                   ->whereNull('transactions.transaction_journal_id')
+                                   ->get(['transaction_journals.id']);
+
+        foreach ($set as $entry) {
+            try {
+                TransactionJournal::find($entry->id)->delete();
+            } catch (QueryException $e) {
+                Log::info(sprintf('Could not delete entry: %s', $e->getMessage()));
+            }
+
+
+            $this->friendlyInfo(sprintf('Deleted empty transaction journal #%d', $entry->id));
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->friendlyPositive('No empty transaction journals.');
+        }
+    }
 }

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -66,37 +66,8 @@ class DeleteOrphanedTransactions extends Command
     }
 
     /**
-     *
+     * @return void
      */
-    private function deleteFromOrphanedAccounts(): void
-    {
-        $set
-               = Transaction::leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
-                            ->whereNotNull('accounts.deleted_at')
-                            ->get(['transactions.*']);
-        $count = 0;
-        /** @var Transaction $transaction */
-        foreach ($set as $transaction) {
-            // delete journals
-            $journal = TransactionJournal::find((int)$transaction->transaction_journal_id);
-            if ($journal) {
-                $journal->delete();
-            }
-            Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
-            $this->friendlyWarning(
-                sprintf(
-                    'Deleted transaction journal #%d because account #%d was already deleted.',
-                    $transaction->transaction_journal_id,
-                    $transaction->account_id
-                )
-            );
-            $count++;
-        }
-        if (0 === $count) {
-            $this->friendlyPositive('No orphaned accounts.');
-        }
-    }
-
     private function deleteOrphanedJournals(): void
     {
         $set   = TransactionJournal::leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
@@ -159,4 +130,36 @@ class DeleteOrphanedTransactions extends Command
             $this->friendlyPositive('No orphaned transactions.');
         }
     }
+
+    /**
+     *
+     */
+    private function deleteFromOrphanedAccounts(): void
+    {
+        $set
+               = Transaction::leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
+                            ->whereNotNull('accounts.deleted_at')
+                            ->get(['transactions.*']);
+        $count = 0;
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            // delete journals
+            $journal = TransactionJournal::find((int)$transaction->transaction_journal_id);
+            if ($journal) {
+                $journal->delete();
+            }
+            Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
+            $this->friendlyWarning(
+                sprintf(
+                    'Deleted transaction journal #%d because account #%d was already deleted.',
+                    $transaction->transaction_journal_id,
+                    $transaction->account_id
+                )
+            );
+            $count++;
+        }
+        if (0 === $count) {
+            $this->friendlyPositive('No orphaned accounts.');
+        }
+    }
 }

app/Console/Commands/Correction/EnableCurrencies.php

@@ -31,7 +31,6 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class EnableCurrencies

app/Console/Commands/Correction/FixAccountTypes.php

@@ -31,8 +31,8 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
-use JsonException;
 use Illuminate\Support\Facades\Log;
+use JsonException;
 
 /**
  * Class FixAccountTypes
@@ -73,6 +73,80 @@ class FixAccountTypes extends Command
         return 0;
     }
 
+    /**
+     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
+     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
+     * be called from the handle method instead of using the constructor to initialize the command.
+     *
+
+     */
+    private function stupidLaravel(): void
+    {
+        $this->count = 0;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @throws FireflyException
+     * @throws JsonException
+     */
+    private function inspectJournal(TransactionJournal $journal): void
+    {
+        $transactions = $journal->transactions()->count();
+        if (2 !== $transactions) {
+            Log::debug(sprintf('Journal has %d transactions, so can\'t fix.', $transactions));
+            $this->friendlyError(sprintf('Cannot inspect transaction journal #%d because it has %d transaction(s) instead of 2.', $journal->id, $transactions));
+
+            return;
+        }
+        $type              = $journal->transactionType->type;
+        $sourceTransaction = $this->getSourceTransaction($journal);
+        $destTransaction   = $this->getDestinationTransaction($journal);
+        $sourceAccount     = $sourceTransaction->account;
+        $sourceAccountType = $sourceAccount->accountType->type;
+        $destAccount       = $destTransaction->account;
+        $destAccountType   = $destAccount->accountType->type;
+
+        if (!array_key_exists($type, $this->expected)) {
+            Log::info(sprintf('No source/destination info for transaction type %s.', $type));
+            $this->friendlyError(sprintf('No source/destination info for transaction type %s.', $type));
+
+            return;
+        }
+        if (!array_key_exists($sourceAccountType, $this->expected[$type])) {
+            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
+            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
+
+            return;
+        }
+        $expectedTypes = $this->expected[$type][$sourceAccountType];
+        if (!in_array($destAccountType, $expectedTypes, true)) {
+            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
+            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
+        }
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Transaction
+     */
+    private function getSourceTransaction(TransactionJournal $journal): Transaction
+    {
+        return $journal->transactions->firstWhere('amount', '<', 0);
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Transaction
+     */
+    private function getDestinationTransaction(TransactionJournal $journal): Transaction
+    {
+        return $journal->transactions->firstWhere('amount', '>', 0);
+    }
+
     /**
      * @param TransactionJournal $journal
      * @param string             $type
@@ -167,77 +241,4 @@ class FixAccountTypes extends Command
                 break;
         }
     }
-
-    /**
-     * @param  TransactionJournal  $journal
-     *
-     * @return Transaction
-     */
-    private function getDestinationTransaction(TransactionJournal $journal): Transaction
-    {
-        return $journal->transactions->firstWhere('amount', '>', 0);
-    }
-
-    /**
-     * @param  TransactionJournal  $journal
-     *
-     * @return Transaction
-     */
-    private function getSourceTransaction(TransactionJournal $journal): Transaction
-    {
-        return $journal->transactions->firstWhere('amount', '<', 0);
-    }
-
-    /**
-     * @param  TransactionJournal  $journal
-     *
-     * @throws FireflyException
-     */
-    private function inspectJournal(TransactionJournal $journal): void
-    {
-        $transactions = $journal->transactions()->count();
-        if (2 !== $transactions) {
-            Log::debug(sprintf('Journal has %d transactions, so can\'t fix.', $transactions));
-            $this->friendlyError(sprintf('Cannot inspect transaction journal #%d because it has %d transaction(s) instead of 2.', $journal->id, $transactions));
-
-            return;
-        }
-        $type              = $journal->transactionType->type;
-        $sourceTransaction = $this->getSourceTransaction($journal);
-        $destTransaction   = $this->getDestinationTransaction($journal);
-        $sourceAccount     = $sourceTransaction->account;
-        $sourceAccountType = $sourceAccount->accountType->type;
-        $destAccount       = $destTransaction->account;
-        $destAccountType   = $destAccount->accountType->type;
-
-        if (!array_key_exists($type, $this->expected)) {
-            Log::info(sprintf('No source/destination info for transaction type %s.', $type));
-            $this->friendlyError(sprintf('No source/destination info for transaction type %s.', $type));
-
-            return;
-        }
-        if (!array_key_exists($sourceAccountType, $this->expected[$type])) {
-            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
-            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
-
-            return;
-        }
-        $expectedTypes = $this->expected[$type][$sourceAccountType];
-        if (!in_array($destAccountType, $expectedTypes, true)) {
-            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
-            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
-        }
-    }
-
-    /**
-     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
-     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
-     * be called from the handle method instead of using the constructor to initialize the command.
-     *
-
-     */
-    private function stupidLaravel(): void
-    {
-        $this->count = 0;
-    }
 }

app/Console/Commands/Correction/FixIbans.php

@@ -58,6 +58,28 @@ class FixIbans extends Command
         return 0;
     }
 
+    /**
+     * @param Collection $accounts
+     *
+     * @return void
+     */
+    private function filterIbans(Collection $accounts): void
+    {
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $iban = $account->iban;
+            if (str_contains($iban, ' ')) {
+                $iban = app('steam')->filterSpaces((string)$account->iban);
+                if ('' !== $iban) {
+                    $account->iban = $iban;
+                    $account->save();
+                    $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                    $this->count++;
+                }
+            }
+        }
+    }
+
     /**
      * @param Collection $accounts
      *
@@ -105,26 +127,4 @@ class FixIbans extends Command
             }
         }
     }
-
-    /**
-     * @param  Collection  $accounts
-     *
-     * @return void
-     */
-    private function filterIbans(Collection $accounts): void
-    {
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $iban = $account->iban;
-            if (str_contains($iban, ' ')) {
-                $iban = app('steam')->filterSpaces((string)$account->iban);
-                if ('' !== $iban) {
-                    $account->iban = $iban;
-                    $account->save();
-                    $this->friendlyInfo(sprintf('Removed spaces from IBAN of account #%d', $account->id));
-                    $this->count++;
-                }
-            }
-        }
-    }
 }

app/Console/Commands/Correction/FixRecurringTransactions.php

@@ -62,6 +62,19 @@ class FixRecurringTransactions extends Command
         return 0;
     }
 
+    /**
+     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
+     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
+     * be called from the handle method instead of using the constructor to initialize the command.
+     *
+
+     */
+    private function stupidLaravel(): void
+    {
+        $this->recurringRepos = app(RecurringRepositoryInterface::class);
+        $this->userRepos      = app(UserRepositoryInterface::class);
+    }
+
     /**
      *
      */
@@ -74,6 +87,19 @@ class FixRecurringTransactions extends Command
         }
     }
 
+    /**
+     * @param User $user
+     */
+    private function processUser(User $user): void
+    {
+        $this->recurringRepos->setUser($user);
+        $recurrences = $this->recurringRepos->get();
+        /** @var Recurrence $recurrence */
+        foreach ($recurrences as $recurrence) {
+            $this->processRecurrence($recurrence);
+        }
+    }
+
     /**
      * @param Recurrence $recurrence
      */
@@ -107,30 +133,4 @@ class FixRecurringTransactions extends Command
             }
         }
     }
-
-    /**
-     * @param  User  $user
-     */
-    private function processUser(User $user): void
-    {
-        $this->recurringRepos->setUser($user);
-        $recurrences = $this->recurringRepos->get();
-        /** @var Recurrence $recurrence */
-        foreach ($recurrences as $recurrence) {
-            $this->processRecurrence($recurrence);
-        }
-    }
-
-    /**
-     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
-     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
-     * be called from the handle method instead of using the constructor to initialize the command.
-     *
-
-     */
-    private function stupidLaravel(): void
-    {
-        $this->recurringRepos = app(RecurringRepositoryInterface::class);
-        $this->userRepos      = app(UserRepositoryInterface::class);
-    }
 }

app/Console/Commands/Correction/FixTransactionTypes.php

@@ -69,19 +69,6 @@ class FixTransactionTypes extends Command
         return 0;
     }
 
-    /**
-     * @param  TransactionJournal  $journal
-     * @param  string  $expectedType
-     */
-    private function changeJournal(TransactionJournal $journal, string $expectedType): void
-    {
-        $type = TransactionType::whereType($expectedType)->first();
-        if (null !== $type) {
-            $journal->transaction_type_id = $type->id;
-            $journal->save();
-        }
-    }
-
     /**
      * Collect all transaction journals.
      *
@@ -129,6 +116,36 @@ class FixTransactionTypes extends Command
         return false;
     }
 
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Account
+     * @throws FireflyException
+     */
+    private function getSourceAccount(TransactionJournal $journal): Account
+    {
+        $collection = $journal->transactions->filter(
+            static function (Transaction $transaction) {
+                return $transaction->amount < 0;
+            }
+        );
+        if (0 === $collection->count()) {
+            throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
+        }
+        if (1 !== $collection->count()) {
+            throw new FireflyException(sprintf('300002: Journal #%d has multiple source transactions.', $journal->id));
+        }
+        /** @var Transaction $transaction */
+        $transaction = $collection->first();
+        /** @var Account|null $account */
+        $account = $transaction->account;
+        if (null === $account) {
+            throw new FireflyException(sprintf('300003: Journal #%d, transaction #%d has no source account.', $journal->id, $transaction->id));
+        }
+
+        return $account;
+    }
+
     /**
      * @param TransactionJournal $journal
      *
@@ -161,31 +178,14 @@ class FixTransactionTypes extends Command
 
     /**
      * @param TransactionJournal $journal
-     *
-     * @return Account
-     * @throws FireflyException
+     * @param string             $expectedType
      */
-    private function getSourceAccount(TransactionJournal $journal): Account
+    private function changeJournal(TransactionJournal $journal, string $expectedType): void
     {
-        $collection = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount < 0;
-            }
-        );
-        if (0 === $collection->count()) {
-            throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
-        }
-        if (1 !== $collection->count()) {
-            throw new FireflyException(sprintf('300002: Journal #%d has multiple source transactions.', $journal->id));
-        }
-        /** @var Transaction $transaction */
-        $transaction = $collection->first();
-        /** @var Account|null $account */
-        $account = $transaction->account;
-        if (null === $account) {
-            throw new FireflyException(sprintf('300003: Journal #%d, transaction #%d has no source account.', $journal->id, $transaction->id));
-        }
-
-        return $account;
+        $type = TransactionType::whereType($expectedType)->first();
+        if (null !== $type) {
+            $journal->transaction_type_id = $type->id;
+            $journal->save();
+        }
     }
 }

app/Console/Commands/Correction/TriggerCreditCalculation.php

@@ -1,5 +1,26 @@
 <?php
 
+
+/*
+ * TriggerCreditCalculation.php
+ * Copyright (c) 2023 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\Console\Commands\Correction;
@@ -7,7 +28,6 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Models\Account;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class CorrectionSkeleton
@@ -30,6 +50,19 @@ class TriggerCreditCalculation extends Command
         return 0;
     }
 
+    /**
+     * @return void
+     */
+    private function processAccounts(): void
+    {
+        $accounts = Account::leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
+                           ->whereIn('account_types.type', config('firefly.valid_liabilities'))
+                           ->get(['accounts.*']);
+        foreach ($accounts as $account) {
+            $this->processAccount($account);
+        }
+    }
+
     /**
      * @param Account $account
      *
@@ -42,14 +75,4 @@ class TriggerCreditCalculation extends Command
         $object->setAccount($account);
         $object->recalculate();
     }
-
-    private function processAccounts(): void
-    {
-        $accounts = Account::leftJoin('account_types', 'accounts.account_type_id', 'account_types.id')
-                           ->whereIn('account_types.type', config('firefly.valid_liabilities'))
-                           ->get(['accounts.*']);
-        foreach ($accounts as $account) {
-            $this->processAccount($account);
-        }
-    }
 }

app/Console/Commands/Export/ExportData.php

@@ -36,8 +36,10 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use InvalidArgumentException;
 use Illuminate\Support\Facades\Log;
+use InvalidArgumentException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ExportData
@@ -83,6 +85,8 @@ class ExportData extends Command
      *
      * @return int
      * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -141,57 +145,48 @@ class ExportData extends Command
     }
 
     /**
-     * @param  array  $options
-     * @param  array  $data
+     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
+     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
+     * be called from the handle method instead of using the constructor to initialize the command.
      *
-     * @throws FireflyException
+
      */
-    private function exportData(array $options, array $data): void
+    private function stupidLaravel(): void
     {
-        $date = date('Y_m_d');
-        foreach ($data as $key => $content) {
-            $file = sprintf('%s%s_%s.csv', $options['directory'], $date, $key);
-            if (false === $options['force'] && file_exists($file)) {
-                throw new FireflyException(sprintf('File "%s" exists already. Use --force to overwrite.', $file));
-            }
-            if (true === $options['force'] && file_exists($file)) {
-                $this->friendlyWarning(sprintf('File "%s" exists already but will be replaced.', $file));
-            }
-            // continue to write to file.
-            file_put_contents($file, $content);
-            $this->friendlyPositive(sprintf('Wrote %s-export to file "%s".', $key, $file));
-        }
+        $this->journalRepository = app(JournalRepositoryInterface::class);
+        $this->accountRepository = app(AccountRepositoryInterface::class);
     }
 
     /**
-     * @return Collection
+     * @return array
      * @throws FireflyException
+     * @throws Exception
      */
-    private function getAccountsParameter(): Collection
+    private function parseOptions(): array
     {
-        $final       = new Collection();
-        $accounts    = new Collection();
-        $accountList = $this->option('accounts');
-        $types       = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
-        if (null !== $accountList && '' !== (string)$accountList) {
-            $accountIds = explode(',', $accountList);
-            $accounts   = $this->accountRepository->getAccountsById($accountIds);
-        }
-        if (null === $accountList) {
-            $accounts = $this->accountRepository->getAccountsByType($types);
-        }
-        // filter accounts,
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if (in_array($account->accountType->type, $types, true)) {
-                $final->push($account);
-            }
-        }
-        if (0 === $final->count()) {
-            throw new FireflyException('300007: Ended up with zero valid accounts to export from.');
-        }
+        $start    = $this->getDateParameter('start');
+        $end      = $this->getDateParameter('end');
+        $accounts = $this->getAccountsParameter();
+        $export   = $this->getExportDirectory();
 
-        return $final;
+        return [
+            'export'    => [
+                'transactions' => $this->option('export-transactions'),
+                'accounts'     => $this->option('export-accounts'),
+                'budgets'      => $this->option('export-budgets'),
+                'categories'   => $this->option('export-categories'),
+                'tags'         => $this->option('export-tags'),
+                'recurring'    => $this->option('export-recurring'),
+                'rules'        => $this->option('export-rules'),
+                'bills'        => $this->option('export-bills'),
+                'piggies'      => $this->option('export-piggies'),
+            ],
+            'start'     => $start,
+            'end'       => $end,
+            'accounts'  => $accounts,
+            'directory' => $export,
+            'force'     => $this->option('force'),
+        ];
     }
 
     /**
@@ -235,6 +230,37 @@ class ExportData extends Command
         return $date;
     }
 
+    /**
+     * @return Collection
+     * @throws FireflyException
+     */
+    private function getAccountsParameter(): Collection
+    {
+        $final       = new Collection();
+        $accounts    = new Collection();
+        $accountList = $this->option('accounts');
+        $types       = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        if (null !== $accountList && '' !== (string)$accountList) {
+            $accountIds = explode(',', $accountList);
+            $accounts   = $this->accountRepository->getAccountsById($accountIds);
+        }
+        if (null === $accountList) {
+            $accounts = $this->accountRepository->getAccountsByType($types);
+        }
+        // filter accounts,
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            if (in_array($account->accountType->type, $types, true)) {
+                $final->push($account);
+            }
+        }
+        if (0 === $final->count()) {
+            throw new FireflyException('300007: Ended up with zero valid accounts to export from.');
+        }
+
+        return $final;
+    }
+
     /**
      * @return string
      * @throws FireflyException
@@ -254,47 +280,25 @@ class ExportData extends Command
     }
 
     /**
-     * @return array
-     * @throws FireflyException
-     * @throws Exception
-     */
-    private function parseOptions(): array
-    {
-        $start    = $this->getDateParameter('start');
-        $end      = $this->getDateParameter('end');
-        $accounts = $this->getAccountsParameter();
-        $export   = $this->getExportDirectory();
-
-        return [
-            'export'    => [
-                'transactions' => $this->option('export-transactions'),
-                'accounts'     => $this->option('export-accounts'),
-                'budgets'      => $this->option('export-budgets'),
-                'categories'   => $this->option('export-categories'),
-                'tags'         => $this->option('export-tags'),
-                'recurring'    => $this->option('export-recurring'),
-                'rules'        => $this->option('export-rules'),
-                'bills'        => $this->option('export-bills'),
-                'piggies'      => $this->option('export-piggies'),
-            ],
-            'start'     => $start,
-            'end'       => $end,
-            'accounts'  => $accounts,
-            'directory' => $export,
-            'force'     => $this->option('force'),
-        ];
-    }
-
-    /**
-     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
-     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
-     * be called from the handle method instead of using the constructor to initialize the command.
+     * @param array $options
+     * @param array $data
      *
-
+     * @throws FireflyException
      */
-    private function stupidLaravel(): void
+    private function exportData(array $options, array $data): void
     {
-        $this->journalRepository = app(JournalRepositoryInterface::class);
-        $this->accountRepository = app(AccountRepositoryInterface::class);
+        $date = date('Y_m_d');
+        foreach ($data as $key => $content) {
+            $file = sprintf('%s%s_%s.csv', $options['directory'], $date, $key);
+            if (false === $options['force'] && file_exists($file)) {
+                throw new FireflyException(sprintf('File "%s" exists already. Use --force to overwrite.', $file));
+            }
+            if (true === $options['force'] && file_exists($file)) {
+                $this->friendlyWarning(sprintf('File "%s" exists already but will be replaced.', $file));
+            }
+            // continue to write to file.
+            file_put_contents($file, $content);
+            $this->friendlyPositive(sprintf('Wrote %s-export to file "%s".', $key, $file));
+        }
     }
 }

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -31,7 +31,6 @@ use FireflyIII\Models\UserGroup;
 use FireflyIII\Models\UserRole;
 use FireflyIII\User;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class CreateGroupMemberships
@@ -44,6 +43,33 @@ class CreateGroupMemberships extends Command
     protected $description = 'Update group memberships';
     protected $signature   = 'firefly-iii:create-group-memberships';
 
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     * @throws FireflyException
+     */
+    public function handle(): int
+    {
+        $this->createGroupMemberships();
+        $this->friendlyPositive('Validated group memberships');
+
+        return 0;
+    }
+
+    /**
+     *
+     * @throws FireflyException
+     */
+    private function createGroupMemberships(): void
+    {
+        $users = User::get();
+        /** @var User $user */
+        foreach ($users as $user) {
+            self::createGroupMembership($user);
+        }
+    }
+
     /**
      * TODO move to helper.
      *
@@ -81,31 +107,4 @@ class CreateGroupMemberships extends Command
             $user->save();
         }
     }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     * @throws FireflyException
-     */
-    public function handle(): int
-    {
-        $this->createGroupMemberships();
-        $this->friendlyPositive('Validated group memberships');
-
-        return 0;
-    }
-
-    /**
-     *
-     * @throws FireflyException
-     */
-    private function createGroupMemberships(): void
-    {
-        $users = User::get();
-        /** @var User $user */
-        foreach ($users as $user) {
-            self::createGroupMembership($user);
-        }
-    }
 }

app/Console/Commands/Integrity/ReportEmptyObjects.php

@@ -67,51 +67,6 @@ class ReportEmptyObjects extends Command
         return 0;
     }
 
-    /**
-     * Reports on accounts with no transactions.
-     */
-    private function reportAccounts(): void
-    {
-        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-                      ->whereNull('transactions.account_id')
-                      ->get(
-                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
-                      );
-
-        /** @var stdClass $entry */
-        foreach ($set as $entry) {
-            $line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
-            $line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $entry->name);
-            $this->friendlyWarning($line);
-        }
-    }
-
-    /**
-     * Reports on budgets with no budget limits (which makes them pointless).
-     */
-    private function reportBudgetLimits(): void
-    {
-        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
-                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
-                     ->whereNull('budget_limits.id')
-                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
-
-        /** @var Budget $entry */
-        foreach ($set as $entry) {
-            $line = sprintf(
-                'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
-                $entry->user_id,
-                $entry->email,
-                $entry->id,
-                $entry->name
-            );
-            $this->friendlyWarning($line);
-        }
-    }
-
     /**
      * Report on budgets with no transactions or journals.
      */
@@ -186,4 +141,49 @@ class ReportEmptyObjects extends Command
             $this->friendlyWarning($line);
         }
     }
+
+    /**
+     * Reports on accounts with no transactions.
+     */
+    private function reportAccounts(): void
+    {
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->whereNull('transactions.account_id')
+                      ->get(
+                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                      );
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+            $line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
+            $line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $entry->name);
+            $this->friendlyWarning($line);
+        }
+    }
+
+    /**
+     * Reports on budgets with no budget limits (which makes them pointless).
+     */
+    private function reportBudgetLimits(): void
+    {
+        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
+                     ->whereNull('budget_limits.id')
+                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
+
+        /** @var Budget $entry */
+        foreach ($set as $entry) {
+            $line = sprintf(
+                'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
+                $entry->user_id,
+                $entry->email,
+                $entry->id,
+                $entry->name
+            );
+            $this->friendlyWarning($line);
+        }
+    }
 }

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -50,38 +50,6 @@ class RestoreOAuthKeys extends Command
         return 0;
     }
 
-    /**
-     *
-     */
-    private function generateKeys(): void
-    {
-        OAuthKeys::generateKeys();
-    }
-
-    /**
-     * @return bool
-     */
-    private function keysInDatabase(): bool
-    {
-        return OAuthKeys::keysInDatabase();
-    }
-
-    /**
-     * @return bool
-     */
-    private function keysOnDrive(): bool
-    {
-        return OAuthKeys::hasKeyFiles();
-    }
-
-    /**
-     *
-     */
-    private function restoreKeysFromDB(): bool
-    {
-        return OAuthKeys::restoreKeysFromDB();
-    }
-
     /**
      *
      */
@@ -116,6 +84,30 @@ class RestoreOAuthKeys extends Command
         $this->friendlyPositive('OAuth keys are OK');
     }
 
+    /**
+     * @return bool
+     */
+    private function keysInDatabase(): bool
+    {
+        return OAuthKeys::keysInDatabase();
+    }
+
+    /**
+     * @return bool
+     */
+    private function keysOnDrive(): bool
+    {
+        return OAuthKeys::hasKeyFiles();
+    }
+
+    /**
+     *
+     */
+    private function generateKeys(): void
+    {
+        OAuthKeys::generateKeys();
+    }
+
     /**
      *
      */
@@ -123,4 +115,12 @@ class RestoreOAuthKeys extends Command
     {
         OAuthKeys::storeKeysInDB();
     }
+
+    /**
+     *
+     */
+    private function restoreKeysFromDB(): bool
+    {
+        return OAuthKeys::restoreKeysFromDB();
+    }
 }

app/Console/Commands/Integrity/UpdateGroupInformation.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
@@ -73,6 +74,11 @@ class UpdateGroupInformation extends Command
         return 0;
     }
 
+    /**
+     * @param User $user
+     *
+     * @return void
+     */
     private function updateGroupInfo(User $user): void
     {
         $group = $user->userGroup;
@@ -88,6 +94,7 @@ class UpdateGroupInformation extends Command
             Bill::class,
             Budget::class,
             Category::class,
+            ObjectGroup::class,
             CurrencyExchangeRate::class,
             Recurrence::class,
             RuleGroup::class,

app/Console/Commands/ShowsFriendlyMessages.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ShowsFriendlyMessages.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands;
 
 /**
@@ -30,6 +32,7 @@ trait ShowsFriendlyMessages
 {
     /**
      * @param string $message
+     *
      * @return void
      */
     public function friendlyError(string $message): void
@@ -39,6 +42,7 @@ trait ShowsFriendlyMessages
 
     /**
      * @param string $message
+     *
      * @return void
      */
     public function friendlyInfo(string $message): void
@@ -48,15 +52,7 @@ trait ShowsFriendlyMessages
 
     /**
      * @param string $message
-     * @return void
-     */
-    public function friendlyLine(string $message): void
-    {
-        $this->line(sprintf('      %s', trim($message)));
-    }
-
-    /**
-     * @param  string  $message
+     *
      * @return void
      */
     public function friendlyNeutral(string $message): void
@@ -66,6 +62,17 @@ trait ShowsFriendlyMessages
 
     /**
      * @param string $message
+     *
+     * @return void
+     */
+    public function friendlyLine(string $message): void
+    {
+        $this->line(sprintf('      %s', trim($message)));
+    }
+
+    /**
+     * @param string $message
+     *
      * @return void
      */
     public function friendlyPositive(string $message): void
@@ -75,6 +82,7 @@ trait ShowsFriendlyMessages
 
     /**
      * @param string $message
+     *
      * @return void
      */
     public function friendlyWarning(string $message): void

app/Console/Commands/System/ForceDecimalSize.php

@@ -92,7 +92,6 @@ class ForceDecimalSize extends Command
     /**
      * Execute the console command.
      *
-     * @throws FireflyException
      */
     public function handle(): int
     {
@@ -111,51 +110,21 @@ class ForceDecimalSize extends Command
     }
 
     /**
-     * This method loops over all accounts and validates the amounts.
-     *
-     * @param  TransactionCurrency  $currency
-     * @param  array  $fields
-     *
      * @return void
      */
-    private function correctAccountAmounts(TransactionCurrency $currency, array $fields): void
+    private function determineDatabaseType(): void
     {
-        $operator          = $this->operator;
-        $cast              = $this->cast;
-        $regularExpression = $this->regularExpression;
-
-        /** @var Builder $query */
-        $query = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
-                        ->where('account_meta.name', 'currency_id')
-                        ->where('account_meta.data', json_encode((string)$currency->id));
-        $query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression) {
-            foreach ($fields as $field) {
-                $q->orWhere(
-                    DB::raw(sprintf('CAST(accounts.%s AS %s)', $field, $cast)),
-                    $operator,
-                    DB::raw(sprintf($regularExpression, $currency->decimal_places))
-                );
-            }
-        });
-        $result = $query->get(['accounts.*']);
-        if (0 === $result->count()) {
-            $this->friendlyPositive(sprintf('All accounts in %s are OK', $currency->code));
-
-            return;
-        }
-        /** @var Account $account */
-        foreach ($result as $account) {
-            foreach ($fields as $field) {
-                $value = $account->$field;
-                if (null === $value) {
-                    continue;
-                }
-                // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
-                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
-                $this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));
-                Account::find($account->id)->update([$field => $correct]);
+        // switch stuff based on database connection:
+        $this->operator          = 'REGEXP';
+        $this->regularExpression = '\'\\\\.[\\\\d]{%d}[1-9]+\'';
+        $this->cast              = 'CHAR';
+        if ('pgsql' === config('database.default')) {
+            $this->operator          = 'SIMILAR TO';
+            $this->regularExpression = '\'%%\.[\d]{%d}[1-9]+%%\'';
+            $this->cast              = 'TEXT';
         }
+        if ('sqlite' === config('database.default')) {
+            $this->regularExpression = '"\\.[\d]{%d}[1-9]+"';
         }
     }
 
@@ -188,6 +157,7 @@ class ForceDecimalSize extends Command
      * This method loops all enabled currencies and then calls the method that will fix all objects in this currency.
      *
      * @return void
+     * @throws FireflyException
      */
     private function correctAmountsByCurrency(): void
     {
@@ -249,6 +219,55 @@ class ForceDecimalSize extends Command
         }
     }
 
+    /**
+     * This method loops over all accounts and validates the amounts.
+     *
+     * @param TransactionCurrency $currency
+     * @param array               $fields
+     *
+     * @return void
+     */
+    private function correctAccountAmounts(TransactionCurrency $currency, array $fields): void
+    {
+        $operator          = $this->operator;
+        $cast              = $this->cast;
+        $regularExpression = $this->regularExpression;
+
+        /** @var Builder $query */
+        $query = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
+                        ->where('account_meta.name', 'currency_id')
+                        ->where('account_meta.data', json_encode((string)$currency->id));
+        $query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression) {
+            foreach ($fields as $field) {
+                $q->orWhere(
+                    DB::raw(sprintf('CAST(accounts.%s AS %s)', $field, $cast)),
+                    $operator,
+                    DB::raw(sprintf($regularExpression, $currency->decimal_places))
+                );
+            }
+        });
+        $result = $query->get(['accounts.*']);
+        if (0 === $result->count()) {
+            $this->friendlyPositive(sprintf('All accounts in %s are OK', $currency->code));
+
+            return;
+        }
+        /** @var Account $account */
+        foreach ($result as $account) {
+            foreach ($fields as $field) {
+                $value = $account->$field;
+                if (null === $value) {
+                    continue;
+                }
+                // fix $field by rounding it down correctly.
+                $pow     = pow(10, (int)$currency->decimal_places);
+                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
+                $this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));
+                Account::find($account->id)->update([$field => $correct]);
+            }
+        }
+    }
+
     /**
      * This method fixes all auto budgets in currency $currency.
      *
@@ -300,57 +319,6 @@ class ForceDecimalSize extends Command
         }
     }
 
-    /**
-     * This method fixes all piggy banks in currency $currency.
-     *
-     * @param  TransactionCurrency  $currency
-     * @param  array  $fields
-     *
-     * @return void
-     */
-    private function correctPiggyAmounts(TransactionCurrency $currency, array $fields): void
-    {
-        $operator          = $this->operator;
-        $cast              = $this->cast;
-        $regularExpression = $this->regularExpression;
-
-        /** @var Builder $query */
-        $query = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
-                          ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
-                          ->where('account_meta.name', 'currency_id')
-                          ->where('account_meta.data', json_encode((string)$currency->id))
-                          ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression) {
-                              foreach ($fields as $field) {
-                                  $q->orWhere(
-                                      DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)),
-                                      $operator,
-                                      DB::raw(sprintf($regularExpression, $currency->decimal_places))
-                                  );
-                              }
-                          });
-
-        $result = $query->get(['piggy_banks.*']);
-        if (0 === $result->count()) {
-            $this->friendlyPositive(sprintf('All piggy banks in %s are OK', $currency->code));
-
-            return;
-        }
-        /** @var PiggyBank $item */
-        foreach ($result as $item) {
-            foreach ($fields as $field) {
-                $value = $item->$field;
-                if (null === $value) {
-                    continue;
-                }
-                // fix $field by rounding it down correctly.
-                $pow     = pow(10, (int)$currency->decimal_places);
-                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
-                $this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));
-                PiggyBank::find($item->id)->update([$field => $correct]);
-            }
-        }
-    }
-
     /**
      * This method fixes all piggy bank events in currency $currency.
      *
@@ -459,6 +427,57 @@ class ForceDecimalSize extends Command
         }
     }
 
+    /**
+     * This method fixes all piggy banks in currency $currency.
+     *
+     * @param TransactionCurrency $currency
+     * @param array               $fields
+     *
+     * @return void
+     */
+    private function correctPiggyAmounts(TransactionCurrency $currency, array $fields): void
+    {
+        $operator          = $this->operator;
+        $cast              = $this->cast;
+        $regularExpression = $this->regularExpression;
+
+        /** @var Builder $query */
+        $query = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
+                          ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
+                          ->where('account_meta.name', 'currency_id')
+                          ->where('account_meta.data', json_encode((string)$currency->id))
+                          ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression) {
+                              foreach ($fields as $field) {
+                                  $q->orWhere(
+                                      DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)),
+                                      $operator,
+                                      DB::raw(sprintf($regularExpression, $currency->decimal_places))
+                                  );
+                              }
+                          });
+
+        $result = $query->get(['piggy_banks.*']);
+        if (0 === $result->count()) {
+            $this->friendlyPositive(sprintf('All piggy banks in %s are OK', $currency->code));
+
+            return;
+        }
+        /** @var PiggyBank $item */
+        foreach ($result as $item) {
+            foreach ($fields as $field) {
+                $value = $item->$field;
+                if (null === $value) {
+                    continue;
+                }
+                // fix $field by rounding it down correctly.
+                $pow     = pow(10, (int)$currency->decimal_places);
+                $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);
+                $this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));
+                PiggyBank::find($item->id)->update([$field => $correct]);
+            }
+        }
+    }
+
     /**
      * This method fixes all transactions in currency $currency.
      *
@@ -524,22 +543,6 @@ class ForceDecimalSize extends Command
         }
     }
 
-    private function determineDatabaseType(): void
-    {
-        // switch stuff based on database connection:
-        $this->operator          = 'REGEXP';
-        $this->regularExpression = '\'\\\\.[\\\\d]{%d}[1-9]+\'';
-        $this->cast              = 'CHAR';
-        if ('pgsql' === config('database.default')) {
-            $this->operator          = 'SIMILAR TO';
-            $this->regularExpression = '\'%%\.[\d]{%d}[1-9]+%%\'';
-            $this->cast              = 'TEXT';
-        }
-        if ('sqlite' === config('database.default')) {
-            $this->regularExpression = '"\\.[\d]{%d}[1-9]+"';
-        }
-    }
-
     /**
      * @return void
      */

app/Console/Commands/System/ForceMigration.php

@@ -32,6 +32,9 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
+/**
+ * Class ForceMigration
+ */
 class ForceMigration extends Command
 {
     use ShowsFriendlyMessages;
@@ -79,6 +82,9 @@ class ForceMigration extends Command
         return 0;
     }
 
+    /**
+     * @return void
+     */
     private function forceMigration(): void
     {
         DB::commit();

app/Console/Commands/System/OutputVersion.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * OutputVersion.php
+ * Copyright (c) 2023 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\Console\Commands\System;
+
+use Illuminate\Console\Command;
+
+class OutputVersion extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:output-version';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Outputs the Firefly III version';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        echo config('firefly.version');
+        return 0;
+    }
+}

app/Console/Commands/System/UpgradeFireflyInstructions.php

@@ -66,6 +66,93 @@ class UpgradeFireflyInstructions extends Command
         return 0;
     }
 
+    /**
+     * Render upgrade instructions.
+     */
+    private function updateInstructions(): void
+    {
+        /** @var string $version */
+        $version = config('firefly.version');
+        $config  = config('upgrade.text.upgrade');
+        $text    = '';
+        foreach (array_keys($config) as $compare) {
+            // if string starts with:
+            if (\str_starts_with($version, $compare)) {
+                $text = $config[$compare];
+            }
+        }
+
+        $this->newLine();
+        $this->showLogo();
+        $this->newLine();
+        $this->showLine();
+
+        $this->boxed('');
+        if (null === $text || '' === $text) {
+            $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
+            $this->boxedInfo('There are no extra upgrade instructions.');
+            $this->boxed('Firefly III should be ready for use.');
+            $this->boxed('');
+            $this->showLine();
+
+            return;
+        }
+
+        $this->boxed(sprintf('Thank you for updating to Firefly III, v%s!', $version));
+        $this->boxedInfo($text);
+        $this->boxed('');
+        $this->showLine();
+    }
+
+    /**
+     * The logo takes up 8 lines of code. So 8 colors can be used.
+     *
+     * @return void
+     */
+    private function showLogo(): void
+    {
+        $today = date('m-d');
+        $month = date('m');
+        // variation in colors and effects just because I can!
+        // default is Ukraine flag:
+        $colors = ['blue', 'blue', 'blue', 'yellow', 'yellow', 'yellow', 'default', 'default'];
+
+        // 5th of May is Dutch liberation day and 29th of April is Dutch King's Day and September 17 is my birthday.
+        if ('05-01' === $today || '04-29' === $today || '09-17' === $today) {
+            $colors = ['red', 'red', 'red', 'white', 'white', 'blue', 'blue', 'blue'];
+        }
+
+        // National Coming Out Day, International Day Against Homophobia, Biphobia and Transphobia and Pride Month
+        if ('10-11' === $today || '05-17' === $today || '06' === $month) {
+            $colors = ['red', 'bright-red', 'yellow', 'green', 'blue', 'magenta', 'default', 'default'];
+        }
+
+        // International Transgender Day of Visibility
+        if ('03-31' === $today) {
+            $colors = ['bright-blue', 'bright-red', 'white', 'white', 'bright-red', 'bright-blue', 'default', 'default'];
+        }
+
+        $this->line(sprintf('<fg=%s>              ______ _           __ _            _____ _____ _____  </>', $colors[0]));
+        $this->line(sprintf('<fg=%s>             |  ____(_)         / _| |          |_   _|_   _|_   _| </>', $colors[1]));
+        $this->line(sprintf('<fg=%s>             | |__   _ _ __ ___| |_| |_   _       | |   | |   | |   </>', $colors[2]));
+        $this->line(sprintf('<fg=%s>             |  __| | | \'__/ _ \  _| | | | |      | |   | |   | |   </>', $colors[3]));
+        $this->line(sprintf('<fg=%s>             | |    | | | |  __/ | | | |_| |     _| |_ _| |_ _| |_  </>', $colors[4]));
+        $this->line(sprintf('<fg=%s>             |_|    |_|_|  \___|_| |_|\__, |    |_____|_____|_____| </>', $colors[5]));
+        $this->line(sprintf('<fg=%s>                                       __/ |                        </>', $colors[6]));
+        $this->line(sprintf('<fg=%s>                                      |___/                         </>', $colors[7]));
+    }
+
+    /**
+     * Show a line.
+     */
+    private function showLine(): void
+    {
+        $line = '+';
+        $line .= str_repeat('-', 78);
+        $line .= '+';
+        $this->line($line);
+    }
+
     /**
      * Show a nice box.
      *
@@ -127,90 +214,4 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed('');
         $this->showLine();
     }
-
-    /**
-     * Show a line.
-     */
-    private function showLine(): void
-    {
-        $line = '+';
-        $line .= str_repeat('-', 78);
-        $line .= '+';
-        $this->line($line);
-    }
-
-    /**
-     * The logo takes up 8 lines of code. So 8 colors can be used.
-     * @return void
-     */
-    private function showLogo(): void
-    {
-        $today = date('m-d');
-        $month = date('m');
-        // variation in colors and effects just because I can!
-        // default is Ukraine flag:
-        $colors = ['blue', 'blue', 'blue', 'yellow', 'yellow', 'yellow', 'default', 'default'];
-
-        // 5th of May is Dutch liberation day and 29th of April is Dutch King's Day and September 17 is my birthday.
-        if ('05-01' === $today || '04-29' === $today || '09-17' === $today) {
-            $colors = ['red', 'red', 'red', 'white', 'white', 'blue', 'blue', 'blue'];
-        }
-
-        // National Coming Out Day, International Day Against Homophobia, Biphobia and Transphobia and Pride Month
-        if ('10-11' === $today || '05-17' === $today || '06' === $month) {
-            $colors = ['red', 'bright-red', 'yellow', 'green', 'blue', 'magenta', 'default', 'default'];
-        }
-
-        // International Transgender Day of Visibility
-        if ('03-31' === $today) {
-            $colors = ['bright-blue', 'bright-red', 'white', 'white', 'bright-red', 'bright-blue', 'default', 'default'];
-        }
-
-        $this->line(sprintf('<fg=%s>              ______ _           __ _            _____ _____ _____  </>', $colors[0]));
-        $this->line(sprintf('<fg=%s>             |  ____(_)         / _| |          |_   _|_   _|_   _| </>', $colors[1]));
-        $this->line(sprintf('<fg=%s>             | |__   _ _ __ ___| |_| |_   _       | |   | |   | |   </>', $colors[2]));
-        $this->line(sprintf('<fg=%s>             |  __| | | \'__/ _ \  _| | | | |      | |   | |   | |   </>', $colors[3]));
-        $this->line(sprintf('<fg=%s>             | |    | | | |  __/ | | | |_| |     _| |_ _| |_ _| |_  </>', $colors[4]));
-        $this->line(sprintf('<fg=%s>             |_|    |_|_|  \___|_| |_|\__, |    |_____|_____|_____| </>', $colors[5]));
-        $this->line(sprintf('<fg=%s>                                       __/ |                        </>', $colors[6]));
-        $this->line(sprintf('<fg=%s>                                      |___/                         </>', $colors[7]));
-    }
-
-    /**
-     * Render upgrade instructions.
-     */
-    private function updateInstructions(): void
-    {
-        /** @var string $version */
-        $version = config('firefly.version');
-        $config  = config('upgrade.text.upgrade');
-        $text    = '';
-        foreach (array_keys($config) as $compare) {
-            // if string starts with:
-            if (\str_starts_with($version, $compare)) {
-                $text = $config[$compare];
-            }
-        }
-
-        $this->newLine();
-        $this->showLogo();
-        $this->newLine();
-        $this->showLine();
-
-        $this->boxed('');
-        if (null === $text || '' === $text) {
-            $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
-            $this->boxedInfo('There are no extra upgrade instructions.');
-            $this->boxed('Firefly III should be ready for use.');
-            $this->boxed('');
-            $this->showLine();
-
-            return;
-        }
-
-        $this->boxed(sprintf('Thank you for updating to Firefly III, v%s!', $version));
-        $this->boxedInfo($text);
-        $this->boxed('');
-        $this->showLine();
-    }
 }

app/Console/Commands/Tools/ApplyRules.php

@@ -153,49 +153,6 @@ class ApplyRules extends Command
         return 0;
     }
 
-    /**
-     * @return Collection
-     */
-    private function getRulesToApply(): Collection
-    {
-        $rulesToApply = new Collection();
-        /** @var RuleGroup $group */
-        foreach ($this->groups as $group) {
-            $rules = $this->ruleGroupRepository->getActiveStoreRules($group);
-            /** @var Rule $rule */
-            foreach ($rules as $rule) {
-                // if in rule selection, or group in selection or all rules, it's included.
-                $test = $this->includeRule($rule, $group);
-                if (true === $test) {
-                    Log::debug(sprintf('Will include rule #%d "%s"', $rule->id, $rule->title));
-                    $rulesToApply->push($rule);
-                }
-            }
-        }
-
-        return $rulesToApply;
-    }
-
-    /**
-     */
-    private function grabAllRules(): void
-    {
-        $this->groups = $this->ruleGroupRepository->getActiveGroups();
-    }
-
-    /**
-     * @param  Rule  $rule
-     * @param  RuleGroup  $group
-     *
-     * @return bool
-     */
-    private function includeRule(Rule $rule, RuleGroup $group): bool
-    {
-        return in_array($group->id, $this->ruleGroupSelection, true)
-               || in_array($rule->id, $this->ruleSelection, true)
-               || $this->allRules;
-    }
-
     /**
      * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
      * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
@@ -274,42 +231,6 @@ class ApplyRules extends Command
         return true;
     }
 
-    /**
-     * @throws FireflyException
-     */
-    private function verifyInputDates(): void
-    {
-        // parse start date.
-        $inputStart  = today(config('app.timezone'))->startOfMonth();
-        $startString = $this->option('start_date');
-        if (null === $startString) {
-            /** @var JournalRepositoryInterface $repository */
-            $repository = app(JournalRepositoryInterface::class);
-            $repository->setUser($this->getUser());
-            $first = $repository->firstNull();
-            if (null !== $first) {
-                $inputStart = $first->date;
-            }
-        }
-        if (null !== $startString && '' !== $startString) {
-            $inputStart = Carbon::createFromFormat('Y-m-d', $startString);
-        }
-
-        // parse end date
-        $inputEnd  = today(config('app.timezone'));
-        $endString = $this->option('end_date');
-        if (null !== $endString && '' !== $endString) {
-            $inputEnd = Carbon::createFromFormat('Y-m-d', $endString);
-        }
-
-        if ($inputStart > $inputEnd) {
-            [$inputEnd, $inputStart] = [$inputStart, $inputEnd];
-        }
-
-        $this->startDate = $inputStart;
-        $this->endDate   = $inputEnd;
-    }
-
     /**
      * @return bool
      */
@@ -356,4 +277,83 @@ class ApplyRules extends Command
 
         return true;
     }
+
+    /**
+     * @throws FireflyException
+     */
+    private function verifyInputDates(): void
+    {
+        // parse start date.
+        $inputStart  = today(config('app.timezone'))->startOfMonth();
+        $startString = $this->option('start_date');
+        if (null === $startString) {
+            /** @var JournalRepositoryInterface $repository */
+            $repository = app(JournalRepositoryInterface::class);
+            $repository->setUser($this->getUser());
+            $first = $repository->firstNull();
+            if (null !== $first) {
+                $inputStart = $first->date;
+            }
+        }
+        if (null !== $startString && '' !== $startString) {
+            $inputStart = Carbon::createFromFormat('Y-m-d', $startString);
+        }
+
+        // parse end date
+        $inputEnd  = today(config('app.timezone'));
+        $endString = $this->option('end_date');
+        if (null !== $endString && '' !== $endString) {
+            $inputEnd = Carbon::createFromFormat('Y-m-d', $endString);
+        }
+
+        if ($inputStart > $inputEnd) {
+            [$inputEnd, $inputStart] = [$inputStart, $inputEnd];
+        }
+
+        $this->startDate = $inputStart;
+        $this->endDate   = $inputEnd;
+    }
+
+    /**
+     */
+    private function grabAllRules(): void
+    {
+        $this->groups = $this->ruleGroupRepository->getActiveGroups();
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getRulesToApply(): Collection
+    {
+        $rulesToApply = new Collection();
+        /** @var RuleGroup $group */
+        foreach ($this->groups as $group) {
+            $rules = $this->ruleGroupRepository->getActiveStoreRules($group);
+            /** @var Rule $rule */
+            foreach ($rules as $rule) {
+                // if in rule selection, or group in selection or all rules, it's included.
+                $test = $this->includeRule($rule, $group);
+                if (true === $test) {
+                    Log::debug(sprintf('Will include rule #%d "%s"', $rule->id, $rule->title));
+                    $rulesToApply->push($rule);
+                }
+            }
+        }
+
+        return $rulesToApply;
+    }
+
+    /**
+     * @param Rule      $rule
+     * @param RuleGroup $group
+     *
+     * @return bool
+     */
+    private function includeRule(Rule $rule, RuleGroup $group): bool
+    {
+        return in_array($group->id, $this->ruleGroupSelection, true)
+               || in_array($rule->id, $this->ruleSelection, true)
+               || $this->allRules;
+    }
 }

app/Console/Commands/Tools/Cron.php

@@ -64,6 +64,8 @@ class Cron extends Command
 
     /**
      * @return int
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function handle(): int
     {
@@ -76,9 +78,9 @@ class Cron extends Command
         $force = (bool)$this->option('force');
 
         /*
-         * Fire recurring transaction cron job.
+         * Fire exchange rates cron job.
          */
-        if (true === config('cer.enabled')) {
+        if (true === config('cer.download_enabled')) {
             try {
                 $this->exchangeRatesCronJob($force, $date);
             } catch (FireflyException $e) {
@@ -126,6 +128,62 @@ class Cron extends Command
         return 0;
     }
 
+    /**
+     * @param bool        $force
+     * @param Carbon|null $date
+     */
+    private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
+    {
+        $exchangeRates = new ExchangeRatesCronjob();
+        $exchangeRates->setForce($force);
+        // set date in cron job:
+        if (null !== $date) {
+            $exchangeRates->setDate($date);
+        }
+
+        $exchangeRates->fire();
+
+        if ($exchangeRates->jobErrored) {
+            $this->friendlyError(sprintf('Error in "exchange rates" cron: %s', $exchangeRates->message));
+        }
+        if ($exchangeRates->jobFired) {
+            $this->friendlyInfo(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
+        }
+        if ($exchangeRates->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
+        }
+    }
+
+    /**
+     * @param bool        $force
+     * @param Carbon|null $date
+     *
+     * @throws ContainerExceptionInterface
+     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
+     */
+    private function recurringCronJob(bool $force, ?Carbon $date): void
+    {
+        $recurring = new RecurringCronjob();
+        $recurring->setForce($force);
+
+        // set date in cron job:
+        if (null !== $date) {
+            $recurring->setDate($date);
+        }
+
+        $recurring->fire();
+        if ($recurring->jobErrored) {
+            $this->friendlyError(sprintf('Error in "create recurring transactions" cron: %s', $recurring->message));
+        }
+        if ($recurring->jobFired) {
+            $this->friendlyInfo(sprintf('"Create recurring transactions" cron fired: %s', $recurring->message));
+        }
+        if ($recurring->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Create recurring transactions" cron ran with success: %s', $recurring->message));
+        }
+    }
+
     /**
      * @param bool        $force
      * @param Carbon|null $date
@@ -182,60 +240,4 @@ class Cron extends Command
             $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
         }
     }
-
-    /**
-     * @param  bool  $force
-     * @param  Carbon|null  $date
-     */
-    private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
-    {
-        $exchangeRates = new ExchangeRatesCronjob();
-        $exchangeRates->setForce($force);
-        // set date in cron job:
-        if (null !== $date) {
-            $exchangeRates->setDate($date);
-        }
-
-        $exchangeRates->fire();
-
-        if ($exchangeRates->jobErrored) {
-            $this->friendlyError(sprintf('Error in "exchange rates" cron: %s', $exchangeRates->message));
-        }
-        if ($exchangeRates->jobFired) {
-            $this->friendlyInfo(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
-        }
-        if ($exchangeRates->jobSucceeded) {
-            $this->friendlyPositive(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
-        }
-    }
-
-    /**
-     * @param  bool  $force
-     * @param  Carbon|null  $date
-     *
-     * @throws ContainerExceptionInterface
-     * @throws FireflyException
-     * @throws NotFoundExceptionInterface
-     */
-    private function recurringCronJob(bool $force, ?Carbon $date): void
-    {
-        $recurring = new RecurringCronjob();
-        $recurring->setForce($force);
-
-        // set date in cron job:
-        if (null !== $date) {
-            $recurring->setDate($date);
-        }
-
-        $recurring->fire();
-        if ($recurring->jobErrored) {
-            $this->friendlyError(sprintf('Error in "create recurring transactions" cron: %s', $recurring->message));
-        }
-        if ($recurring->jobFired) {
-            $this->friendlyInfo(sprintf('"Create recurring transactions" cron fired: %s', $recurring->message));
-        }
-        if ($recurring->jobSucceeded) {
-            $this->friendlyPositive(sprintf('"Create recurring transactions" cron ran with success: %s', $recurring->message));
-        }
-    }
 }

app/Console/Commands/Upgrade/AccountCurrencies.php

@@ -54,7 +54,8 @@ class AccountCurrencies extends Command
     private UserRepositoryInterface    $userRepos;
 
     /**
-     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account.
+     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's
+     * forced upon the account.
      *
      * @return int
      */
@@ -80,23 +81,6 @@ class AccountCurrencies extends Command
         return 0;
     }
 
-    /**
-     * @return bool
-     */
-    private function isExecuted(): bool
-    {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
-        return (bool)$configVar?->data;
-    }
-
-    /**
-     *
-     */
-    private function markAsExecuted(): void
-    {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
-    }
-
     /**
      * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
      * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
@@ -110,6 +94,62 @@ class AccountCurrencies extends Command
         $this->count        = 0;
     }
 
+    /**
+     * @return bool
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    private function isExecuted(): bool
+    {
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        return (bool)$configVar?->data;
+    }
+
+    /**
+     *
+     */
+    private function updateAccountCurrencies(): void
+    {
+        $users               = $this->userRepos->all();
+        $defaultCurrencyCode = (string)config('firefly.default_currency', 'EUR');
+        foreach ($users as $user) {
+            $this->updateCurrenciesForUser($user, $defaultCurrencyCode);
+        }
+    }
+
+    /**
+     * @param User   $user
+     * @param string $systemCurrencyCode
+     *
+     * @throws FireflyException
+     */
+    private function updateCurrenciesForUser(User $user, string $systemCurrencyCode): void
+    {
+        $this->accountRepos->setUser($user);
+        $accounts = $this->accountRepos->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+
+        // get user's currency preference:
+        $defaultCurrencyCode = app('preferences')->getForUser($user, 'currencyPreference', $systemCurrencyCode)->data;
+        if (!is_string($defaultCurrencyCode)) {
+            $defaultCurrencyCode = $systemCurrencyCode;
+        }
+
+        /** @var TransactionCurrency|null $defaultCurrency */
+        $defaultCurrency = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
+
+        if (null === $defaultCurrency) {
+            Log::error(sprintf('Users currency pref "%s" does not exist!', $defaultCurrencyCode));
+            $this->friendlyError(sprintf('User has a preference for "%s", but this currency does not exist.', $defaultCurrencyCode));
+
+            return;
+        }
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $this->updateAccount($account, $defaultCurrency);
+        }
+    }
+
     /**
      * @param Account             $account
      * @param TransactionCurrency $currency
@@ -158,45 +198,8 @@ class AccountCurrencies extends Command
     /**
      *
      */
-    private function updateAccountCurrencies(): void
+    private function markAsExecuted(): void
     {
-        $users               = $this->userRepos->all();
-        $defaultCurrencyCode = (string)config('firefly.default_currency', 'EUR');
-        foreach ($users as $user) {
-            $this->updateCurrenciesForUser($user, $defaultCurrencyCode);
-        }
-    }
-
-    /**
-     * @param  User  $user
-     * @param  string  $systemCurrencyCode
-     *
-     * @throws FireflyException
-     */
-    private function updateCurrenciesForUser(User $user, string $systemCurrencyCode): void
-    {
-        $this->accountRepos->setUser($user);
-        $accounts = $this->accountRepos->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
-
-        // get user's currency preference:
-        $defaultCurrencyCode = app('preferences')->getForUser($user, 'currencyPreference', $systemCurrencyCode)->data;
-        if (!is_string($defaultCurrencyCode)) {
-            $defaultCurrencyCode = $systemCurrencyCode;
-        }
-
-        /** @var TransactionCurrency|null $defaultCurrency */
-        $defaultCurrency = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
-
-        if (null === $defaultCurrency) {
-            Log::error(sprintf('Users currency pref "%s" does not exist!', $defaultCurrencyCode));
-            $this->friendlyError(sprintf('User has a preference for "%s", but this currency does not exist.', $defaultCurrencyCode));
-
-            return;
-        }
-
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $this->updateAccount($account, $defaultCurrency);
-        }
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php

@@ -24,13 +24,15 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
+/**
+ * Class AppendBudgetLimitPeriods
+ */
 class AppendBudgetLimitPeriods extends Command
 {
     use ShowsFriendlyMessages;
@@ -54,7 +56,6 @@ class AppendBudgetLimitPeriods extends Command
      *
      * @return int
      * @throws ContainerExceptionInterface
-     * @throws FireflyException
      * @throws NotFoundExceptionInterface
      */
     public function handle(): int
@@ -71,6 +72,30 @@ class AppendBudgetLimitPeriods extends Command
         return 0;
     }
 
+    /**
+     * @return bool
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    private function isExecuted(): bool
+    {
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+
+        return (bool)$configVar->data;
+    }
+
+    /**
+     *
+     */
+    private function theresNoLimit(): void
+    {
+        $limits = BudgetLimit::whereNull('period')->get();
+        /** @var BudgetLimit $limit */
+        foreach ($limits as $limit) {
+            $this->fixLimit($limit);
+        }
+    }
+
     /**
      * @param BudgetLimit $limit
      */
@@ -156,18 +181,6 @@ class AppendBudgetLimitPeriods extends Command
         return null;
     }
 
-    /**
-     * @return bool
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
-     */
-    private function isExecuted(): bool
-    {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
-
-        return (bool)$configVar->data;
-    }
-
     /**
      *
      */
@@ -175,16 +188,4 @@ class AppendBudgetLimitPeriods extends Command
     {
         app('fireflyconfig')->set(self::CONFIG_NAME, true);
     }
-
-    /**
-     *
-     */
-    private function theresNoLimit(): void
-    {
-        $limits = BudgetLimit::whereNull('period')->get();
-        /** @var BudgetLimit $limit */
-        foreach ($limits as $limit) {
-            $this->fixLimit($limit);
-        }
-    }
 }

app/Console/Commands/Upgrade/BackToJournals.php

@@ -25,14 +25,12 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use DB;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -62,7 +60,6 @@ class BackToJournals extends Command
      *
      * @return int
      * @throws ContainerExceptionInterface
-     * @throws FireflyException
      * @throws NotFoundExceptionInterface
      */
     public function handle(): int
@@ -87,54 +84,6 @@ class BackToJournals extends Command
         return 0;
     }
 
-    /**
-     * @return array
-     */
-    private function getIdsForBudgets(): array
-    {
-        $transactions = DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
-        $array        = [];
-        $chunks       = array_chunk($transactions, 500);
-
-        foreach ($chunks as $chunk) {
-            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
-            $array = array_merge($array, $set);
-        }
-
-        return $array;
-    }
-
-    /**
-     * @return array
-     */
-    private function getIdsForCategories(): array
-    {
-        $transactions = DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
-        $array        = [];
-        $chunks       = array_chunk($transactions, 500);
-
-        foreach ($chunks as $chunk) {
-            $set   = DB::table('transactions')
-                       ->whereIn('transactions.id', $chunk)
-                       ->pluck('transaction_journal_id')->toArray();
-            $array = array_merge($array, $set);
-        }
-
-        return $array;
-    }
-
-    /**
-     * @return bool
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
-     */
-    private function isExecuted(): bool
-    {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
-
-        return (bool)$configVar->data;
-    }
-
     /**
      * @return bool
      * @throws ContainerExceptionInterface
@@ -148,11 +97,15 @@ class BackToJournals extends Command
     }
 
     /**
-     *
+     * @return bool
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
-    private function markAsExecuted(): void
+    private function isExecuted(): bool
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+
+        return (bool)$configVar->data;
     }
 
     /**
@@ -186,6 +139,23 @@ class BackToJournals extends Command
         }
     }
 
+    /**
+     * @return array
+     */
+    private function getIdsForBudgets(): array
+    {
+        $transactions = DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
+        $array        = [];
+        $chunks       = array_chunk($transactions, 500);
+
+        foreach ($chunks as $chunk) {
+            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
+            $array = array_merge($array, $set);
+        }
+
+        return $array;
+    }
+
     /**
      * @param TransactionJournal $journal
      */
@@ -239,6 +209,25 @@ class BackToJournals extends Command
         }
     }
 
+    /**
+     * @return array
+     */
+    private function getIdsForCategories(): array
+    {
+        $transactions = DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
+        $array        = [];
+        $chunks       = array_chunk($transactions, 500);
+
+        foreach ($chunks as $chunk) {
+            $set   = DB::table('transactions')
+                       ->whereIn('transactions.id', $chunk)
+                       ->pluck('transaction_journal_id')->toArray();
+            $array = array_merge($array, $set);
+        }
+
+        return $array;
+    }
+
     /**
      * @param TransactionJournal $journal
      */
@@ -268,4 +257,12 @@ class BackToJournals extends Command
             $journal->categories()->sync([(int)$category->id]);
         }
     }
+
+    /**
+     *
+     */
+    private function markAsExecuted(): void
+    {
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+    }
 }