Merge branch 'release/v6.0.29'

v6.0.28

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

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "composer/pcre",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+                "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
                 "shasum": ""
             },
             "require": {
@@ -59,7 +59,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.0"
+                "source": "https://github.com/composer/pcre/tree/3.1.1"
             },
             "funding": [
                 {
@@ -75,20 +75,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-17T09:50:14+00:00"
+            "time": "2023-10-11T07:11:09+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.3.2",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
                 "shasum": ""
             },
             "require": {
@@ -138,9 +138,9 @@
                 "versioning"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.3.2"
+                "source": "https://github.com/composer/semver/tree/3.4.0"
             },
             "funding": [
                 {
@@ -156,7 +156,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T19:23:25+00:00"
+            "time": "2023-08-31T09:50:34+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -224,181 +224,26 @@
             ],
             "time": "2022-02-25T21:32:43+00:00"
         },
-        {
-            "name": "doctrine/annotations",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
-                "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "^2 || ^3",
-                "ext-tokenizer": "*",
-                "php": "^7.2 || ^8.0",
-                "psr/cache": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "doctrine/cache": "^2.0",
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.8.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "symfony/cache": "^5.4 || ^6",
-                "vimeo/psalm": "^4.10"
-            },
-            "suggest": {
-                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/2.0.1"
-            },
-            "time": "2023-02-02T22:02:53+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^9.5",
-                "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/3.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-15T16:57:16+00:00"
-        },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.21.1",
+            "version": "v3.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86"
+                "reference": "d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/229b55b3eae4729a8e2a321441ba40fcb3720b86",
-                "reference": "229b55b3eae4729a8e2a321441ba40fcb3720b86",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b",
+                "reference": "d5ccc3807fd496ac2b448e8e5e57aa0772f0d18b",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.3",
                 "composer/xdebug-handler": "^3.0.3",
-                "doctrine/annotations": "^2",
-                "doctrine/lexer": "^2 || ^3",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^8.0.1",
+                "php": "^7.4 || ^8.0",
                 "sebastian/diff": "^4.0 || ^5.0",
                 "symfony/console": "^5.4 || ^6.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0",
@@ -412,6 +257,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",
@@ -422,8 +268,6 @@
                 "phpspec/prophecy": "^1.16",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "phpunitgoodpractices/polyfill": "^1.6",
-                "phpunitgoodpractices/traits": "^1.9.2",
                 "symfony/phpunit-bridge": "^6.2.3",
                 "symfony/yaml": "^5.4 || ^6.0"
             },
@@ -463,7 +307,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.21.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.37.0"
             },
             "funding": [
                 {
@@ -471,56 +315,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-05T21:50:25+00:00"
-        },
-        {
-            "name": "psr/cache",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/cache/tree/3.0.0"
-            },
-            "time": "2021-02-03T23:26:27+00:00"
+            "time": "2023-10-28T14:49:50+00:00"
         },
         {
             "name": "psr/container",
@@ -744,16 +539,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.0",
+            "version": "v6.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7"
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
                 "shasum": ""
             },
             "require": {
@@ -814,7 +609,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.0"
+                "source": "https://github.com/symfony/console/tree/v6.3.4"
             },
             "funding": [
                 {
@@ -830,7 +625,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2023-08-16T10:10:12+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -901,16 +696,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 +756,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 +772,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T14:41:17+00:00"
+            "time": "2023-07-06T06:56:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1120,16 +915,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.3.0",
+            "version": "v6.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2"
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
                 "shasum": ""
             },
             "require": {
@@ -1164,7 +959,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.5"
             },
             "funding": [
                 {
@@ -1180,7 +975,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-02T01:25:41+00:00"
+            "time": "2023-09-26T12:56:25+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -1251,16 +1046,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
                 "shasum": ""
             },
             "require": {
@@ -1275,7 +1070,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1313,7 +1108,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1329,20 +1124,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+                "reference": "875e90aeea2777b6f135677f618529449334a612"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
+                "reference": "875e90aeea2777b6f135677f618529449334a612",
                 "shasum": ""
             },
             "require": {
@@ -1354,7 +1149,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1394,7 +1189,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1410,20 +1205,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
                 "shasum": ""
             },
             "require": {
@@ -1435,7 +1230,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1478,7 +1273,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1494,20 +1289,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
                 "shasum": ""
             },
             "require": {
@@ -1522,7 +1317,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1561,7 +1356,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1577,20 +1372,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-07-28T09:04:16+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
                 "shasum": ""
             },
             "require": {
@@ -1599,7 +1394,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1644,7 +1439,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1660,20 +1455,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
+                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
+                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
                 "shasum": ""
             },
             "require": {
@@ -1682,7 +1477,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1723,7 +1518,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1739,20 +1534,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.3.0",
+            "version": "v6.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
+                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54",
+                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54",
                 "shasum": ""
             },
             "require": {
@@ -1784,7 +1579,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.4"
             },
             "funding": [
                 {
@@ -1800,7 +1595,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T08:06:44+00:00"
+            "time": "2023-08-07T10:39:22+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1948,16 +1743,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.0",
+            "version": "v6.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
                 "shasum": ""
             },
             "require": {
@@ -2014,7 +1809,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.0"
+                "source": "https://github.com/symfony/string/tree/v6.3.5"
             },
             "funding": [
                 {
@@ -2030,7 +1825,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-21T21:06:29+00:00"
+            "time": "2023-09-18T10:38:32+00:00"
         }
     ],
     "packages-dev": [],

.editorconfig

@@ -2,8 +2,17 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
-indent_size = 2
 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

@@ -45,12 +45,6 @@ TRUSTED_PROXIES=
 # Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
 LOG_CHANNEL=stack
 
-#
-# Used when logging to papertrail:
-#
-PAPERTRAIL_HOST=
-PAPERTRAIL_PORT=
-
 # 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
@@ -58,8 +52,30 @@ PAPERTRAIL_PORT=
 APP_LOG_LEVEL=notice
 
 # Audit log level.
-# Set this to "emergency" if you dont want to store audit logs, leave on info otherwise.
-AUDIT_LOG_LEVEL=info
+# The audit log is used to log notable Firefly III events on a separate channel.
+# These log entries may contain sensitive financial information.
+# The audit log is disabled by default.
+#
+# To enable it, set AUDIT_LOG_LEVEL to "info"
+# To disable it, set AUDIT_LOG_LEVEL to "emergency"
+AUDIT_LOG_LEVEL=emergency
+
+#
+# If you want, you can redirect the audit logs to another channel.
+# Set 'audit_stdout', 'audit_syslog', 'audit_errorlog' to log to the system itself.
+# Use audit_daily to log to a rotating file.
+# Use audit_papertrail to log to papertrail.
+#
+# If you do this, the audit logs may be mixed with normal logs because the settings for these channels
+# are often the same as the settings for the normal logs.
+AUDIT_LOG_CHANNEL=
+
+#
+# Used when logging to papertrail:
+# Also used when audit logs log to papertrail:
+#
+PAPERTRAIL_HOST=
+PAPERTRAIL_PORT=
 
 # 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/firefly-iii/faq/self-hosted/#i-want-to-use-sqlite
@@ -179,6 +195,16 @@ MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
 MAP_DEFAULT_ZOOM=6
 
+#
+# Some objects have room for an URL, like transactions and webhooks.
+# By default, the following protocols are allowed:
+# http, https, ftp, ftps, mailto
+#
+# To change this, set your preferred comma separated set below.
+# Be sure to include http, https and other default ones if you need to.
+#
+VALID_URL_PROTOCOLS=
+
 #
 # Firefly III authentication settings
 #

.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/label-actions.yml

@@ -0,0 +1,37 @@
+# Configuration for Label Actions - https://github.com/dessant/label-actions
+
+# The `feature` label is added to issues
+feature:
+  issues:
+    # Post a comment, `{issue-author}` is an optional placeholder
+    comment: |
+      Hi there! This is an automatic reply. `Share and enjoy`
+
+      This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.
+
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+
+      Thank you for your contributions.
+
+enhancement:
+  issues:
+    # Post a comment, `{issue-author}` is an optional placeholder
+    comment: |
+      Hi there! This is an automatic reply. `Share and enjoy`
+
+      This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course.
+
+      If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
+
+      Thank you for your contributions.
+
+# The `solved` label is added to discussions
+triage:
+  issues:
+    # Post a comment, `{issue-author}` is an optional placeholder
+    comment: |
+      Hi there! This is an automatic reply. `Share and enjoy`
+
+      This issue has been marked as being in triage. The root cause is not known yet, or the issue needs more investigation. You can help by sharing debug information (from `/debug`) if you also have this issue or when you haven't already done so.
+
+      Thank you for your contributions.

.github/workflows/cleanup.yml

@@ -1,6 +1,6 @@
 # This workflow prunes old workflow runs for an entire repository.
 
-name: Prune old builds
+name: "Chore - prune old builds"
 
 on:
   schedule:

.github/workflows/closed-issues.yml

@@ -1,4 +1,4 @@
-name: "Reply to closed issue"
+name: "Issues - reply to closed issue"
 on:
   issues:
     types:
@@ -12,11 +12,13 @@ jobs:
           message: |
             Hi there! This is an automatic reply. `Share and enjoy`
 
-            This issue is now 🔒 closed. Please be aware that closed issues are **not** watched.
+            This issue is now 🔒 closed. Please be aware that closed issues are not monitored by the developer of Firefly III.
 
-            - If the original bug is not actually fixed, please feel free to open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose). Please refer to this issue for clarity.
+            - If the original bug is not actually fixed, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose). Refer to this issue for clarity.
             - Follow-up questions must be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
-            - Further replies to this issue will get **no response**.
+            - Further replies to this issue may get no response.
+
+            If there is more to discuss, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose) or [discussion](https://github.com/firefly-iii/firefly-iii/discussions/).
 
             Thank you for your contributions.
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/depsreview.yaml

@@ -1,4 +1,4 @@
-name: 'Dependency Review'
+name: 'Code - dependency review'
 on: [ pull_request ]
 
 permissions:

.github/workflows/label-actions.yml

@@ -0,0 +1,21 @@
+name: 'Issues - reply to specific labels'
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+  pull_request_target:
+    types: [labeled, unlabeled]
+  discussion:
+    types: [labeled, unlabeled]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@v3

.github/workflows/laravel.yml

@@ -1,146 +0,0 @@
-name: Firefly III
-
-on:
-  push:
-    branches-ignore:
-      - '**'
-
-jobs:
-  prepare:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Prepare dependencies
-        run: |
-          set -euxo pipefail
-          export PATH=$PATH:$HOME/.composer/vendor/bin/
-          composer global require hirak/prestissimo --no-plugins --no-scripts
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-          touch ./storage/database/database.sqlite
-      - name: Prepare Firefly III
-        run: |
-          chmod -R 777 storage bootstrap/cache
-          php artisan migrate --seed
-          php artisan firefly-iii:upgrade-database
-      - name: Upload database
-        uses: actions/upload-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Upload cache
-        uses: actions/upload-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Upload composer cache
-        uses: actions/upload-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-
-  laravel-tests:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: Install composer
-        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: PHPUnit tests
-        uses: php-actions/phpunit@v1
-        with:
-          config: phpunit.xml
-          memory: 512M
-
-  coding-standards:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: install depenencies
-        run: |
-          composer global require nette/coding-standard
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: Execute code standard
-        run: /home/runner/.composer/vendor/bin/ecs check app tests --config ./.ci/firefly-iii-standard.yml
-
-  phpstan:
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - prepare
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Copy .env
-        run: test -f .env || cp .ci/.env.ci .env
-      - name: Download database
-        uses: actions/download-artifact@v2
-        with:
-          name: database
-          path: storage/database/database.sqlite
-      - name: Download cache
-        uses: actions/download-artifact@v2
-        with:
-          name: cache
-          path: bootstrap/cache/
-      - name: Download vendor
-        uses: actions/download-artifact@v2
-        with:
-          name: composer
-          path: ~/.composer
-      - name: Install depenencies
-        run: |
-          composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-suggest
-
-      - name: Execute PHPStan
-        run: vendor/bin/phpstan analyse -c .ci/phpstan.neon

.github/workflows/lock.yml

@@ -1,4 +1,4 @@
-name: Lock old issues
+name: 'Issues - Lock old issues'
 
 on:
   workflow_dispatch:

.github/workflows/qodana.yml

@@ -1,35 +0,0 @@
-name: Qodana
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - develop
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    name: 'Qodana Scan'
-    steps:
-      - name: Setup PHP with no coverage driver
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.2'
-          coverage: none
-          extensions: bcmath, intl
-        env:
-          update: true
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Install dependencies
-        run: |
-          composer install --no-scripts
-          cp .env.example .env
-          php artisan key:generate
-          php artisan clear-compiled
-          php artisan ide-helper:generate;
-
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@main
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.github/workflows/sonarcloud.yml

@@ -1,14 +1,37 @@
-name: Sonarcloud
+name: 'Code - Run Sonarcloud'
 on:
   pull_request:
   push:
     branches:
       - main
       - develop
+env:
+  DB_CONNECTION: mysql
+  DB_HOST: "127.0.0.1"
+  DB_DATABASE: firefly
+  DB_USER: firefly
+  DB_PASSWORD: secret_firefly_password
+
 jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
+    services:
+      mariadb:
+        image: mariadb:latest
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: yes
+          MYSQL_USER: ${{ env.DB_USER }}
+          MYSQL_PASSWORD: ${{ env.DB_PASSWORD }}
+          MYSQL_DATABASE: ${{ env.DB_DATABASE }}
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
     steps:
       - uses: actions/checkout@v3
         with:
@@ -24,16 +47,49 @@ jobs:
         with:
           php-version: '8.2'
           coverage: xdebug
+          extensions: >-
+            bcmath
+            curl
+            fileinfo
+            iconv
+            intl
+            json
+            mbstring
+            openssl
+            pdo
+            session
+            simplexml
+            sodium
+            tokenizer
+            xml
+            xmlwriter
 
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
 
+      - name: Verify Database connection
+        env:
+          PORT: ${{ job.services.mariadb.ports[3306] }}
+        run: |
+          while ! mysqladmin ping -h"${{env.DB_HOST}}" -P"${PORT}" --silent; do
+            sleep 1
+          done
+
       - name: Copy environment file
-        run: cp .env.example .env
+        run: sed 's@DB_HOST=.*@DB_HOST=${{env.DB_HOST}}@g' .env.example > .env
 
       - name: Generate app key
         run: php artisan key:generate
 
+      - name: "Create the database"
+        run: php artisan firefly-iii:create-database
+
+      - name: "Upgrades the database to the latest version"
+        run: php artisan firefly-iii:upgrade-database
+
+      - name: "Integrity Database Report"
+        run: php artisan firefly-iii:report-integrity
+
       - name: "Run tests with coverage"
         run: composer coverage
 

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: "Close stale issues"
+name: "Issues - close stale issues"
 on:
   schedule:
     - cron: "30 1 * * *"

.gitignore

@@ -1,8 +1,6 @@
 /node_modules
-/frontend/node_modules
 /storage/*.key
 /vendor
-/.vagrant
 npm-debug.log
 yarn-error.log
 .env

.htaccess

@@ -8,7 +8,5 @@
 # To hide directory listing
 Options All -Indexes
 
-# To prevent access to .env and other files
-<Files .*>
+# To prevent access any file
 Deny from all
-</Files>

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

@@ -82,7 +82,8 @@ class AccountController extends Controller
         $date  = $data['date'] ?? today(config('app.timezone'));
 
         $return = [];
-        $result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
+
+        $result = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit'));
         // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
         $defaultCurrency = app('amount')->getDefaultCurrency();
 
@@ -105,7 +106,7 @@ class AccountController extends Controller
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,

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

@@ -58,7 +58,6 @@ class BillController extends Controller
     /**
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getBillsAC
-     * TODO expand API to add active field.
      *
      * @param AutocompleteRequest $request
      *
@@ -67,7 +66,7 @@ class BillController extends Controller
     public function bills(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchBill($data['query'], $data['limit']);
+        $result   = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Bill $item) {
                 return [

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

@@ -66,7 +66,7 @@ class BudgetController extends Controller
     public function budgets(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchBudget($data['query'], $data['limit']);
+        $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Budget $item) {
                 return [

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

@@ -66,7 +66,7 @@ class CategoryController extends Controller
     public function categories(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $result   = $this->repository->searchCategory($data['query'], $data['limit']);
+        $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
             static function (Category $item) {
                 return [

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

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -66,7 +66,7 @@ class CurrencyController extends Controller
     public function currencies(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
-        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $collection = $this->repository->searchCurrency($data['query'], $this->parameters->get('limit'));
         $result     = [];
 
         /** @var TransactionCurrency $currency */
@@ -95,7 +95,7 @@ class CurrencyController extends Controller
     public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
-        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $collection = $this->repository->searchCurrency($data['query'], $this->parameters->get('limit'));
         $result     = [];
 
         /** @var TransactionCurrency $currency */

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

@@ -67,7 +67,7 @@ class ObjectGroupController extends Controller
     {
         $data   = $request->getData();
         $return = [];
-        $result = $this->repository->search($data['query'], $data['limit']);
+        $result = $this->repository->search($data['query'], $this->parameters->get('limit'));
 
         /** @var ObjectGroup $objectGroup */
         foreach ($result as $objectGroup) {

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

@@ -70,7 +70,7 @@ class PiggyBankController extends Controller
     public function piggyBanks(AutocompleteRequest $request): JsonResponse
     {
         $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $response        = [];
 
@@ -105,7 +105,7 @@ class PiggyBankController extends Controller
     public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
     {
         $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $response        = [];
         /** @var PiggyBank $piggy */

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

@@ -64,7 +64,7 @@ class RecurrenceController extends Controller
     public function recurring(AutocompleteRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        $recurrences = $this->repository->searchRecurrence($data['query'], $data['limit']);
+        $recurrences = $this->repository->searchRecurrence($data['query'], $this->parameters->get('limit'));
         $response    = [];
 
         /** @var Recurrence $recurrence */

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

@@ -63,7 +63,7 @@ class RuleController extends Controller
     public function rules(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $rules    = $this->repository->searchRule($data['query'], $data['limit']);
+        $rules    = $this->repository->searchRule($data['query'], $this->parameters->get('limit'));
         $response = [];
 
         /** @var Rule $rule */

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

@@ -63,7 +63,7 @@ class RuleGroupController extends Controller
     public function ruleGroups(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $groups   = $this->repository->searchRuleGroup($data['query'], $data['limit']);
+        $groups   = $this->repository->searchRuleGroup($data['query'], $this->parameters->get('limit'));
         $response = [];
 
         /** @var RuleGroup $group */

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

@@ -67,7 +67,7 @@ class TagController extends Controller
     {
         $data = $request->getData();
 
-        $result = $this->repository->searchTags($data['query'], $data['limit']);
+        $result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
         $array  = [];
         /** @var Tag $tag */
         foreach ($result as $tag) {

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

@@ -71,7 +71,7 @@ class TransactionController extends Controller
     public function transactions(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();
-        $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+        $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
 
         // limit and unique
         $filtered = $result->unique('description');
@@ -113,7 +113,7 @@ class TransactionController extends Controller
             }
         }
         if (!is_numeric($data['query'])) {
-            $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+            $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit'));
         }
 
         // limit and unique

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

@@ -62,7 +62,7 @@ class TransactionTypeController extends Controller
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {
         $data  = $request->getData();
-        $types = $this->repository->searchTypes($data['query'], $data['limit']);
+        $types = $this->repository->searchTypes($data['query'], $this->parameters->get('limit'));
         $array = [];
 
         /** @var TransactionType $type */

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

@@ -31,7 +31,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -46,7 +45,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface $currencyRepository;
     private AccountRepositoryInterface $repository;
 
     /**
@@ -64,9 +62,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 return $next($request);
             }
         );

app/Api/V1/Controllers/Controller.php

@@ -61,9 +61,9 @@ abstract class Controller extends BaseController
     {
         // get global parameters
         $this->allowedSort = config('firefly.allowed_sort_parameters');
-        $this->parameters  = $this->getParameters();
         $this->middleware(
             function ($request, $next) {
+                $this->parameters = $this->getParameters();
                 if (auth()->check()) {
                     $language = app('steam')->getLanguage();
                     app()->setLocale($language);
@@ -102,6 +102,7 @@ abstract class Controller extends BaseController
             } catch (BadRequestException $e) {
                 Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
                 Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
                 $value = null;
             }
             $obj = null;
@@ -130,11 +131,17 @@ abstract class Controller extends BaseController
             } catch (BadRequestException $e) {
                 Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
                 Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
                 $value = null;
             }
             if (null !== $value) {
                 $bag->set($integer, (int)$value);
             }
+            if (null === $value && 'limit' === $integer && auth()->check()) {
+                // set default for user:
+                $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+                $bag->set($integer, $pageSize);
+            }
         }
 
         // sort fields:
@@ -154,6 +161,7 @@ abstract class Controller extends BaseController
         } catch (BadRequestException $e) {
             Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             $param = '';
         }
         if ('' === $param) {

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;
 
@@ -43,7 +42,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface   $currencyRepository;
     private OperationsRepositoryInterface $opsRepository;
     private AccountRepositoryInterface    $repository;
 
@@ -61,9 +59,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->opsRepository->setUser($user);
 

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

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use Illuminate\Http\JsonResponse;
 
@@ -43,7 +42,6 @@ class AccountController extends Controller
 {
     use ApiSupport;
 
-    private CurrencyRepositoryInterface   $currencyRepository;
     private OperationsRepositoryInterface $opsRepository;
     private AccountRepositoryInterface    $repository;
 
@@ -61,9 +59,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->opsRepository->setUser($user);
 

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -81,7 +81,7 @@ class ListController extends Controller
     public function attachments(Account $account): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($account);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks($account);
@@ -152,15 +152,9 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
         $types   = $this->mapTransactionTypes($this->parameters->get('type'));
         $manager = $this->getManager();
         /** @var User $admin */
@@ -172,8 +166,11 @@ class ListController extends Controller
         $collector->setUser($admin)->setAccounts(new Collection([$account]))
                   ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -84,7 +84,7 @@ class ShowController extends Controller
 
         // types to get, page size:
         $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();

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

@@ -123,7 +123,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of attachments. Count it and split it.
         $collection  = $this->repository->get();

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

@@ -76,7 +76,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         $start = $this->parameters->get('start');
         $end   = $this->parameters->get('end');

app/Api/V1/Controllers/Models/Bill/ListController.php

@@ -80,7 +80,7 @@ class ListController extends Controller
     public function attachments(Bill $bill): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($bill);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getRulesForBill($bill);
@@ -151,7 +151,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -177,9 +177,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        // do parameter stuff on new group collector.
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         // get paginator.

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $this->repository->correctOrder();
         $bills     = $this->repository->getBills();
         $manager   = $this->getManager();
-        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize  = $this->parameters->get('limit');
         $count     = $bills->count();
         $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));

app/Api/V1/Controllers/Models/Budget/ListController.php

@@ -82,7 +82,7 @@ class ListController extends Controller
     public function attachments(Budget $budget): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($budget);
 
         $count       = $collection->count();
@@ -116,7 +116,7 @@ class ListController extends Controller
     public function budgetLimits(Budget $budget): JsonResponse
     {
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $this->parameters->set('budget_id', $budget->id);
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
@@ -148,13 +148,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
+        $pageSize = $this->parameters->get('limit');
 
         $type = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
@@ -181,8 +175,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();
@@ -211,13 +208,7 @@ class ListController extends Controller
      */
     public function withoutBudget(Request $request): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // user can overrule page size with limit parameter.
-        $limit = $this->parameters->get('limit');
-        if (null !== $limit && $limit > 0) {
-            $pageSize = $limit;
-        }
+        $pageSize = $this->parameters->get('limit');
 
         $type = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
@@ -244,8 +235,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getBudgets();

app/Api/V1/Controllers/Models/BudgetLimit/ListController.php

@@ -80,7 +80,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 

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

@@ -85,7 +85,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -117,7 +117,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

app/Api/V1/Controllers/Models/Category/ListController.php

@@ -77,7 +77,7 @@ class ListController extends Controller
     public function attachments(Category $category): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($category);
 
         $count       = $collection->count();
@@ -112,7 +112,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -138,8 +138,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
 
         $paginator = $collector->getPaginatedGroups();

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getCategories();

app/Api/V1/Controllers/Models/ObjectGroup/ListController.php

@@ -77,7 +77,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
 
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getBills($objectGroup);
         $count      = $collection->count();
@@ -114,7 +114,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getPiggyBanks($objectGroup);

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

@@ -79,7 +79,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         $this->repository->resetOrder();
         $collection   = $this->repository->get();

app/Api/V1/Controllers/Models/PiggyBank/ListController.php

@@ -71,7 +71,7 @@ class ListController extends Controller
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($piggyBank);
 
         $count       = $collection->count();
@@ -105,7 +105,7 @@ class ListController extends Controller
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $manager  = $this->getManager();
 
         $collection = $this->repository->getEvents($piggyBank);

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

@@ -72,7 +72,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks();

app/Api/V1/Controllers/Models/Recurrence/ListController.php

@@ -77,7 +77,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -105,9 +105,13 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
         }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
+        }
+
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
         $transactions = $paginator->getCollection();

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->get();

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleRepository->getAll();

app/Api/V1/Controllers/Models/RuleGroup/ListController.php

@@ -75,7 +75,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleGroupRepository->getRules($group);

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

@@ -75,7 +75,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of rule groups. Count it and split it.
         $collection = $this->ruleGroupRepository->get();

app/Api/V1/Controllers/Models/Tag/ListController.php

@@ -80,7 +80,7 @@ class ListController extends Controller
     public function attachments(Tag $tag): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttachments($tag);
 
         $count       = $collection->count();
@@ -114,7 +114,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Tag $tag): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -139,8 +139,11 @@ class ListController extends Controller
             // set types of transactions to return.
             ->setTypes($types);
 
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.tags.transactions', [$tag->id]) . $this->buildParams());

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

@@ -76,7 +76,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->get();

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

@@ -78,7 +78,7 @@ class ListController extends Controller
     public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = new Collection();
         foreach ($transactionGroup->transactionJournals as $transactionJournal) {
             $collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection);
@@ -114,7 +114,7 @@ class ListController extends Controller
     {
         $manager    = $this->getManager();
         $collection = new Collection();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         foreach ($transactionGroup->transactionJournals as $transactionJournal) {
             $collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection);
         }
@@ -152,7 +152,7 @@ class ListController extends Controller
     {
         $manager      = $this->getManager();
         $collection   = $this->journalAPIRepository->getJournalLinks($transactionJournal);
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $count        = $collection->count();
         $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

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

@@ -58,7 +58,7 @@ class ShowController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -80,7 +80,7 @@ class ShowController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+        if (null !== $this->parameters->get('start') || null !== $this->parameters->get('end')) {
             $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();

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/DestroyController.php

@@ -27,8 +27,8 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Validator;

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

@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
@@ -65,26 +64,6 @@ class ListController extends Controller
     use AccountFilter;
     use TransactionFilter;
 
-    private CurrencyRepositoryInterface $repository;
-
-    /**
-     * CurrencyRepository constructor.
-     *
-
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
-
-                return $next($request);
-            }
-        );
-    }
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listAccountByCurrency
@@ -106,7 +85,7 @@ class ListController extends Controller
 
         // types to get, page size:
         $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         /** @var AccountRepositoryInterface $accountRepository */
@@ -153,7 +132,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of available budgets. Count it and split it.
         /** @var AvailableBudgetRepositoryInterface $abRepository */
@@ -193,7 +172,7 @@ class ListController extends Controller
 
         /** @var BillRepositoryInterface $billRepos */
         $billRepos  = app(BillRepositoryInterface::class);
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $unfiltered = $billRepos->getBills();
 
         // filter and paginate list:
@@ -236,7 +215,7 @@ class ListController extends Controller
         $blRepository = app(BudgetLimitRepositoryInterface::class);
 
         $manager      = $this->getManager();
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = $this->parameters->get('limit');
         $collection   = $blRepository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -268,7 +247,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         /** @var RecurringRepositoryInterface $recurringRepos */
@@ -319,7 +298,7 @@ class ListController extends Controller
     public function rules(TransactionCurrency $currency): JsonResponse
     {
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of budgets. Count it and split it.
         /** @var RuleRepositoryInterface $ruleRepos */
@@ -371,7 +350,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -396,8 +375,11 @@ class ListController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]) . $this->buildParams());

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

@@ -27,10 +27,11 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use JsonException;
@@ -78,16 +79,15 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAll();
         $count      = $collection->count();
+
         // slice them:
         $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator  = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
         $manager = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -113,10 +113,15 @@ class ShowController extends Controller
      */
     public function show(TransactionCurrency $currency): JsonResponse
     {
+        /** @var User $user */
+        $user            = auth()->user();
         $manager         = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
+        // update fields with user info.
+        $currency->refreshForUser($user);
+
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -138,9 +143,13 @@ class ShowController extends Controller
      */
     public function showDefault(): JsonResponse
     {
+        /** @var User $user */
+        $user     = auth()->user();
         $manager  = $this->getManager();
-        $currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $currency);
+        $currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+
+        // update fields with user info.
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -27,10 +27,11 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use JsonException;
 use League\Fractal\Resource\Item;
@@ -79,12 +80,14 @@ class StoreController extends Controller
     {
         $currency = $this->repository->store($request->getAll());
         if (true === $request->boolean('default')) {
-            app('preferences')->set('currencyPreference', $currency->code);
+            $this->repository->makeDefault($currency);
             app('preferences')->mark();
         }
         $manager = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var User $user */
+        $user = auth()->user();
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -28,10 +28,11 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use JsonException;
 use League\Fractal\Resource\Item;
@@ -82,11 +83,16 @@ class UpdateController extends Controller
         if ($this->repository->currencyInUse($currency)) {
             return response()->json([], 409);
         }
+        // must not be the only one in use:
+        if (1 === $this->repository->get()->count()) {
+            return response()->json([], 409);
+        }
+        /** @var User $user */
+        $user = auth()->user();
         $this->repository->disable($currency);
         $manager = $this->getManager();
 
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -110,14 +116,15 @@ class UpdateController extends Controller
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
     {
+        /** @var User $user */
+        $user = auth()->user();
         $this->repository->enable($currency);
+        $this->repository->makeDefault($currency);
 
-        app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
 
         $manager = $this->getManager();
-
-        $this->parameters->set('defaultCurrency', $currency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -144,9 +151,10 @@ class UpdateController extends Controller
     {
         $this->repository->enable($currency);
         $manager = $this->getManager();
+        /** @var User $user */
+        $user = auth()->user();
 
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
@@ -173,17 +181,22 @@ class UpdateController extends Controller
     public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse
     {
         $data = $request->getAll();
+
+        /** @var User $user */
+        $user = auth()->user();
+
+        // safety catch on currency disablement.
+        $set = $this->repository->get();
+        if (array_key_exists('enabled', $data) && false === $data['enabled'] && 1 === count($set) && $set->first()->id === $currency->id) {
+            return response()->json([], 409);
+
+        }
         $currency = $this->repository->update($currency, $data);
 
-        if (true === $request->boolean('default')) {
-            app('preferences')->set('currencyPreference', $currency->code);
         app('preferences')->mark();
-        }
 
         $manager = $this->getManager();
-
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $currency->refreshForUser($user);
 
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);

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

@@ -85,7 +85,7 @@ class ShowController extends Controller
         $name = $request->get('name');
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $linkType = $this->repository->findByName($name);
 
         // get list of transaction links. Count it and split it.

app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php

@@ -78,7 +78,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, LinkType $linkType): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -106,8 +106,11 @@ class ListController extends Controller
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
             ->setTypes($types);
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        if (null !== $this->parameters->get('start')) {
+            $collector->setStart($this->parameters->get('start'));
+        }
+        if (null !== $this->parameters->get('end')) {
+            $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());

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

@@ -78,7 +78,7 @@ class ShowController extends Controller
     {
         // create some objects:
         $manager  = $this->getManager();
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
 
         // get list of accounts. Count it and split it.
         $collection = $this->repository->get();

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

@@ -53,8 +53,7 @@ class TransactionController extends Controller
         $manager   = $this->getManager();
         $fullQuery = (string)$request->get('query');
         $page      = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
-        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $pageSize  = 0 === (int)$request->get('limit') ? $pageSize : (int)$request->get('limit');
+        $pageSize  = $this->parameters->get('limit');
         $searcher->parseQuery($fullQuery);
         $searcher->setPage($page);
         $searcher->setLimit($pageSize);

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

@@ -39,7 +39,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -190,7 +190,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('balance-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $sums[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -203,7 +203,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('spent-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $expenses[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -215,7 +215,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('earned-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $incomes[$currencyId] ?? '0',
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -236,6 +236,7 @@ class BasicController extends Controller
      */
     private function getBillInformation(Carbon $start, Carbon $end): array
     {
+        app('log')->debug(sprintf('Now in getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
         /*
          * 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.
@@ -253,7 +254,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('bills-paid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $info['id'],
+                'currency_id'             => (string)$info['id'],
                 'currency_code'           => $info['code'],
                 'currency_symbol'         => $info['symbol'],
                 'currency_decimal_places' => $info['decimal_places'],
@@ -272,7 +273,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $info['symbol']]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $info['id'],
+                'currency_id'             => (string)$info['id'],
                 'currency_code'           => $info['code'],
                 'currency_symbol'         => $info['symbol'],
                 'currency_decimal_places' => $info['decimal_places'],
@@ -281,7 +282,7 @@ class BasicController extends Controller
                 'sub_title'               => '',
             ];
         }
-
+        app('log')->debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
         return $return;
     }
 
@@ -302,7 +303,7 @@ class BasicController extends Controller
 
         foreach ($spent as $row) {
             // either an amount was budgeted or 0 is available.
-            $amount          = $available[$row['currency_id']] ?? '0';
+            $amount          = (string)($available[$row['currency_id']] ?? '0');
             $spentInCurrency = $row['sum'];
             $leftToSpend     = bcadd($amount, $spentInCurrency);
 
@@ -316,23 +317,18 @@ class BasicController extends Controller
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
                 'monetary_value'          => $leftToSpend,
-                'currency_id'             => $row['currency_id'],
+                'currency_id'             => (string)$row['currency_id'],
                 'currency_code'           => $row['currency_code'],
                 'currency_symbol'         => $row['currency_symbol'],
                 '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
                 ),
-                    ]
-                ),
             ];
         }
 
@@ -386,7 +382,7 @@ class BasicController extends Controller
                 'key'                     => sprintf('net-worth-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $currency->symbol]),
                 'monetary_value'          => $amount,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,

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

@@ -58,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/System/UserController.php

@@ -101,7 +101,7 @@ class UserController extends Controller
     public function index(): JsonResponse
     {
         // user preferences
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = $this->parameters->get('limit');
         $manager  = $this->getManager();
 
         // build collection

app/Api/V1/Controllers/User/PreferencesController.php

@@ -58,7 +58,7 @@ class PreferencesController extends Controller
         $collection  = app('preferences')->all();
         $manager     = $this->getManager();
         $count       = $collection->count();
-        $pageSize    = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize    = $this->parameters->get('limit');
         $preferences = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:

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

@@ -76,7 +76,7 @@ class AttemptController extends Controller
         }
 
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getAttempts($message);
         $count      = $collection->count();
         $attempts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

@@ -70,7 +70,7 @@ class MessageController extends Controller
     public function index(Webhook $webhook): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getMessages($webhook);
 
         $count    = $collection->count();

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

@@ -74,7 +74,7 @@ class ShowController extends Controller
     {
         $manager    = $this->getManager();
         $collection = $this->repository->all();
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = $this->parameters->get('limit');
         $count      = $collection->count();
         $webhooks   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

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

@@ -46,8 +46,6 @@ class AutocompleteRequest extends FormRequest
         if ('' !== $types) {
             $array = explode(',', $types);
         }
-        $limit = $this->convertInteger('limit');
-        $limit = 0 === $limit ? 10 : $limit;
 
         // remove 'initial balance' from allowed types. its internal
         $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
@@ -56,7 +54,6 @@ class AutocompleteRequest extends FormRequest
             'types' => $array,
             'query' => $this->convertString('query'),
             'date'  => $this->getCarbonDate('date'),
-            'limit' => $limit,
         ];
     }
 
@@ -66,7 +63,6 @@ class AutocompleteRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'limit' => 'min:0|max:1337',
         ];
     }
 }

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

@@ -174,7 +174,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         Log::debug('Collect rules of TransactionStoreRequest');
-
+        $validProtocols = config('firefly.valid_url_protocols');
         return [
             // basic fields for group:
             'group_title'                          => 'between:1,1000|nullable',
@@ -233,7 +233,7 @@ class StoreRequest extends FormRequest
             'transactions.*.external_id'           => 'min:1|max:255|nullable',
             'transactions.*.recurrence_id'         => 'min:1|max:255|nullable',
             'transactions.*.bunq_payment_id'       => 'min:1|max:255|nullable',
-            'transactions.*.external_url'          => 'min:1|max:255|nullable|url',
+            'transactions.*.external_url'          => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
 
             // SEPA fields:
             'transactions.*.sepa_cc'               => 'min:1|max:255|nullable',

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

@@ -321,7 +321,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-
+        $validProtocols = config('firefly.valid_url_protocols');
         return [
             // basic fields for group:
             'group_title'                           => 'between:1,1000|nullable',
@@ -375,7 +375,7 @@ class UpdateRequest extends FormRequest
             'transactions.*.external_id'            => 'min:1|max:255|nullable',
             'transactions.*.recurrence_id'          => 'min:1|max:255|nullable',
             'transactions.*.bunq_payment_id'        => 'min:1|max:255|nullable',
-            'transactions.*.external_url'           => 'min:1|max:255|nullable|url',
+            'transactions.*.external_url'           => sprintf('min:1|max:255|nullable|url:%s', $validProtocols),
 
             // SEPA fields:
             'transactions.*.sepa_cc'                => 'min:1|max:255|nullable',
@@ -417,15 +417,22 @@ class UpdateRequest extends FormRequest
                 // all transaction types must be equal:
                 $this->validateTransactionTypesForUpdate($validator);
 
+
+                // user wants to update a reconciled transaction.
+                // source, destination, amount + foreign_amount cannot be changed
+                // and must be omitted from the request.
+                $this->preventUpdateReconciled($validator, $transactionGroup);
+
                 // validate source/destination is equal, depending on the transaction journal type.
                 $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
 
-                // a catch when users submit splits with no source or destination info at all.
-                $this->preventNoAccountInfo($validator, );
+                // see method:
+                //$this->preventNoAccountInfo($validator, );
 
                 // validate that the currency fits the source and/or destination account.
                 // validate all account info
                 $this->validateAccountInformationUpdate($validator, $transactionGroup);
+
             }
         );
     }

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

@@ -57,7 +57,6 @@ class UpdateRequest extends FormRequest
         ];
 
         return $this->getAllData($fields);
-        //        return $return;
     }
 
     /**

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -74,14 +74,14 @@ class CreateRequest extends FormRequest
         $triggers       = implode(',', array_keys(Webhook::getTriggersForValidation()));
         $responses      = implode(',', array_keys(Webhook::getResponsesForValidation()));
         $deliveries     = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
-
+        $validProtocols = config('firefly.valid_url_protocols');
         return [
             'title'    => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
             'active'   => [new IsBoolean()],
             'trigger'  => sprintf('required|in:%s', $triggers),
             'response' => sprintf('required|in:%s', $responses),
             'delivery' => sprintf('required|in:%s', $deliveries),
-            'url'      => ['required', 'url', 'uniqueWebhook'],
+            'url'      => ['required', sprintf('url:%s', $validProtocols), 'uniqueWebhook'],
         ];
     }
 }

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

@@ -84,7 +84,7 @@ class UpdateRequest extends FormRequest
         $triggers       = implode(',', array_keys(Webhook::getTriggersForValidation()));
         $responses      = implode(',', array_keys(Webhook::getResponsesForValidation()));
         $deliveries     = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
-
+        $validProtocols = config('firefly.valid_url_protocols');
         /** @var Webhook $webhook */
         $webhook = $this->route()->parameter('webhook');
 
@@ -94,7 +94,7 @@ class UpdateRequest extends FormRequest
             'trigger'  => sprintf('in:%s', $triggers),
             'response' => sprintf('in:%s', $responses),
             'delivery' => sprintf('in:%s', $deliveries),
-            'url'      => ['url', sprintf('uniqueExistingWebhook:%d', $webhook->id)],
+            'url'      => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
         ];
     }
 }

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

@@ -30,10 +30,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use Illuminate\Http\JsonResponse;
-use JsonException;
 
 /**
  * Class AccountController
@@ -57,6 +56,11 @@ class AccountController extends Controller
                 $this->repository      = app(AccountRepositoryInterface::class);
                 $this->adminRepository = app(AdminAccountRepositoryInterface::class);
 
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->adminRepository->setUserGroup($userGroup);
+                }
+
                 return $next($request);
             }
         );
@@ -65,12 +69,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
+     * 4. Endpoint is documented.
+     * 5. Collector uses user_group_id
      *
      * @param AutocompleteRequest $request
      *
      * @return JsonResponse
-     * @throws JsonException
      * @throws FireflyException
      * @throws FireflyException
      */
@@ -79,13 +87,11 @@ class AccountController extends Controller
         $data            = $request->getData();
         $types           = $data['types'];
         $query           = $data['query'];
-        $date  = $data['date'] ?? today(config('app.timezone'));
-        $this->adminRepository->setAdministrationId($data['administration_id']);
-
-        $return          = [];
+        $date            = $this->parameters->get('date') ?? today(config('app.timezone'));
         $result          = $this->adminRepository->searchAccount((string)$query, $types, $data['limit']);
         $defaultCurrency = app('amount')->getDefaultCurrency();
 
+        $allItems = [];
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;
@@ -95,13 +101,19 @@ class AccountController extends Controller
                 $balance         = app('steam')->balance($account, $date);
                 $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
             }
-
-            $return[] = [
+            $type                 = (string)trans(sprintf('firefly.%s', $account->accountType->type));
+            $groupedResult[$type] = $groupedResult[$type] ?? [
+                'group ' => $type,
+                'items'  => [],
+            ];
+            $allItems[]           = [
                 'id'                      => (string)$account->id,
+                'value'                   => (string)$account->id,
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
+                'label'                   => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -109,10 +121,9 @@ class AccountController extends Controller
             ];
         }
 
-        // custom order.
         usort(
-            $return,
-            function ($a, $b) {
+            $allItems,
+            function (array $a, array $b): int {
                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
                 $pos_a = array_search($a['type'], $order, true);
                 $pos_b = array_search($b['type'], $order, true);
@@ -120,7 +131,6 @@ class AccountController extends Controller
                 return $pos_a - $pos_b;
             }
         );
-
-        return response()->json($return);
+        return response()->json($allItems);
     }
 }

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

@@ -0,0 +1,94 @@
+<?php
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Autocomplete;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\UserGroups\Journal\JournalRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    private JournalRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(JournalRepositoryInterface::class);
+
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *  Documentation for this endpoint:
+     *  TODO list of checks
+     *  1. use dates from ParameterBag
+     *  2. Request validates dates
+     *  3. Request includes user_group_id
+     *  4. Endpoint is documented.
+     *  5. Collector uses user_group_id
+     *
+     *
+     * @return JsonResponse
+     */
+    public function transactionDescriptions(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+
+        // limit and unique
+        $filtered = $result->unique('description');
+        $array    = [];
+
+        /** @var TransactionJournal $journal */
+        foreach ($filtered as $journal) {
+            $array[] = [
+                'id'                   => (string)$journal->id,
+                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'name'                 => $journal->description,
+                'description'          => $journal->description,
+            ];
+        }
+
+        return response()->json($array);
+
+    }
+
+}

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

@@ -27,10 +27,13 @@ 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\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -40,7 +43,8 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class AccountController extends Controller
 {
-    use ConvertsExchangeRates;
+    use CleansChartData;
+    use ValidatesUserGroupTrait;
 
     private AccountRepositoryInterface $repository;
 
@@ -53,6 +57,10 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
 
                 return $next($request);
             }
@@ -63,24 +71,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 user_group_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 +105,6 @@ class AccountController extends Controller
             $frontPage->data = $defaultSet;
             $frontPage->save();
         }
-
         /** @var Account $account */
         foreach ($accounts as $account) {
             $currency = $this->repository->getAccountCurrency($account);
@@ -98,38 +113,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'               => (string)$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,262 @@
+<?php
+
+
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+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\UserGroups\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 user_group_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'             => (string)$defaultCurrencyId,
+            'currency_symbol'         => $default->symbol,
+            'currency_code'           => $default->code,
+            'currency_name'           => $default->name,
+            'currency_decimal_places' => (int)$default->decimal_places,
+            'native_id'               => (string)$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'             => (string)$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'               => (string)$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'             => (string)$currency['currency_id'],
+                'currency_symbol'         => $currency['currency_symbol'],
+                'currency_code'           => $currency['currency_code'],
+                'currency_decimal_places' => $currency['currency_decimal_places'],
+                'native_id'               => (string)$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'             => (string)$currency['currency_id'],
+                'currency_symbol'         => $currency['currency_symbol'],
+                'currency_code'           => $currency['currency_code'],
+                'currency_decimal_places' => $currency['currency_decimal_places'],
+                'native_id'               => (string)$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,315 @@
+<?php
+
+
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+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\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    use CleansChartData;
+    use ValidatesUserGroupTrait;
+
+    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();
+
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                    $this->opsRepository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param DateRequest $request
+     *
+     * TODO see autocomplete/accountcontroller
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function dashboard(DateRequest $request): JsonResponse
+    {
+        $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'             => (string)$row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_name'           => $row['currency_name'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+                'native_id'               => (string)$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'             => (string)$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'               => (string)$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,144 @@
+<?php
+
+
+/*
+ * CategoryController.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\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\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BudgetController
+ */
+class CategoryController extends Controller
+{
+    use CleansChartData;
+    use ValidatesUserGroupTrait;
+
+    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);
+                $userGroup           = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->accountRepos->setUserGroup($userGroup);
+                }
+                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'             => (string)$currency->id,
+                'currency_code'           => $currency->code,
+                'currency_name'           => $currency->name,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => (int)$currency->decimal_places,
+                'native_id'               => (string)$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

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V2\Controllers;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\AbstractTransformer;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -48,8 +49,9 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  */
 class Controller extends BaseController
 {
+    use ValidatesUserGroupTrait;
+
     protected const CONTENT_TYPE = 'application/vnd.api+json';
-    protected int          $pageSize;
     protected ParameterBag $parameters;
 
     /**
@@ -57,11 +59,14 @@ class Controller extends BaseController
      */
     public function __construct()
     {
+        $this->middleware(
+            function ($request, $next) {
                 $this->parameters = $this->getParameters();
-        $this->pageSize   = 50;
-        if (auth()->check()) {
-            $this->pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+                return $next($request);
             }
+        );
+
     }
 
     /**
@@ -73,6 +78,7 @@ class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag = new ParameterBag();
+        $bag->set('limit', 50);
         try {
             $page = (int)request()->get('page');
         } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
@@ -93,21 +99,26 @@ class Controller extends BaseController
         // 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());
-                $value = null;
+                Log::error($e->getTraceAsString());
             }
-            $obj = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse($date);
+                    $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);
         }
@@ -124,6 +135,11 @@ class Controller extends BaseController
             if (null !== $value) {
                 $bag->set($integer, (int)$value);
             }
+            if (null === $value && 'limit' === $integer && auth()->check()) {
+                // set default for user:
+                $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+                $bag->set($integer, $pageSize);
+            }
         }
 
         // sort fields:
@@ -148,7 +164,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);
@@ -166,7 +182,7 @@ class Controller extends BaseController
      *
      * @return array
      */
-    final protected function jsonApiObject(string $key, Model $object, AbstractTransformer $transformer): array
+    final protected function jsonApiObject(string $key, array | Model $object, AbstractTransformer $transformer): array
     {
         // create some objects:
         $manager = new Manager();

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

@@ -31,6 +31,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 /**
+ * Show = show a single account.
+ * Index = show all accounts
  * Class ShowController
  */
 class ShowController extends Controller

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

@@ -0,0 +1,87 @@
+<?php
+
+
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Model\Bill;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\BillTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class IndexController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    private BillRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+
+                // new way of user group validation
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                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    = $this->parameters->get('limit');
+        $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/ShowController.php

@@ -0,0 +1,77 @@
+<?php
+
+
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Model\Bill;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\BillTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    private BillRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+
+                // new way of user group validation
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO this endpoint is not documented
+     */
+    public function show(Request $request, Bill $bill): JsonResponse
+    {
+        $transformer = new BillTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('subscriptions', $bill, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -26,8 +26,8 @@ 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\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -35,7 +35,7 @@ use Illuminate\Http\JsonResponse;
  */
 class SumController extends Controller
 {
-    use ConvertsExchangeRates;
+    use ValidatesUserGroupTrait;
 
     private BillRepositoryInterface $repository;
 
@@ -49,6 +49,12 @@ class SumController extends Controller
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
 
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+
                 return $next($request);
             }
         );
@@ -58,35 +64,35 @@ 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);
+        $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);
+        $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

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Transformers\V2\BudgetTransformer;
 use Illuminate\Http\JsonResponse;
@@ -60,11 +61,13 @@ class ListController extends Controller
      */
     public function index(Request $request): JsonResponse
     {
+        echo 'this needs move to Administration';
+        throw new FireflyException('Needs migration to IndexController');
         $collection = $this->repository->getActiveBudgets();
         $total      = $collection->count();
-        $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);
+        $collection->slice($this->pageXSize * $this->parameters->get('page'), $this->pXageSize);
 
-        $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
+        $paginator   = new LengthAwarePaginator($collection, $total, $this->pagXeSize, $this->parameters->get('page'));
         $transformer = new BudgetTransformer();
 
         return response()

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

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
@@ -34,6 +35,7 @@ use Illuminate\Http\JsonResponse;
 
 /**
  * Class ShowController
+ * TODO lots of deprecated code here.
  */
 class ShowController extends Controller
 {
@@ -44,7 +46,8 @@ class ShowController extends Controller
     /**
      *
      */
-    public function __construct() {
+    public function __construct()
+    {
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
@@ -60,7 +63,9 @@ class ShowController extends Controller
      * TODO add URL
      *
      */
-    public function budgeted(DateRequest $request, Budget $budget): JsonResponse {
+    public function budgeted(DateRequest $request, Budget $budget): JsonResponse
+    {
+        throw new FireflyException('Needs refactoring, uses deprecated method.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -73,7 +78,9 @@ class ShowController extends Controller
      * TODO add URL
      *
      */
-    public function spent(DateRequest $request, Budget $budget): JsonResponse {
+    public function spent(DateRequest $request, Budget $budget): JsonResponse
+    {
+        throw new FireflyException('Needs refactoring, uses deprecated method.');
         $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

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
 use Illuminate\Http\JsonResponse;
@@ -64,6 +65,7 @@ class SumController extends Controller
      */
     public function budgeted(DateRequest $request): JsonResponse
     {
+        throw new FireflyException('Needs refactoring, uses deprecated method.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriod($data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -81,6 +83,7 @@ class SumController extends Controller
      */
     public function spent(DateRequest $request): JsonResponse
     {
+        throw new FireflyException('Needs refactoring, uses deprecated method.');
         $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

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\BudgetLimit;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Transformers\V2\BudgetLimitTransformer;
@@ -57,16 +58,18 @@ class ListController extends Controller
      */
     public function index(DateRequest $request, Budget $budget): JsonResponse
     {
+        throw new FireflyException('Needs refactoring, move to IndexController.');
+        $pageSize   = $this->parameters->get('limit');
         $dates      = $request->getAll();
         $collection = $this->repository->getBudgetLimits($budget, $dates['start'], $dates['end']);
         $total      = $collection->count();
-        $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);
+        $collection->slice($pageSize * $this->parameters->get('page'), $pageSize);
 
-        $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
+        $paginator   = new LengthAwarePaginator($collection, $total, $pageSize, $this->parameters->get('page'));
         $transformer = new BudgetLimitTransformer();
 
         return response()
-            ->api($this->jsonApiList('budget_limits', $paginator, $transformer))
+            ->api($this->jsonApiList('budget-limits', $paginator, $transformer))
             ->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V2/Controllers/Model/Currency/IndexController.php

@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * IndexController.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\Api\V2\Controllers\Model\Currency;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Transformers\V2\CurrencyTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class IndexController
+ */
+class IndexController extends Controller
+{
+    private CurrencyRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CurrencyRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO This endpoint is not yet documented.
+     *
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $bills       = $this->repository->getAll();
+        $pageSize    = $this->parameters->get('limit');
+        $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 CurrencyTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList('currencies', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,84 @@
+<?php
+
+
+/*
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Model\PiggyBank;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\PiggyBankTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class IndexController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    private PiggyBankRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(PiggyBankRepositoryInterface::class);
+
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                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    = $this->parameters->get('limit');
+        $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/Model/Transaction/StoreController.php

@@ -0,0 +1,128 @@
+<?php
+
+
+/*
+ * StoreController.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\Api\V2\Controllers\Model\Transaction;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Model\Transaction\StoreRequest;
+use FireflyIII\Events\StoredTransactionGroup;
+use FireflyIII\Exceptions\DuplicateTransactionException;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Rules\IsDuplicateTransaction;
+use FireflyIII\Transformers\V2\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private TransactionGroupRepositoryInterface $groupRepository;
+
+    /**
+     * TransactionController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO this method is practically the same as the V1 method and borrows as much code as possible.
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     * @throws ValidationException
+     */
+    public function post(StoreRequest $request): JsonResponse
+    {
+
+        app('log')->debug('Now in API v2 StoreController::store()');
+        $data               = $request->getAll();
+        $userGroup          = $request->getUserGroup();
+        $data['user_group'] = $userGroup;
+
+        // overrule user group and see where we end up.
+        // what happens when we refer to a budget that is not in this user group?
+
+        app('log')->channel('audit')->info('Store new transaction over API.', $data);
+
+        try {
+            $transactionGroup = $this->groupRepository->store($data);
+        } catch (DuplicateTransactionException $e) {
+            app('log')->warning('Caught a duplicate transaction. Return error message.');
+            $validator = Validator::make(
+                ['transactions' => [['description' => $e->getMessage()]]],
+                ['transactions.0.description' => new IsDuplicateTransaction()]
+            );
+            throw new ValidationException($validator, 0, $e);
+        } catch (FireflyException $e) {
+            app('log')->warning('Caught an exception. Return error message.');
+            app('log')->error($e->getMessage());
+            $message   = sprintf('Internal exception: %s', $e->getMessage());
+            $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
+            throw new ValidationException($validator, 0, $e);
+        }
+        app('preferences')->mark();
+        $applyRules   = $data['apply_rules'] ?? true;
+        $fireWebhooks = $data['fire_webhooks'] ?? true;
+        event(new StoredTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // filter on transaction group.
+            ->setTransactionGroup($transactionGroup);
+
+        $selectedGroup = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
+        }
+
+        $transformer = new TransactionGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('transactions', $selectedGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+
+}

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

@@ -0,0 +1,555 @@
+<?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\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BasicController
+ */
+class BasicController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    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) {
+                $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);
+
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->abRepository->setUserGroup($userGroup);
+                    $this->accountRepository->setUserGroup($userGroup);
+                    $this->billRepository->setUserGroup($userGroup);
+                    $this->budgetRepository->setUserGroup($userGroup);
+                    $this->opsRepository->setUserGroup($userGroup);
+                }
+
+                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  = $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    = [
+            'native' => '0',
+        ];
+        $expenses   = [
+            'native' => '0',
+        ];
+        $sums       = [
+            'native' => '0',
+        ];
+        $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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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'             => (string)$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
+    {
+        app('log')->debug('Now in getLeftToSpendInfo');
+        $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'             => (string)$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'             => (string)$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) {
+            app('log')->debug(sprintf('Processing spent array in currency #%d', $currencyId));
+            $currencyId  = (int)$currencyId;
+            $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) {
+                app('log')->debug(sprintf('Processing expenses in budget "%s".', $budget['name']));
+                /** @var array $journal */
+                foreach ($budget['transaction_journals'] as $journal) {
+                    $journalCurrencyId       = $journal['currency_id'];
+                    $currency                = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
+                    $currencies[$currencyId] = $currency;
+                    $amount                  = app('steam')->negative($journal['amount']);
+                    $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);
+                }
+                app('log')->debug(sprintf('Total spent in budget "%s" is %s', $budget['name'], $spent));
+            }
+
+            // 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            = $available[$currencyId]['native_amount'] ?? '0';
+            $left                    = bcadd($amount, $spent);
+            $leftNative              = bcadd($amountNative, $spentNative);
+            app('log')->debug(sprintf('Available amount is %s', $amount));
+            app('log')->debug(sprintf('Amount left is %s', $left));
+
+            // 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'             => (string)$row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_symbol'         => $row['currency_symbol'],
+                'currency_decimal_places' => (int)$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'             => (string)$row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_symbol'         => $row['currency_symbol'],
+                'currency_decimal_places' => (int)$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'             => (string)$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'             => (string)$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;
+    }
+}