Merge branch 'release/v6.0.25'

Signed-off-by: Maxco10 <mmagnani93@gmail.com>

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

@@ -79,16 +79,16 @@
         },
         {
             "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,178 +224,23 @@
             ],
             "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.22.0",
+            "version": "v3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
+                "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
-                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/113e09fea3d2306319ffaa2423fe3de768b28cff",
+                "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.3",
                 "composer/xdebug-handler": "^3.0.3",
-                "doctrine/annotations": "^2",
-                "doctrine/lexer": "^2 || ^3",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^7.4 || ^8.0",
@@ -464,7 +309,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.22.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.28.0"
             },
             "funding": [
                 {
@@ -472,56 +317,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-16T23:08:06+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-09-22T20:43:40+00:00"
         },
         {
             "name": "psr/container",
@@ -745,16 +541,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.2",
+            "version": "v6.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898"
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/aa5d64ad3f63f2e48964fc81ee45cb318a723898",
-                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898",
+                "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
+                "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
                 "shasum": ""
             },
             "require": {
@@ -815,7 +611,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.2"
+                "source": "https://github.com/symfony/console/tree/v6.3.4"
             },
             "funding": [
                 {
@@ -831,7 +627,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-19T20:17:28+00:00"
+            "time": "2023-08-16T10:10:12+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1252,16 +1048,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": {
@@ -1276,7 +1072,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1314,7 +1110,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": [
                 {
@@ -1330,20 +1126,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": {
@@ -1355,7 +1151,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1395,7 +1191,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": [
                 {
@@ -1411,20 +1207,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": {
@@ -1436,7 +1232,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1479,7 +1275,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": [
                 {
@@ -1495,20 +1291,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": {
@@ -1523,7 +1319,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1562,7 +1358,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": [
                 {
@@ -1578,20 +1374,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": {
@@ -1600,7 +1396,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1645,7 +1441,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": [
                 {
@@ -1661,20 +1457,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": {
@@ -1683,7 +1479,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1724,7 +1520,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": [
                 {
@@ -1740,20 +1536,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.2",
+            "version": "v6.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d"
+                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
-                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54",
+                "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54",
                 "shasum": ""
             },
             "require": {
@@ -1785,7 +1581,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.2"
+                "source": "https://github.com/symfony/process/tree/v6.3.4"
             },
             "funding": [
                 {
@@ -1801,7 +1597,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-12T16:00:22+00:00"
+            "time": "2023-08-07T10:39:22+00:00"
         },
         {
             "name": "symfony/service-contracts",

.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

.htaccess

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

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

@@ -105,7 +105,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/Controller.php

@@ -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,6 +131,7 @@ 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) {
@@ -154,6 +156,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/Models/Transaction/ShowController.php

@@ -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/Summary/BasicController.php

@@ -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,
@@ -253,7 +253,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 +272,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'],
@@ -302,7 +302,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,7 +316,7 @@ 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'],
@@ -381,7 +381,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/V2/Controllers/Autocomplete/AccountController.php

@@ -30,7 +30,7 @@ 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;
 
@@ -67,9 +67,9 @@ class AccountController extends Controller
      * TODO list of checks
      * 1. use dates from ParameterBag
      * 2. Request validates dates
-     * 3. Request includes user_group_id as administration_id
+     * 3. Request includes user_group_id
      * 4. Endpoint is documented.
-     * 5. Collector uses administration_id
+     * 5. Collector uses user_group_id
      *
      * @param AutocompleteRequest $request
      *
@@ -79,6 +79,7 @@ class AccountController extends Controller
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
+        throw new FireflyException('uses old administration ID check, needs to be updated. 1');
         $data  = $request->getData();
         $types = $data['types'];
         $query = $data['query'];
@@ -104,7 +105,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/V2/Controllers/Chart/AccountController.php

@@ -31,8 +31,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+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;
@@ -43,6 +44,7 @@ use Psr\Container\NotFoundExceptionInterface;
 class AccountController extends Controller
 {
     use CleansChartData;
+    use ValidatesUserGroupTrait;
 
     private AccountRepositoryInterface $repository;
 
@@ -55,7 +57,11 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setAdministrationId(auth()->user()->user_group_id);
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
                 return $next($request);
             }
         );
@@ -70,7 +76,7 @@ class AccountController extends Controller
      * If a transaction has foreign currency = native currency, the foreign amount will be used, no conversion
      * will take place.
      *
-     * TODO validate and set administration_id from request
+     * TODO validate and set user_group_id from request
      *
      * @param DateRequest $request
      *
@@ -114,7 +120,7 @@ class AccountController extends Controller
                 'currency_decimal_places' => $currency->decimal_places,
 
                 // the default currency of the user (could be the same!)
-                'native_id'               => (int)$default->id,
+                'native_id'               => (string)$default->id,
                 'native_code'             => $default->code,
                 'native_symbol'           => $default->symbol,
                 'native_decimal_places'   => (int)$default->decimal_places,

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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * BalanceController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Chart;
 
 use Carbon\Carbon;
@@ -30,7 +32,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Http\JsonResponse;
@@ -69,7 +71,7 @@ class BalanceController extends Controller
      * If the transaction being processed is already in native currency OR if the
      * foreign amount is in the native currency, the amount will not be converted.
      *
-     * TODO validate and set administration_id
+     * TODO validate and set user_group_id
      * TODO collector set group, not user
      *
      * @param BalanceChartRequest $request
@@ -112,12 +114,12 @@ class BalanceController extends Controller
         // set array for default currency (even if unused later on)
         $defaultCurrencyId        = (int)$default->id;
         $data[$defaultCurrencyId] = [
-            'currency_id'             => $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'               => $defaultCurrencyId,
+            'native_id'               => (string)$defaultCurrencyId,
             'native_symbol'           => $default->symbol,
             'native_code'             => $default->code,
             'native_name'             => $default->name,
@@ -138,13 +140,13 @@ class BalanceController extends Controller
 
             // set the array with monetary info, if it does not exist.
             $data[$currencyId] = $data[$currencyId] ?? [
-                'currency_id'             => $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'               => (int)$default->id,
+                'native_id'               => (string)$default->id,
                 'native_code'             => $default->code,
                 'native_symbol'           => $default->symbol,
                 'native_decimal_places'   => (int)$default->decimal_places,
@@ -203,11 +205,11 @@ class BalanceController extends Controller
             // income and expense array prepped:
             $income  = [
                 'label'                   => 'earned',
-                'currency_id'             => $currency['currency_id'],
+                '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'               => $currency['native_id'],
+                'native_id'               => (string)$currency['native_id'],
                 'native_symbol'           => $currency['native_symbol'],
                 'native_code'             => $currency['native_code'],
                 'native_decimal_places'   => $currency['native_decimal_places'],
@@ -219,11 +221,11 @@ class BalanceController extends Controller
             ];
             $expense = [
                 'label'                   => 'spent',
-                'currency_id'             => $currency['currency_id'],
+                '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'               => $currency['native_id'],
+                'native_id'               => (string)$currency['native_id'],
                 'native_symbol'           => $currency['native_symbol'],
                 'native_code'             => $currency['native_code'],
                 'native_decimal_places'   => $currency['native_decimal_places'],

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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * BudgetController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Chart;
 
 use Carbon\Carbon;
@@ -30,11 +32,12 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Administration\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Administration\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
@@ -45,6 +48,7 @@ use Illuminate\Support\Collection;
 class BudgetController extends Controller
 {
     use CleansChartData;
+    use ValidatesUserGroupTrait;
 
     protected OperationsRepositoryInterface $opsRepository;
     private BudgetLimitRepositoryInterface  $blRepository;
@@ -61,6 +65,13 @@ class BudgetController extends Controller
                 $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);
             }
         );
@@ -76,14 +87,6 @@ class BudgetController extends Controller
      */
     public function dashboard(DateRequest $request): JsonResponse
     {
-        // get user.
-        /** @var User $user */
-        $user = auth()->user();
-        // group ID
-        $administrationId = $user->getAdministrationId();
-        $this->repository->setAdministrationId($administrationId);
-        $this->opsRepository->setAdministrationId($administrationId);
-
         $params = $request->getAll();
         /** @var Carbon $start */
         $start = $params['start'];
@@ -128,11 +131,11 @@ class BudgetController extends Controller
         foreach ($rows as $row) {
             $current  = [
                 'label'                   => $budget->name,
-                'currency_id'             => $row['currency_id'],
+                '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'               => $row['native_id'],
+                'native_id'               => (string)$row['native_id'],
                 'native_code'             => $row['native_code'],
                 'native_name'             => $row['native_name'],
                 'native_decimal_places'   => $row['native_decimal_places'],
@@ -199,12 +202,12 @@ class BudgetController extends Controller
         foreach ($array as $currencyId => $block) {
             $this->currencies[$currencyId] = $this->currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
             $return[$currencyId]           = $return[$currencyId] ?? [
-                'currency_id'             => $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'               => (int)$this->currency->id,
+                'native_id'               => (string)$this->currency->id,
                 'native_code'             => $this->currency->code,
                 'native_name'             => $this->currency->name,
                 'native_symbol'           => $this->currency->symbol,

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

@@ -1,8 +1,8 @@
 <?php
 
-declare(strict_types=1);
+
 /*
- * BudgetController.php
+ * CategoryController.php
  * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Chart;
 
 use Carbon\Carbon;
@@ -30,10 +32,11 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -42,6 +45,7 @@ use Illuminate\Http\JsonResponse;
 class CategoryController extends Controller
 {
     use CleansChartData;
+    use ValidatesUserGroupTrait;
 
     private AccountRepositoryInterface  $accountRepos;
     private CurrencyRepositoryInterface $currencyRepos;
@@ -53,7 +57,10 @@ class CategoryController extends Controller
             function ($request, $next) {
                 $this->accountRepos  = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $this->accountRepos->setAdministrationId(auth()->user()->user_group_id);
+                $userGroup           = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->accountRepos->setUserGroup($userGroup);
+                }
                 return $next($request);
             }
         );
@@ -103,12 +110,12 @@ class CategoryController extends Controller
             // create arrays
             $return[$key] = $return[$key] ?? [
                 'label'                   => $categoryName,
-                'currency_id'             => (int)$currency->id,
+                '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'               => (int)$default->id,
+                'native_id'               => (string)$default->id,
                 'native_code'             => $default->code,
                 'native_name'             => $default->name,
                 'native_symbol'           => $default->symbol,

app/Api/V2/Controllers/Controller.php

@@ -99,6 +99,7 @@ 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());
             }
             if (null !== $date) {
                 try {
@@ -170,7 +171,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/Bill/ShowController.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ShowController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,10 +21,16 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Model\Bill;
 
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\Administration\Bill\BillRepositoryInterface;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\AccountTransformer;
 use FireflyIII\Transformers\V2\BillTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -35,6 +41,8 @@ use Illuminate\Pagination\LengthAwarePaginator;
  */
 class ShowController extends Controller
 {
+    use ValidatesUserGroupTrait;
+
     private BillRepositoryInterface $repository;
 
     public function __construct()
@@ -43,7 +51,13 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setAdministrationId(auth()->user()->user_group_id);
+
+                // new way of user group validation
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
                 return $next($request);
             }
         );
@@ -71,4 +85,17 @@ class ShowController extends Controller
             ->json($this->jsonApiList('subscriptions', $paginator, $transformer))
             ->header('Content-Type', self::CONTENT_TYPE);
     }
+
+    /**
+     * 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,7 +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\Administration\Bill\BillRepositoryInterface;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -63,6 +64,7 @@ class SumController extends Controller
      */
     public function paid(DateRequest $request): JsonResponse
     {
+        throw new FireflyException('uses old administration ID check, needs to be updated.6');
         $this->repository->setAdministrationId(auth()->user()->user_group_id);
         $result = $this->repository->sumPaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
 
@@ -82,6 +84,7 @@ class SumController extends Controller
      */
     public function unpaid(DateRequest $request): JsonResponse
     {
+        throw new FireflyException('uses old administration ID check, needs to be updated.7');
         $this->repository->setAdministrationId(auth()->user()->user_group_id);
         $result = $this->repository->sumUnpaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
 

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 Illuminate\Http\JsonResponse;
@@ -60,7 +61,7 @@ class ShowController extends Controller
      */
     public function budgeted(DateRequest $request, Budget $budget): JsonResponse
     {
-        die('deprecated use of thing.');
+        throw new FireflyException('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -75,7 +76,7 @@ class ShowController extends Controller
      */
     public function spent(DateRequest $request, Budget $budget): JsonResponse
     {
-        die('deprecated use of thing.');
+        throw new FireflyException('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));

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

@@ -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 Illuminate\Http\JsonResponse;
 
@@ -61,7 +62,7 @@ class SumController extends Controller
      */
     public function budgeted(DateRequest $request): JsonResponse
     {
-        die('deprecated use of thing.');
+        throw new FireflyException('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->budgetedInPeriod($data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));
@@ -79,7 +80,7 @@ class SumController extends Controller
      */
     public function spent(DateRequest $request): JsonResponse
     {
-        die('deprecated use of thing.');
+        throw new FireflyException('deprecated use of thing.');
         $data      = $request->getAll();
         $result    = $this->repository->spentInPeriod($data['start'], $data['end']);
         $converted = $this->cerSum(array_values($result));

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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * ShowController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,10 +21,14 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Model\PiggyBank;
 
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\Administration\PiggyBank\PiggyBankRepositoryInterface;
+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;
@@ -35,6 +39,8 @@ use Illuminate\Pagination\LengthAwarePaginator;
  */
 class ShowController extends Controller
 {
+    use ValidatesUserGroupTrait;
+
     private PiggyBankRepositoryInterface $repository;
 
     public function __construct()
@@ -43,7 +49,12 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(PiggyBankRepositoryInterface::class);
-                $this->repository->setAdministrationId(auth()->user()->user_group_id);
+
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
                 return $next($request);
             }
         );

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 Illuminate\Validation\ValidationException;
+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;
+
+/**
+ * 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

@@ -36,13 +36,14 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Administration\Bill\BillRepositoryInterface;
-use FireflyIII\Repositories\Administration\Budget\AvailableBudgetRepositoryInterface;
-use FireflyIII\Repositories\Administration\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Administration\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\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\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -51,6 +52,8 @@ use Illuminate\Http\JsonResponse;
  */
 class BasicController extends Controller
 {
+    use ValidatesUserGroupTrait;
+
     private AvailableBudgetRepositoryInterface $abRepository;
     private AccountRepositoryInterface         $accountRepository;
     private BillRepositoryInterface            $billRepository;
@@ -68,8 +71,6 @@ class BasicController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user                    = auth()->user();
                 $this->abRepository      = app(AvailableBudgetRepositoryInterface::class);
                 $this->accountRepository = app(AccountRepositoryInterface::class);
                 $this->billRepository    = app(BillRepositoryInterface::class);
@@ -77,12 +78,14 @@ class BasicController extends Controller
                 $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
                 $this->opsRepository     = app(OperationsRepositoryInterface::class);
 
-                $this->abRepository->setAdministrationId($user->user_group_id);
-                $this->accountRepository->setAdministrationId($user->user_group_id);
-                $this->billRepository->setAdministrationId($user->user_group_id);
-                $this->budgetRepository->setAdministrationId($user->user_group_id);
-                $this->currencyRepos->setUser($user);
-                $this->opsRepository->setAdministrationId($user->user_group_id);
+                $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);
             }
@@ -105,10 +108,6 @@ class BasicController extends Controller
         $end   = $this->parameters->get('end');
 
         // balance information:
-        $balanceData  = [];
-        $billData     = [];
-        $spentData    = [];
-        $netWorthData = [];
         $balanceData  = $this->getBalanceInformation($start, $end);
         $billData     = $this->getBillInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
@@ -127,9 +126,15 @@ class BasicController extends Controller
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
         // prep some arrays:
-        $incomes    = [];
-        $expenses   = [];
-        $sums       = [];
+        $incomes    = [
+            'native' => '0',
+        ];
+        $expenses   = [
+            'native' => '0',
+        ];
+        $sums       = [
+            'native' => '0',
+        ];
         $return     = [];
         $currencies = [];
         $converter  = new ExchangeRateConverter();
@@ -218,7 +223,7 @@ class BasicController extends Controller
         $return[] = [
             'key'                     => 'balance-in-native',
             'value'                   => $sums['native'],
-            'currency_id'             => $default->id,
+            'currency_id'             => (string)$default->id,
             'currency_code'           => $default->code,
             'currency_symbol'         => $default->symbol,
             'currency_decimal_places' => $default->decimal_places,
@@ -226,7 +231,7 @@ class BasicController extends Controller
         $return[] = [
             'key'                     => 'spent-in-native',
             'value'                   => $expenses['native'],
-            'currency_id'             => $default->id,
+            'currency_id'             => (string)$default->id,
             'currency_code'           => $default->code,
             'currency_symbol'         => $default->symbol,
             'currency_decimal_places' => $default->decimal_places,
@@ -234,7 +239,7 @@ class BasicController extends Controller
         $return[] = [
             'key'                     => 'earned-in-native',
             'value'                   => $incomes['native'],
-            'currency_id'             => $default->id,
+            'currency_id'             => (string)$default->id,
             'currency_code'           => $default->code,
             'currency_symbol'         => $default->symbol,
             'currency_decimal_places' => $default->decimal_places,
@@ -253,7 +258,7 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('balance-in-%s', $currency->code),
                 '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,
@@ -261,7 +266,7 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('spent-in-%s', $currency->code),
                 '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,
@@ -269,7 +274,7 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('earned-in-%s', $currency->code),
                 '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,
@@ -303,7 +308,7 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => sprintf('bills-paid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
-                'currency_id'             => $info['currency_id'],
+                'currency_id'             => (string)$info['currency_id'],
                 'currency_code'           => $info['currency_code'],
                 'currency_symbol'         => $info['currency_symbol'],
                 'currency_decimal_places' => $info['currency_decimal_places'],
@@ -311,7 +316,7 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => 'bills-paid-in-native',
                 'value'                   => $nativeAmount,
-                'currency_id'             => $info['native_id'],
+                'currency_id'             => (string)$info['native_id'],
                 'currency_code'           => $info['native_code'],
                 'currency_symbol'         => $info['native_symbol'],
                 'currency_decimal_places' => $info['native_decimal_places'],
@@ -327,7 +332,7 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
-                'currency_id'             => $info['currency_id'],
+                'currency_id'             => (string)$info['currency_id'],
                 'currency_code'           => $info['currency_code'],
                 'currency_symbol'         => $info['currency_symbol'],
                 'currency_decimal_places' => $info['currency_decimal_places'],
@@ -335,7 +340,7 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => 'bills-unpaid-in-native',
                 'value'                   => $nativeAmount,
-                'currency_id'             => $info['native_id'],
+                'currency_id'             => (string)$info['native_id'],
                 'currency_code'           => $info['native_code'],
                 'currency_symbol'         => $info['native_symbol'],
                 'currency_decimal_places' => $info['native_decimal_places'],
@@ -354,6 +359,7 @@ class BasicController extends Controller
      */
     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);
@@ -367,7 +373,7 @@ class BasicController extends Controller
         $nativeLeft   = [
             'key'                     => 'left-to-spend-in-native',
             'value'                   => '0',
-            'currency_id'             => (int)$default->id,
+            'currency_id'             => (string)$default->id,
             'currency_code'           => $default->code,
             'currency_symbol'         => $default->symbol,
             'currency_decimal_places' => (int)$default->decimal_places,
@@ -375,7 +381,7 @@ class BasicController extends Controller
         $nativePerDay = [
             'key'                     => 'left-per-day-to-spend-in-native',
             'value'                   => '0',
-            'currency_id'             => (int)$default->id,
+            'currency_id'             => (string)$default->id,
             'currency_code'           => $default->code,
             'currency_symbol'         => $default->symbol,
             'currency_decimal_places' => (int)$default->decimal_places,
@@ -386,17 +392,20 @@ class BasicController extends Controller
          * @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                  = bcmul($journal['amount'], '-1');
+                    $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'];
@@ -404,15 +413,18 @@ class BasicController extends Controller
                     $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            = $converter->convert($default, $currency, $start, $amount);
+            $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;
@@ -429,10 +441,10 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'value'                   => $left,
-                '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'],
+                'currency_decimal_places' => (int)$row['currency_decimal_places'],
             ];
             // left (native)
             $nativeLeft['value'] = $leftNative;
@@ -441,10 +453,10 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('left-per-day-to-spend-in-%s', $row['currency_code']),
                 'value'                   => $perDay,
-                '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'],
+                'currency_decimal_places' => (int)$row['currency_decimal_places'],
             ];
 
             // left per day (native)
@@ -495,7 +507,7 @@ class BasicController extends Controller
         $return[] = [
             'key'                     => 'net-worth-in-native',
             'value'                   => $netWorthSet['native']['balance'],
-            'currency_id'             => $netWorthSet['native']['currency_id'],
+            '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'],
@@ -507,7 +519,7 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('net-worth-in-%s', $data['currency_code']),
                 'value'                   => $data['balance'],
-                'currency_id'             => $data['currency_id'],
+                'currency_id'             => (string)$data['currency_id'],
                 'currency_code'           => $data['currency_code'],
                 'currency_symbol'         => $data['currency_symbol'],
                 'currency_decimal_places' => $data['currency_decimal_places'],

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

@@ -2,7 +2,7 @@
 
 /*
  * NetWorthController.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,10 +22,13 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers;
+namespace FireflyIII\Api\V2\Controllers\Summary;
 
+use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
 use FireflyIII\Helpers\Report\NetWorthInterface;
+use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -33,6 +36,9 @@ use Illuminate\Http\JsonResponse;
  */
 class NetWorthController extends Controller
 {
+    use ValidatesUserGroupTrait;
+    use ConvertsExchangeRates;
+
     private NetWorthInterface $netWorth;
 
     /**
@@ -44,7 +50,12 @@ class NetWorthController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->netWorth = app(NetWorthInterface::class);
-                $this->netWorth->setUser(auth()->user());
+
+                // new way of user group validation
+                $userGroup = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->netWorth->setUserGroup($userGroup);
+                }
 
                 return $next($request);
             }
@@ -61,7 +72,6 @@ class NetWorthController extends Controller
      */
     public function get(SingleDateRequest $request): JsonResponse
     {
-        die('deprecated use of thing.');
         $date      = $request->getDate();
         $result    = $this->netWorth->sumNetWorthByCurrency($date);
         $converted = $this->cerSum($result);

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

@@ -2,7 +2,7 @@
 
 /*
  * VersionUpdateController.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,9 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers;
+namespace FireflyIII\Api\V2\Controllers\System;
+
+use FireflyIII\Api\V2\Controllers\Controller;
 
 /**
  * Class VersionUpdateController

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

@@ -2,7 +2,7 @@
 
 /*
  * AccountController.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Transaction\List;
 
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Transaction\ListRequest;
+use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Support\Http\Api\TransactionFilter;

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

@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  * TransactionController.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,10 +19,12 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Controllers\Transaction\List;
 
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Transaction\ListRequest;
+use FireflyIII\Api\V2\Request\Model\Transaction\ListRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Transformers\V2\TransactionGroupTransformer;
 use Illuminate\Http\JsonResponse;

app/Api/V2/Controllers/Transaction/Sum/BillController.php

@@ -2,7 +2,7 @@
 
 /*
  * BillController.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V2/Controllers/UserGroup/DestroyController.php

@@ -0,0 +1,77 @@
+<?php
+
+
+/*
+ * DestroyController.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\UserGroup;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request   $request
+     * @param UserGroup $userGroup
+     *
+     * @return JsonResponse
+     */
+    public function destroy(Request $request, UserGroup $userGroup): JsonResponse
+    {
+        /** @var User $user */
+        $user = auth()->user();
+        // need owner role or system owner role to delete user group.
+        $access = $user->hasRoleInGroup($userGroup, UserRoleEnum::OWNER, false, true);
+        if (false === $access) {
+            throw new NotFoundHttpException();
+        }
+        $this->repository->destroy($userGroup);
+        return response()->json([], 204);
+    }
+}

app/Api/V2/Controllers/UserGroup/ShowController.php

@@ -0,0 +1,101 @@
+<?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\UserGroup;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\V2\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $collection = new Collection();
+        // if the user has the system owner role, get all. Otherwise, get only the users' groups.
+        if (!auth()->user()->hasRole('owner')) {
+            $collection = $this->repository->get();
+        }
+        if (auth()->user()->hasRole('owner')) {
+            $collection = $this->repository->getAll();
+        }
+        $count      = $collection->count();
+        $userGroups = $collection->slice(($this->parameters->get('page') - 1) * $this->pageSize, $this->pageSize);
+
+        $paginator   = new LengthAwarePaginator($userGroups, $count, $this->pageSize, $this->parameters->get('page'));
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList('user-groups', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * @param Request   $request
+     * @param UserGroup $userGroup
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, UserGroup $userGroup): JsonResponse
+    {
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('user-groups', $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Controllers/UserGroup/StoreController.php

@@ -0,0 +1,73 @@
+<?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\UserGroup;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\UserGroup\StoreRequest;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\V2\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $all         = $request->getAll();
+        $userGroup   = $this->repository->store($all);
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('user-groups', $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

app/Api/V2/Controllers/UserGroup/UpdateController.php

@@ -0,0 +1,96 @@
+<?php
+
+
+/*
+ * UpdateController.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\UserGroup;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\UserGroup\UpdateMembershipRequest;
+use FireflyIII\Api\V2\Request\UserGroup\UpdateRequest;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\V2\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    // basic update van group
+    // add user, add rights, remove user, remove rights.
+
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param UpdateRequest $request
+     * @param UserGroup     $userGroup
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse
+    {
+        $all         = $request->getAll();
+        $userGroup   = $this->repository->update($userGroup, $all);
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('user-groups', $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * @param UpdateMembershipRequest $request
+     * @param UserGroup               $userGroup
+     *
+     * @return JsonResponse
+     */
+    public function updateMembership(UpdateMembershipRequest $request, UserGroup $userGroup): JsonResponse
+    {
+        $all         = $request->getAll();
+        $userGroup   = $this->repository->updateMembership($userGroup, $all);
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('user-groups', $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -23,13 +23,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Autocomplete;
 
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\UserRole;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
-use FireflyIII\Validation\Administration\ValidatesAdministrationAccess;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
@@ -40,11 +38,10 @@ class AutocompleteRequest extends FormRequest
 {
     use ConvertsDataTypes;
     use ChecksLogin;
-    use ValidatesAdministrationAccess;
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
 
     /**
      * @return array
-     * @throws FireflyException
      */
     public function getData(): array
     {
@@ -62,11 +59,10 @@ class AutocompleteRequest extends FormRequest
         $user = auth()->user();
 
         return [
-            'types'             => $array,
-            'query'             => $this->convertString('query'),
-            'date'              => $this->getCarbonDate('date'),
-            'limit'             => $limit,
-            'administration_id' => (int)($this->get('administration_id', null) ?? $user->getAdministrationId()),
+            'types' => $array,
+            'query' => $this->convertString('query'),
+            'date'  => $this->getCarbonDate('date'),
+            'limit' => $limit,
         ];
     }
 
@@ -92,7 +88,7 @@ class AutocompleteRequest extends FormRequest
         $validator->after(
             function (Validator $validator) {
                 // validate if the account can access this administration
-                $this->validateAdministration($validator, [UserRole::CHANGE_TRANSACTIONS]);
+                $this->validateAdministration($validator, [UserRoleEnum::MANAGE_TRANSACTIONS]);
             }
         );
     }

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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * BalanceChartRequest.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,6 +21,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V2\Request\Chart;
 
 use FireflyIII\Support\Request\ChecksLogin;
@@ -28,6 +30,9 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
+/**
+ * Class BalanceChartRequest
+ */
 class BalanceChartRequest extends FormRequest
 {
     use ConvertsDataTypes;
@@ -42,7 +47,7 @@ class BalanceChartRequest extends FormRequest
     {
         return [
             'accounts' => $this->getAccountList(),
-            'period'   => $this->string('period'),
+            'period'   => $this->convertString('period'),
         ];
     }
 

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

@@ -2,7 +2,7 @@
 
 /*
  * ListRequest.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * Copyright (c) 2023 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Request\Transaction;
+namespace FireflyIII\Api\V2\Request\Model\Transaction;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Http\Api\TransactionFilter;

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -0,0 +1,317 @@
+<?php
+/*
+ * StoreRequest.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\Request\Model\Transaction;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Rules\BelongsUserGroup;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Support\NullArrayObject;
+use FireflyIII\Support\Request\AppendsLocationData;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\User;
+use FireflyIII\Validation\CurrencyValidation;
+use FireflyIII\Validation\GroupValidation;
+use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class StoreRequest
+ *
+ * TODO this class is basically the same as the v1 request. However, it does not accept
+ * TODO models, objects and references that are NOT part of the designated user group (aka administration).
+ * TODO this distinction is already made in the CheckLogin trait, where there is also a convenient function
+ * TODO to grab the current UserGroup. This code is slightly different from other v2 apis that use
+ * TODO the "administration_id", those will have to be updated later on.
+ */
+class StoreRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    use TransactionValidation;
+    use GroupValidation;
+    use CurrencyValidation;
+    use AppendsLocationData;
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+
+    /**
+     * Get all data.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        app('log')->debug('V2: Get all data in TransactionStoreRequest');
+
+        return [
+            'group_title'             => $this->convertString('group_title'),
+            'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
+            'apply_rules'             => $this->boolean('apply_rules', true),
+            'fire_webhooks'           => $this->boolean('fire_webhooks', true),
+            'transactions'            => $this->getTransactionData(),
+        ];
+        // TODO include location and ability to process it.
+    }
+
+    /**
+     * Get transaction data.
+     *
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        /**
+         * @var array $transaction
+         */
+        foreach ($this->get('transactions') as $transaction) {
+            $object   = new NullArrayObject($transaction);
+            $return[] = [
+                'type'  => $this->clearString($object['type'], false),
+                'date'  => $this->dateFromValue($object['date']),
+                'order' => $this->integerFromValue((string)$object['order']),
+
+                'currency_id'           => $this->integerFromValue((string)$object['currency_id']),
+                'currency_code'         => $this->clearString((string)$object['currency_code'], false),
+
+                // foreign currency info:
+                'foreign_currency_id'   => $this->integerFromValue((string)$object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string)$object['foreign_currency_code'], false),
+
+                // amount and foreign amount. Cannot be 0.
+                'amount'                => $this->clearString((string)$object['amount'], false),
+                'foreign_amount'        => $this->clearString((string)$object['foreign_amount'], false),
+
+                // description.
+                'description'           => $this->clearString($object['description'], false),
+
+                // source of transaction. If everything is null, assume cash account.
+                'source_id'             => $this->integerFromValue((string)$object['source_id']),
+                'source_name'           => $this->clearString((string)$object['source_name'], false),
+                'source_iban'           => $this->clearString((string)$object['source_iban'], false),
+                'source_number'         => $this->clearString((string)$object['source_number'], false),
+                'source_bic'            => $this->clearString((string)$object['source_bic'], false),
+
+                // destination of transaction. If everything is null, assume cash account.
+                'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
+                'destination_name'      => $this->clearString((string)$object['destination_name'], false),
+                'destination_iban'      => $this->clearString((string)$object['destination_iban'], false),
+                'destination_number'    => $this->clearString((string)$object['destination_number'], false),
+                'destination_bic'       => $this->clearString((string)$object['destination_bic'], false),
+
+                // budget info
+                'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
+                'budget_name'           => $this->clearString((string)$object['budget_name'], false),
+
+                // category info
+                'category_id'           => $this->integerFromValue((string)$object['category_id']),
+                'category_name'         => $this->clearString((string)$object['category_name'], false),
+
+                // journal bill reference. Optional. Will only work for withdrawals
+                'bill_id'               => $this->integerFromValue((string)$object['bill_id']),
+                'bill_name'             => $this->clearString((string)$object['bill_name'], false),
+
+                // piggy bank reference. Optional. Will only work for transfers
+                'piggy_bank_id'         => $this->integerFromValue((string)$object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string)$object['piggy_bank_name'], false),
+
+                // some other interesting properties
+                'reconciled'            => $this->convertBoolean((string)$object['reconciled']),
+                'notes'                 => $this->clearString((string)$object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
+
+                // all custom fields:
+                'internal_reference'    => $this->clearString((string)$object['internal_reference'], false),
+                'external_id'           => $this->clearString((string)$object['external_id'], false),
+                'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id'], false),
+                'external_url'          => $this->clearString((string)$object['external_url'], false),
+
+                'sepa_cc'       => $this->clearString((string)$object['sepa_cc'], false),
+                'sepa_ct_op'    => $this->clearString((string)$object['sepa_ct_op'], false),
+                'sepa_ct_id'    => $this->clearString((string)$object['sepa_ct_id'], false),
+                'sepa_db'       => $this->clearString((string)$object['sepa_db'], false),
+                'sepa_country'  => $this->clearString((string)$object['sepa_country'], false),
+                'sepa_ep'       => $this->clearString((string)$object['sepa_ep'], false),
+                'sepa_ci'       => $this->clearString((string)$object['sepa_ci'], false),
+                'sepa_batch_id' => $this->clearString((string)$object['sepa_batch_id'], false),
+                // custom date fields. Must be Carbon objects. Presence is optional.
+                'interest_date' => $this->dateFromValue($object['interest_date']),
+                'book_date'     => $this->dateFromValue($object['book_date']),
+                'process_date'  => $this->dateFromValue($object['process_date']),
+                'due_date'      => $this->dateFromValue($object['due_date']),
+                'payment_date'  => $this->dateFromValue($object['payment_date']),
+                'invoice_date'  => $this->dateFromValue($object['invoice_date']),
+
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        app('log')->debug('V2: Collect rules of TransactionStoreRequest');
+
+        // at this point the userGroup can't be NULL because the
+        // authorize() method will complain. Loudly.
+        /** @var UserGroup $userGroup */
+        $userGroup = $this->getUserGroup();
+
+        return [
+            // basic fields for group:
+            'group_title'                          => 'between:1,1000|nullable',
+            'error_if_duplicate_hash'              => [new IsBoolean()],
+            'apply_rules'                          => [new IsBoolean()],
+
+            // transaction rules (in array for splits):
+            'transactions.*.type'                  => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                  => ['required', new IsDateOrTime()],
+            'transactions.*.order'                 => 'numeric|min:0',
+
+            // currency info
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.currency_code'         => 'min:3|max:51|exists:transaction_currencies,code|nullable',
+            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id|nullable',
+            'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable',
+
+            // amount
+            'transactions.*.amount'                => 'required|numeric|gt:0',
+            'transactions.*.foreign_amount'        => 'numeric',
+
+            // description
+            'transactions.*.description'           => 'nullable|between:1,1000',
+
+            // source of transaction
+            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.source_iban'           => 'between:1,255|nullable|iban',
+            'transactions.*.source_number'         => 'between:1,255|nullable',
+            'transactions.*.source_bic'            => 'between:1,255|nullable|bic',
+
+            // destination of transaction
+            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.destination_name'      => 'between:1,255|nullable',
+            'transactions.*.destination_iban'      => 'between:1,255|nullable|iban',
+            'transactions.*.destination_number'    => 'between:1,255|nullable',
+            'transactions.*.destination_bic'       => 'between:1,255|nullable|bic',
+
+            // budget, category, bill and piggy
+            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUserGroup($userGroup)],
+            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUserGroup($userGroup), 'nullable'],
+            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.bill_id'               => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUserGroup($userGroup)],
+            'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.piggy_bank_id'         => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUserGroup($userGroup)],
+            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+
+            // other interesting fields
+            'transactions.*.reconciled'            => [new IsBoolean()],
+            'transactions.*.notes'                 => 'min:1|max:50000|nullable',
+            'transactions.*.tags'                  => 'between:0,255',
+
+            // meta info fields
+            'transactions.*.internal_reference'    => 'min:1|max:255|nullable',
+            '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',
+
+            // SEPA fields:
+            'transactions.*.sepa_cc'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_op'            => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ct_id'            => 'min:1|max:255|nullable',
+            'transactions.*.sepa_db'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_country'          => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ep'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_ci'               => 'min:1|max:255|nullable',
+            'transactions.*.sepa_batch_id'         => 'min:1|max:255|nullable',
+
+            // dates
+            'transactions.*.interest_date'         => 'date|nullable',
+            'transactions.*.book_date'             => 'date|nullable',
+            'transactions.*.process_date'          => 'date|nullable',
+            'transactions.*.due_date'              => 'date|nullable',
+            'transactions.*.payment_date'          => 'date|nullable',
+            'transactions.*.invoice_date'          => 'date|nullable',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        /** @var User $user */
+        $user = auth()->user();
+        /** @var UserGroup $userGroup */
+        $userGroup = $this->getUserGroup();
+        $validator->after(
+            function (Validator $validator) use ($user, $userGroup) {
+                // must be valid array.
+                $this->validateTransactionArray($validator); // does not need group validation.
+
+                // must submit at least one transaction.
+                app('log')->debug('Now going to validateOneTransaction');
+                $this->validateOneTransaction($validator);              // does not need group validation.
+                app('log')->debug('Now done with validateOneTransaction');
+
+                // all journals must have a description
+                $this->validateDescriptions($validator);                // does not need group validation.
+
+                // all transaction types must be equal:
+                $this->validateTransactionTypes($validator);            // does not need group validation.
+
+                // validate foreign currency info
+                $this->validateForeignCurrencyInformation($validator);  // does not need group validation.
+
+                // validate all account info
+                $this->validateAccountInformation($validator, $user, $userGroup);
+
+                // validate source/destination is equal, depending on the transaction journal type.
+                $this->validateEqualAccounts($validator);
+
+                // the group must have a description if > 1 journal.
+                $this->validateGroupDescription($validator);
+            }
+        );
+    }
+
+
+}

app/Api/V2/Request/UserGroup/StoreRequest.php

@@ -0,0 +1,61 @@
+<?php
+
+
+/*
+ * StoreRequest.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\Request\UserGroup;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class StoreRequest
+ */
+class StoreRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'title' => $this->convertString('title'),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'title' => 'unique:user_groups,title|required|min:2|max:255',
+        ];
+    }
+}

app/Api/V2/Request/UserGroup/UpdateMembershipRequest.php

@@ -0,0 +1,69 @@
+<?php
+
+
+/*
+ * StoreRequest.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\Request\UserGroup;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class StoreRequest
+ */
+class UpdateMembershipRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'id'    => $this->convertInteger('id'),
+            'email' => $this->convertString('email'),
+            'roles' => $this->get('roles') ?? [],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        $validRoles = [];
+        foreach (UserRoleEnum::cases() as $role) {
+            $validRoles[] = $role->value;
+        }
+        return [
+            'id'      => 'exists:users,id|required_without:email',
+            'email'   => 'exists:users,email|required_without:id',
+            'roles.*' => 'required|in:' . join(',', $validRoles),
+        ];
+    }
+}

app/Api/V2/Request/UserGroup/UpdateRequest.php

@@ -0,0 +1,64 @@
+<?php
+
+
+/*
+ * StoreRequest.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\Request\UserGroup;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class StoreRequest
+ */
+class UpdateRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    protected array $acceptedRoles = [UserRoleEnum::OWNER, UserRoleEnum::FULL];
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'title' => $this->convertString('title'),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        /** @var UserGroup $userGroup */
+        $userGroup = $this->route()->parameter('userGroup');
+        return [
+            'title' => sprintf('required|min:2|max:255|unique:user_groups,title,%d', $userGroup->id),
+        ];
+    }
+}

app/Console/Commands/Correction/CorrectAmounts.php

@@ -34,6 +34,7 @@ use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\RuleTrigger;
 use Illuminate\Console\Command;
+use ValueError;
 
 /**
  * Class ReportSkeleton
@@ -247,7 +248,16 @@ class CorrectAmounts extends Command
         /** @var RuleTrigger $item */
         foreach ($set as $item) {
             // basic check:
-            if (-1 === bccomp((string)$item->trigger_value, '0')) {
+            $check = 0;
+            try {
+                $check = bccomp((string)$item->trigger_value, '0');
+            } catch (ValueError $e) {
+                $this->friendlyError(sprintf('Rule #%d contained invalid %s-trigger "%s". The trigger has been removed, and the rule is disabled.', $item->rule_id, $item->trigger_type, $item->trigger_value));
+                $item->rule->active = false;
+                $item->rule->save();
+                $item->forceDelete();
+            }
+            if (-1 === $check) {
                 $fixed++;
                 $item->trigger_value = app('steam')->positive((string)$item->trigger_value);
                 $item->save();

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -82,6 +82,7 @@ class DeleteEmptyJournals extends Command
                     TransactionJournal::find((int)$row->transaction_journal_id)->delete();
                 } catch (QueryException $e) {
                     Log::info(sprintf('Could not delete journal: %s', $e->getMessage()));
+                    Log::error($e->getTraceAsString());
                 }
 
 
@@ -113,6 +114,7 @@ class DeleteEmptyJournals extends Command
                 TransactionJournal::find($entry->id)->delete();
             } catch (QueryException $e) {
                 Log::info(sprintf('Could not delete entry: %s', $e->getMessage()));
+                Log::error($e->getTraceAsString());
             }
 
 

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
@@ -85,7 +86,7 @@ class CreateGroupMemberships extends Command
             $userGroup = UserGroup::create(['title' => $user->email]);
         }
 
-        $userRole = UserRole::where('title', UserRole::OWNER)->first();
+        $userRole = UserRole::where('title', UserRoleEnum::OWNER->value)->first();
 
         if (null === $userRole) {
             throw new FireflyException('Firefly III could not find a user role. Please make sure all migrations have run.');

app/Console/Commands/Integrity/UpdateGroupInformation.php

@@ -126,7 +126,7 @@ class UpdateGroupInformation extends Command
             return;
         }
         if (0 !== $result) {
-            $this->friendlyPositive(sprintf('Moved %d %s objects to the correct group.', $result, str_replace('FireflyIII\\Models\\', '', $className)));
+            $this->friendlyPositive(sprintf('User #%d: Moved %d %s objects to the correct group.', $user->id, $result, str_replace('FireflyIII\\Models\\', '', $className)));
         }
     }
 }

app/Console/Commands/System/OutputVersion.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+
 /*
  * OutputVersion.php
  * Copyright (c) 2023 james@firefly-iii.org
@@ -21,25 +21,29 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\System;
 
 use Illuminate\Console\Command;
 
+/**
+ * Class OutputVersion
+ */
 class OutputVersion extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'firefly-iii:output-version';
-
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = 'Outputs the Firefly III version';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:output-version';
 
     /**
      * Execute the console command.

app/Enums/UserRoleEnum.php

@@ -29,12 +29,34 @@ namespace FireflyIII\Enums;
  */
 enum UserRoleEnum: string
 {
-    case CHANGE_PIGGY_BANKS  = 'change_piggies';
-    case CHANGE_REPETITIONS  = 'change_reps';
-    case CHANGE_RULES        = 'change_rules';
-    case CHANGE_TRANSACTIONS = 'change_tx';
-    case FULL                = 'full';
-    case OWNER               = 'owner';
-    case READ_ONLY           = 'ro';
-    case VIEW_REPORTS        = 'view_reports';
+    // most basic rights, cannot see other members, can see everything else.
+    case READ_ONLY = 'ro';
+
+    // required to even USE the group properly (in this order)
+    case MANAGE_TRANSACTIONS = 'mng_trx';
+
+    // required to edit, add or change categories/tags/object-groups
+    case MANAGE_META = 'mng_meta';
+
+    // manage other financial objects:
+    case MANAGE_BUDGETS       = 'mng_budgets';
+    case MANAGE_PIGGY_BANKS   = 'mng_piggies';
+    case MANAGE_REPETITIONS   = 'mng_reps';
+    case MANAGE_SUBSCRIPTIONS = 'mng_subscriptions';
+    case MANAGE_RULES         = 'mng_rules';
+    case MANAGE_RECURRING     = 'mng_recurring';
+    case MANAGE_WEBHOOKS      = 'mng_webhooks';
+    case MANAGE_CURRENCIES    = 'mng_currencies';
+
+    // view and generate reports
+    case VIEW_REPORTS = 'view_reports';
+
+    // view memberships. needs FULL to manage them.
+    case VIEW_MEMBERSHIPS = 'view_memberships';
+
+    // everything the creator can, except remove/change original creator and delete group
+    case FULL = 'full';
+
+    // reserved for original creator
+    case OWNER = 'owner';
 }

app/Events/Model/PiggyBank/ChangedAmount.php

@@ -22,8 +22,9 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Events;
+namespace FireflyIII\Events\Model\PiggyBank;
 
+use FireflyIII\Events\Event;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
@@ -31,9 +32,9 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
 /**
- * Class ChangedPiggyBankAmount
+ * Class ChangedAmount
  */
-class ChangedPiggyBankAmount extends Event
+class ChangedAmount extends Event
 {
     use SerializesModels;
 

app/Events/Model/Rule/RuleActionFailedOnArray.php

@@ -0,0 +1,54 @@
+<?php
+
+
+/*
+ * RuleActionFailedOnArray.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\Events\Model\Rule;
+
+use FireflyIII\Models\RuleAction;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class RuleActionFailedOnArray
+ */
+class RuleActionFailedOnArray
+{
+    use SerializesModels;
+
+    public string     $error;
+    public array      $journal;
+    public RuleAction $ruleAction;
+
+    /**
+     * @param RuleAction $ruleAction
+     * @param array      $journal
+     * @param string     $error
+     */
+    public function __construct(RuleAction $ruleAction, array $journal, string $error)
+    {
+        app('log')->debug('Created new RuleActionFailedOnArray');
+        $this->ruleAction = $ruleAction;
+        $this->journal    = $journal;
+        $this->error      = $error;
+    }
+}

app/Events/Model/Rule/RuleActionFailedOnObject.php

@@ -0,0 +1,55 @@
+<?php
+
+
+/*
+ * RuleActionFailedOnObject.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\Events\Model\Rule;
+
+use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class RuleActionFailedOnObject
+ */
+class RuleActionFailedOnObject
+{
+    use SerializesModels;
+
+    public string             $error;
+    public TransactionJournal $journal;
+    public RuleAction         $ruleAction;
+
+    /**
+     * @param RuleAction         $ruleAction
+     * @param TransactionJournal $journal
+     * @param string             $error
+     */
+    public function __construct(RuleAction $ruleAction, TransactionJournal $journal, string $error)
+    {
+        app('log')->debug('Created new RuleActionFailedOnObject');
+        $this->ruleAction = $ruleAction;
+        $this->journal    = $journal;
+        $this->error      = $error;
+    }
+}

app/Factory/AccountFactory.php

@@ -218,6 +218,7 @@ class AccountFactory
         }
         // create account!
         $account = Account::create($databaseData);
+        Log::channel('audit')->info(sprintf('Account #%d ("%s") has been created.', $account->id, $account->name));
 
         // update meta data:
         $data = $this->cleanMetaDataArray($account, $data);
@@ -228,6 +229,7 @@ class AccountFactory
             $this->storeOpeningBalance($account, $data);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
         }
 
         // create credit liability data (only liabilities)
@@ -235,6 +237,7 @@ class AccountFactory
             $this->storeCreditLiability($account, $data);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
         }
 
         // create notes

app/Factory/AccountMetaFactory.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountMetaFactory

app/Factory/CategoryFactory.php

@@ -77,6 +77,7 @@ class CategoryFactory
                 );
             } catch (QueryException $e) {
                 Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
                 throw new FireflyException('400003: Could not store new category.', 0, $e);
             }
         }

app/Factory/RecurrenceFactory.php

@@ -130,6 +130,7 @@ class RecurrenceFactory
             $this->createTransactions($recurrence, $data['transactions'] ?? []);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             $recurrence->forceDelete();
             $message = sprintf('Could not create recurring transaction: %s', $e->getMessage());
             $this->errors->add('store', $message);

app/Factory/TransactionCurrencyFactory.php

@@ -69,6 +69,7 @@ class TransactionCurrencyFactory
         } catch (QueryException $e) {
             $result = null;
             Log::error(sprintf('Could not create new currency: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             throw new FireflyException('400004: Could not store new currency.', 0, $e);
         }
 

app/Factory/TransactionFactory.php

@@ -110,7 +110,7 @@ class TransactionFactory
             Log::error(sprintf('Could not create transaction: %s', $e->getMessage()), $data);
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
-            throw new FireflyException('Query exception when creating transaction.', 0, $e);
+            throw new FireflyException(sprintf('Query exception when creating transaction: %s', $e->getMessage()), 0, $e);
         }
         if (null === $result) {
             throw new FireflyException('Transaction is NULL.');

app/Factory/TransactionGroupFactory.php

@@ -81,7 +81,7 @@ class TransactionGroupFactory
 
         $group = new TransactionGroup();
         $group->user()->associate($this->user);
-        $group->userGroup()->associate($this->user->userGroup);
+        $group->userGroup()->associate($data['user_group'] ?? $this->user->userGroup);
         $group->title = $title;
         $group->save();
 

app/Factory/UserGroupFactory.php

@@ -0,0 +1,66 @@
+<?php
+
+
+/*
+ * UserGroupFactory.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\Factory;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\GroupMembership;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Models\UserRole;
+
+/**
+ * Class UserGroupFactory
+ */
+class UserGroupFactory
+{
+    /**
+     * @param array $data
+     *
+     * @return UserGroup
+     * @throws FireflyException
+     */
+    public function create(array $data): UserGroup
+    {
+        $userGroup        = new UserGroup();
+        $userGroup->title = $data['title'];
+        $userGroup->save();
+
+        // grab the OWNER role:
+        $role = UserRole::whereTitle(UserRoleEnum::OWNER->value)->first();
+        if (null === $role) {
+            throw new FireflyException('Role "owner" does not exist.');
+        }
+        // make user member:
+        $groupMembership                = new GroupMembership();
+        $groupMembership->user_group_id = $userGroup->id;
+        $groupMembership->user_id       = $data['user']->id;
+        $groupMembership->user_role_id  = $role->id;
+        $groupMembership->save();
+
+        return $userGroup;
+    }
+
+}

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -75,6 +75,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
                 ->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.account.report: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = sprintf('Could not render report view: %s', $e->getMessage());
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Report/Category/MonthReportGenerator.php

@@ -77,6 +77,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
                 ->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.category.month: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = sprintf('Could not render report view: %s', $e->getMessage());
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -59,6 +59,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
             return view('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.default.month: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render report view.';
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -63,6 +63,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
             )->with('start', $this->start)->with('end', $this->end)->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.default.multi-year: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = sprintf('Could not render report view: %s', $e->getMessage());
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Report/Standard/YearReportGenerator.php

@@ -63,6 +63,7 @@ class YearReportGenerator implements ReportGeneratorInterface
             )->with('start', $this->start)->with('end', $this->end)->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.account.report: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render report view.';
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -71,6 +71,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
             )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render reports.tag.month: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = sprintf('Could not render report view: %s', $e->getMessage());
             throw new FireflyException($result, 0, $e);
         }

app/Generator/Webhook/StandardMessageGenerator.php

@@ -174,6 +174,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
                     Log::error(
                         sprintf('The transformer could not include the requested transaction group for webhook #%d: %s', $webhook->id, $e->getMessage())
                     );
+                    Log::error($e->getTraceAsString());
 
                     return;
                 }

app/Handlers/Events/AutomationHandler.php

@@ -48,18 +48,23 @@ class AutomationHandler
     public function reportJournals(RequestedReportOnJournals $event): void
     {
         Log::debug('In reportJournals.');
-        $sendReport = config('firefly.send_report_journals');
-        if (false === $sendReport) {
-            return;
-        }
-
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
         $user       = $repository->find($event->userId);
-        if (null === $user || 0 === $event->groups->count()) {
+        $sendReport = app('preferences')->getForUser($user, 'notification_transaction_creation', false)->data;
+
+        if (false === $sendReport) {
+            Log::debug('Not sending report, because config says so.');
             return;
         }
 
+
+        if (null === $user || 0 === $event->groups->count()) {
+            Log::debug('No transaction groups in event, nothing to email about.');
+            return;
+        }
+        Log::debug('Continue with message!');
+
         // transform groups into array:
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
@@ -83,5 +88,6 @@ class AutomationHandler
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
         }
+        Log::debug('If there is no error above this line, message was sent.');
     }
 }

app/Handlers/Events/Model/BudgetLimitHandler.php

@@ -63,18 +63,6 @@ class BudgetLimitHandler
     private function updateAvailableBudget(BudgetLimit $budgetLimit): void
     {
         Log::debug(sprintf('Now in updateAvailableBudget(#%d)', $budgetLimit->id));
-
-        // based on the view range of the user (month week quarter etc) the budget limit could
-        // either overlap multiple available budget periods or be contained in a single one.
-        // all have to be created or updated.
-        try {
-            $viewRange = app('preferences')->get('viewRange', '1M')->data;
-        } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
-            $viewRange = '1M';
-        }
-        $start  = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);
-        $end    = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);
-        $end    = app('navigation')->endOfPeriod($end, $viewRange);
         $budget = Budget::find($budgetLimit->budget_id);
         if (null === $budget) {
             Log::warning('Budget is null, probably deleted, find deleted version.');
@@ -94,8 +82,23 @@ class BudgetLimitHandler
             return;
         }
 
+        // based on the view range of the user (month week quarter etc) the budget limit could
+        // either overlap multiple available budget periods or be contained in a single one.
+        // all have to be created or updated.
+        try {
+            $viewRange = app('preferences')->getForUser($user, 'viewRange', '1M')->data;
+        } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
+            app('log')->error($e->getMessage());
+            $viewRange = '1M';
+        }
+
+        $start = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);
+        $end   = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);
+        $end   = app('navigation')->endOfPeriod($end, $viewRange);
+
         // limit period in total is:
         $limitPeriod = Period::make($start, $end, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());
+        app('log')->debug(sprintf('Limit period is from %s to %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
 
         // from the start until the end of the budget limit, need to loop!
         $current = clone $start;
@@ -166,7 +169,7 @@ class BudgetLimitHandler
                 $availableBudget->end_date->format('Y-m-d')
             )
         );
-        // have to recalc everything just in case.
+        // have to recalculate everything just in case.
         $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);
         Log::debug(sprintf('Found %d interesting budget limit(s).', $set->count()));
         /** @var BudgetLimit $budgetLimit */
@@ -186,15 +189,18 @@ class BudgetLimitHandler
                 precision : Precision::DAY(),
                 boundaries: Boundaries::EXCLUDE_NONE()
             );
-            // if both equal eachother, amount from this BL must be added to the AB
+            // if both equal each other, amount from this BL must be added to the AB
             if ($limitPeriod->equals($abPeriod)) {
+                app('log')->debug('This budget limit is equal to the available budget period.');
                 $newAmount = bcadd($newAmount, $budgetLimit->amount);
             }
-            // if budget limit period inside AB period, can be added in full.
+            // if budget limit period is inside AB period, it can be added in full.
             if (!$limitPeriod->equals($abPeriod) && $abPeriod->contains($limitPeriod)) {
+                app('log')->debug('This budget limit is smaller than the available budget period.');
                 $newAmount = bcadd($newAmount, $budgetLimit->amount);
             }
-            if (!$limitPeriod->equals($abPeriod) && $abPeriod->overlapsWith($limitPeriod)) {
+            if (!$limitPeriod->equals($abPeriod) && !$abPeriod->contains($limitPeriod) && $abPeriod->overlapsWith($limitPeriod)) {
+                app('log')->debug('This budget limit is something else entirely!');
                 $overlap = $abPeriod->overlap($limitPeriod);
                 if (null !== $overlap) {
                     $length    = $overlap->length();
@@ -209,7 +215,7 @@ class BudgetLimitHandler
             return;
         }
         Log::debug(sprintf('Concluded new amount for this AB must be %s', $newAmount));
-        $availableBudget->amount = $newAmount;
+        $availableBudget->amount = app('steam')->bcround($newAmount, $availableBudget->transactionCurrency->decimal_places);
         $availableBudget->save();
     }
 

app/Handlers/Events/Model/PiggyBankEventHandler.php

@@ -22,9 +22,9 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Handlers\Events;
+namespace FireflyIII\Handlers\Events\Model;
 
-use FireflyIII\Events\ChangedPiggyBankAmount;
+use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
 use FireflyIII\Models\PiggyBankEvent;
 use Illuminate\Support\Facades\Log;
 
@@ -34,11 +34,11 @@ use Illuminate\Support\Facades\Log;
 class PiggyBankEventHandler
 {
     /**
-     * @param ChangedPiggyBankAmount $event
+     * @param ChangedAmount $event
      *
      * @return void
      */
-    public function changePiggyAmount(ChangedPiggyBankAmount $event): void
+    public function changePiggyAmount(ChangedAmount $event): void
     {
         // find journal if group is present.
         $journal = $event->transactionJournal;

app/Handlers/Events/Model/RuleHandler.php

@@ -0,0 +1,97 @@
+<?php
+
+
+/*
+ * RuleHandler.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\Handlers\Events\Model;
+
+use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray;
+use FireflyIII\Events\Model\Rule\RuleActionFailedOnObject;
+use FireflyIII\Notifications\User\RuleActionFailed;
+use FireflyIII\Support\Facades\Preferences;
+use Illuminate\Support\Facades\Notification;
+
+/**
+ * Class RuleHandler
+ */
+class RuleHandler
+{
+    /**
+     * @param RuleActionFailedOnArray $event
+     *
+     * @return void
+     */
+    public function ruleActionFailedOnArray(RuleActionFailedOnArray $event): void
+    {
+        $ruleAction = $event->ruleAction;
+        $rule       = $ruleAction->rule;
+        $preference = Preferences::getForUser($rule->user, 'notification_rule_action_failures', true)->data;
+        if (false === $preference) {
+            return;
+        }
+        app('log')->debug('Now in ruleActionFailedOnArray');
+        $journal = $event->journal;
+        $error   = $event->error;
+        $user    = $ruleAction->rule->user;
+
+        $mainMessage = trans('rules.main_message', ['rule' => $rule->title, 'action' => $ruleAction->action_type, 'group' => $journal['transaction_group_id'], 'error' => $error]);
+        $groupTitle  = $journal['description'] ?? '';
+        $groupLink   = route('transactions.show', [$journal['transaction_group_id']]);
+        $ruleTitle   = $rule->title;
+        $ruleLink    = route('rules.edit', [$rule->id]);
+        $params      = [$mainMessage, $groupTitle, $groupLink, $ruleTitle, $ruleLink];
+
+
+        Notification::send($user, new RuleActionFailed($params));
+    }
+
+    /**
+     * @param RuleActionFailedOnObject $event
+     *
+     * @return void
+     */
+    public function ruleActionFailedOnObject(RuleActionFailedOnObject $event): void
+    {
+        $ruleAction = $event->ruleAction;
+        $rule       = $ruleAction->rule;
+        $preference = Preferences::getForUser($rule->user, 'notification_rule_action_failures', true)->data;
+        if (false === $preference) {
+            return;
+        }
+        app('log')->debug('Now in ruleActionFailedOnObject');
+        $journal = $event->journal;
+        $error   = $event->error;
+        $user    = $ruleAction->rule->user;
+
+        $mainMessage = trans('rules.main_message', ['rule' => $rule->title, 'action' => $ruleAction->action_type, 'group' => $journal->transaction_group_id, 'error' => $error]);
+        $groupTitle  = $journal->description ?? '';
+        $groupLink   = route('transactions.show', [$journal->transaction_group_id]);
+        $ruleTitle   = $rule->title;
+        $ruleLink    = route('rules.edit', [$rule->id]);
+        $params      = [$mainMessage, $groupTitle, $groupLink, $ruleTitle, $ruleLink];
+
+
+        Notification::send($user, new RuleActionFailed($params));
+    }
+
+}

app/Handlers/Events/UserEventHandler.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Handlers\Events;
 use Carbon\Carbon;
 use Database\Seeders\ExchangeRateSeeder;
 use Exception;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\Admin\InvitationCreated;
 use FireflyIII\Events\DetectedNewIPAddress;
@@ -144,7 +145,7 @@ class UserEventHandler
             }
         }
         /** @var UserRole|null $role */
-        $role = UserRole::where('title', UserRole::OWNER)->first();
+        $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first();
         if (null === $role) {
             throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
         }
@@ -275,6 +276,7 @@ class UserEventHandler
             Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $url));
         } catch (Exception $e) { // intentional generic exception
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             throw new FireflyException($e->getMessage(), 0, $e);
         }
     }
@@ -299,6 +301,7 @@ class UserEventHandler
             Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $url));
         } catch (Exception $e) { // intentional generic exception
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             throw new FireflyException($e->getMessage(), 0, $e);
         }
     }
@@ -342,6 +345,7 @@ class UserEventHandler
             Mail::to($invitee)->send(new InvitationMail($invitee, $admin, $url));
         } catch (Exception $e) { // intentional generic exception
             Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             throw new FireflyException($e->getMessage(), 0, $e);
         }
     }

app/Handlers/Events/VersionCheckEventHandler.php

@@ -57,7 +57,7 @@ class VersionCheckEventHandler
         $permission = app('fireflyconfig')->get('permission_update_check', -1);
         $value      = (int)$permission->data;
         if (1 !== $value) {
-            Log::info('Update check is not enabled.');
+            Log::debug('Update check is not enabled.');
             $this->warnToCheckForUpdates($event);
 
             return;

app/Handlers/Observer/AccountObserver.php

@@ -0,0 +1,58 @@
+<?php
+/*
+ * AccountObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Account;
+
+/**
+ * Class AccountObserver
+ */
+class AccountObserver
+{
+    /**
+     * Also delete related objects.
+     *
+     * @param Account $account
+     *
+     * @return void
+     */
+    public function deleting(Account $account): void
+    {
+        app('log')->debug('Observe "deleting" of an account.');
+        $account->accountMeta()->delete();
+        foreach ($account->piggyBanks()->get() as $piggy) {
+            $piggy->delete();
+        }
+        foreach ($account->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+        foreach ($account->transactions()->get() as $transaction) {
+            $transaction->delete();
+        }
+        $account->notes()->delete();
+        $account->locations()->delete();
+
+    }
+
+}

app/Handlers/Observer/AttachmentObserver.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * AttachmentObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Attachment;
+
+/**
+ * Class AttachmentObserver
+ */
+class AttachmentObserver
+{
+    public function deleting(Attachment $attachment): void
+    {
+        app('log')->debug('Observe "deleting" of an attachment.');
+        $attachment->notes()->delete();
+    }
+}

app/Handlers/Observer/BillObserver.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * BillObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Bill;
+
+/**
+ * Class BillObserver
+ */
+class BillObserver
+{
+    /**
+     * @param Bill $bill
+     *
+     * @return void
+     */
+    public function deleting(Bill $bill): void
+    {
+        app('log')->debug('Observe "deleting" of a bill.');
+        foreach ($bill->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+        $bill->notes()->delete();
+    }
+
+}

app/Handlers/Observer/BudgetObserver.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * BudgetObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Budget;
+
+/**
+ * Class BudgetObserver
+ */
+class BudgetObserver
+{
+    /**
+     * @param Budget $budget
+     *
+     * @return void
+     */
+    public function deleting(Budget $budget): void
+    {
+        app('log')->debug('Observe "deleting" of a budget.');
+        foreach ($budget->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+
+        $budget->budgetlimits()->delete();
+
+        $budget->notes()->delete();
+        $budget->autoBudgets()->delete();
+    }
+
+}

app/Handlers/Observer/CategoryObserver.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * CategoryObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Category;
+
+/**
+ * Class CategoryObserver
+ */
+class CategoryObserver
+{
+    /**
+     * @param Category $category
+     *
+     * @return void
+     */
+    public function deleting(Category $category): void
+    {
+        app('log')->debug('Observe "deleting" of a category.');
+        foreach ($category->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+        $category->notes()->delete();
+    }
+
+}

app/Handlers/Observer/PiggyBankObserver.php

@@ -0,0 +1,71 @@
+<?php
+/*
+ * PiggyBankObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankRepetition;
+
+/**
+ * Class PiggyBankObserver
+ */
+class PiggyBankObserver
+{
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return void
+     */
+    public function created(PiggyBank $piggyBank): void
+    {
+        app('log')->debug('Observe "created" of a piggy bank.');
+        $repetition = new PiggyBankRepetition();
+        $repetition->piggyBank()->associate($piggyBank);
+        $repetition->startdate     = $piggyBank->startdate;
+        $repetition->targetdate    = $piggyBank->targetdate;
+        $repetition->currentamount = 0;
+        $repetition->save();
+    }
+
+    /**
+     * Also delete related objects.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return void
+     */
+    public function deleting(PiggyBank $piggyBank): void
+    {
+        app('log')->debug('Observe "deleting" of a piggy bank.');
+
+        foreach ($piggyBank->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+
+        $piggyBank->piggyBankEvents()->delete();
+        $piggyBank->piggyBankRepetitions()->delete();
+
+        $piggyBank->notes()->delete();
+    }
+
+}

app/Handlers/Observer/RecurrenceObserver.php

@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * RecurrenceObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Recurrence;
+
+/**
+ * Class RecurrenceObserver
+ */
+class RecurrenceObserver
+{
+    /**
+     * @param Recurrence $recurrence
+     *
+     * @return void
+     */
+    public function deleting(Recurrence $recurrence): void
+    {
+        app('log')->debug('Observe "deleting" of a recurrence.');
+        foreach ($recurrence->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+
+        $recurrence->recurrenceRepetitions()->delete();
+        $recurrence->recurrenceMeta()->delete();
+        foreach ($recurrence->recurrenceTransactions()->get() as $transaction) {
+            $transaction->delete();
+        }
+        $recurrence->notes()->delete();
+
+    }
+
+}

app/Handlers/Observer/RecurrenceTransactionObserver.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * RecurrenceTransactionObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\RecurrenceTransaction;
+
+/**
+ * Class RecurrenceTransactionObserver
+ */
+class RecurrenceTransactionObserver
+{
+    /**
+     * @param RecurrenceTransaction $transaction
+     *
+     * @return void
+     */
+    public function deleting(RecurrenceTransaction $transaction): void
+    {
+        app('log')->debug('Observe "deleting" of a recurrence transaction.');
+        $transaction->recurrenceTransactionMeta()->delete();
+    }
+
+}

app/Handlers/Observer/RuleGroupObserver.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * RuleGroupObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\RuleGroup;
+
+/**
+ * Class RuleGroupObserver
+ */
+class RuleGroupObserver
+{
+    /**
+     * @param RuleGroup $ruleGroup
+     *
+     * @return void
+     */
+    public function deleting(RuleGroup $ruleGroup): void
+    {
+        app('log')->debug('Observe "deleting" of a rule group.');
+        foreach ($ruleGroup->rules()->get() as $rule) {
+            $rule->delete();
+        }
+
+    }
+
+}

app/Handlers/Observer/RuleObserver.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * RuleObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Rule;
+
+/**
+ * Class RuleObserver
+ */
+class RuleObserver
+{
+    /**
+     * @param Rule $rule
+     *
+     * @return void
+     */
+    public function deleting(Rule $rule): void
+    {
+        app('log')->debug('Observe "deleting" of a rule.');
+        $rule->ruleActions()->delete();
+        $rule->ruleTriggers()->delete();
+    }
+
+}

app/Handlers/Observer/TagObserver.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * TagObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Tag;
+
+/**
+ * Class TagObserver
+ */
+class TagObserver
+{
+    /**
+     * @param Tag $tag
+     *
+     * @return void
+     */
+    public function deleting(Tag $tag): void
+    {
+        app('log')->debug('Observe "deleting" of a tag.');
+
+        foreach ($tag->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+
+        $tag->locations()->delete();
+
+    }
+
+}

app/Handlers/Observer/TransactionGroupObserver.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * TransactionGroup.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\Handlers\Observer;
+
+use FireflyIII\Models\TransactionGroup;
+
+/**
+ * Class TransactionGroup
+ */
+class TransactionGroupObserver
+{
+    public function deleting(TransactionGroup $transactionGroup): void
+    {
+        app('log')->debug('Observe "deleting" of a transaction group.');
+        foreach ($transactionGroup->transactionJournals()->get() as $journal) {
+            $journal->delete();
+        }
+    }
+
+}

app/Handlers/Observer/TransactionJournalObserver.php

@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * TransactionJournalObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\TransactionJournal;
+
+/**
+ * Class TransactionJournalObserver
+ */
+class TransactionJournalObserver
+{
+    /**
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return void
+     */
+    public function deleting(TransactionJournal $transactionJournal): void
+    {
+        app('log')->debug('Observe "deleting" of a transaction journal.');
+
+        // to make sure the listener doesn't get back to use and loop
+        TransactionJournal::withoutEvents(function () use ($transactionJournal) {
+            foreach ($transactionJournal->transactions()->get() as $transaction) {
+                $transaction->delete();
+            }
+        });
+        foreach ($transactionJournal->attachments()->get() as $attachment) {
+            $attachment->delete();
+        }
+        $transactionJournal->locations()->delete();
+        $transactionJournal->sourceJournalLinks()->delete();
+        $transactionJournal->destJournalLinks()->delete();
+        $transactionJournal->auditLogEntries()->delete();
+    }
+
+}

app/Handlers/Observer/TransactionObserver.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * TransactionObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Transaction;
+
+/**
+ * Class TransactionObserver
+ */
+class TransactionObserver
+{
+    public function deleting(Transaction $transaction): void
+    {
+        app('log')->debug('Observe "deleting" of a transaction.');
+        $transaction?->transactionJournal?->delete();
+    }
+
+}

app/Handlers/Observer/WebhookMessageObserver.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * WebhookMessageObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\WebhookMessage;
+
+/**
+ * Class WebhookMessageObserver
+ */
+class WebhookMessageObserver
+{
+    /**
+     * @param WebhookMessage $webhookMessage
+     *
+     * @return void
+     */
+    public function deleting(WebhookMessage $webhookMessage): void
+    {
+        app('log')->debug('Observe "deleting" of a webhook message.');
+        $webhookMessage->webhookAttempts()->delete();
+    }
+}

app/Handlers/Observer/WebhookObserver.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * WebhookObserver.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\Handlers\Observer;
+
+use FireflyIII\Models\Webhook;
+
+/**
+ * Class WebhookObserver
+ */
+class WebhookObserver
+{
+    /**
+     * @param Webhook $webhook
+     *
+     * @return void
+     */
+    public function deleting(Webhook $webhook): void
+    {
+        app('log')->debug('Observe "deleting" of a webhook.');
+        foreach ($webhook->webhookMessages() as $message) {
+            $message->delete();
+        }
+    }
+
+}

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -819,22 +819,28 @@ trait TimeCollection
     /**
      * Set the start and end time of the results to return.
      *
-     * @param Carbon $start
-     * @param Carbon $end
+     * Can either or both be NULL
+     *
+     * @param Carbon|null $start
+     * @param Carbon|null $end
      *
      * @return GroupCollectorInterface
      */
-    public function setRange(Carbon $start, Carbon $end): GroupCollectorInterface
+    public function setRange(?Carbon $start, ?Carbon $end): GroupCollectorInterface
     {
-        if ($end < $start) {
+        if (null !== $start && null !== $end && $end < $start) {
             [$start, $end] = [$end, $start];
         }
         // always got to end of day / start of day for ranges.
-        $startStr = $start->format('Y-m-d 00:00:00');
-        $endStr   = $end->format('Y-m-d 23:59:59');
+        $startStr = $start?->format('Y-m-d 00:00:00');
+        $endStr   = $end?->format('Y-m-d 23:59:59');
 
-        $this->query->where('transaction_journals.date', '>=', $startStr);
-        $this->query->where('transaction_journals.date', '<=', $endStr);
+        if (null !== $start) {
+            $this->query->where('transaction_journals.date', '>=', $startStr);
+        }
+        if (null !== $end) {
+            $this->query->where('transaction_journals.date', '<=', $endStr);
+        }
 
         return $this;
     }

app/Helpers/Collector/GroupCollector.php

@@ -871,7 +871,7 @@ class GroupCollector implements GroupCollectorInterface
     public function setLimit(int $limit): GroupCollectorInterface
     {
         $this->limit = $limit;
-        app('log')->debug(sprintf('GroupCollector: The limit is now %d', $limit));
+        //app('log')->debug(sprintf('GroupCollector: The limit is now %d', $limit));
 
         return $this;
     }
@@ -976,7 +976,7 @@ class GroupCollector implements GroupCollectorInterface
     {
         $page       = 0 === $page ? 1 : $page;
         $this->page = $page;
-        app('log')->debug(sprintf('GroupCollector: page is now %d', $page));
+        //app('log')->debug(sprintf('GroupCollector: page is now %d', $page));
 
         return $this;
     }

app/Helpers/Report/NetWorth.php

@@ -29,8 +29,8 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\User;
@@ -39,6 +39,8 @@ use Illuminate\Support\Collection;
 use JsonException;
 
 /**
+ * This class can handle both request with and without a user group and will return the appropriate repository when
+ * necessary.
  *
  * Class NetWorth
  */
@@ -49,7 +51,7 @@ class NetWorth implements NetWorthInterface
 
     private CurrencyRepositoryInterface $currencyRepos;
     private User                        $user;
-    private UserGroup                   $userGroup;
+    private null | UserGroup            $userGroup;
 
     /**
      * @param Collection $accounts
@@ -67,7 +69,7 @@ class NetWorth implements NetWorthInterface
         $cache->addProperty('net-worth-by-accounts');
         $cache->addProperty($ids);
         if ($cache->has()) {
-            //return $cache->get();
+            return $cache->get();
         }
         app('log')->debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d')));
 
@@ -96,7 +98,7 @@ class NetWorth implements NetWorthInterface
         /** @var Account $account */
         foreach ($accounts as $account) {
             app('log')->debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
-            $currency      = $this->adminAccountRepository->getAccountCurrency($account);
+            $currency      = $this->getRepository()->getAccountCurrency($account);
             $currencyId    = (int)$currency->id;
             $balance       = '0';
             $nativeBalance = '0';
@@ -137,6 +139,17 @@ class NetWorth implements NetWorthInterface
         return $netWorth;
     }
 
+    /**
+     * @return AdminAccountRepositoryInterface|AccountRepositoryInterface
+     */
+    private function getRepository(): AdminAccountRepositoryInterface | AccountRepositoryInterface
+    {
+        if (null === $this->userGroup) {
+            return $this->accountRepository;
+        }
+        return $this->adminAccountRepository;
+    }
+
     /**
      * Returns the user's net worth in an array with the following layout:
      *
@@ -181,7 +194,7 @@ class NetWorth implements NetWorthInterface
         /** @var Account $account */
         foreach ($accounts as $account) {
             //            Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
-            $currencyId = (int)$this->accountRepository->getMetaValue($account, 'currency_id');
+            $currencyId = (int)$this->getRepository()->getMetaValue($account, 'currency_id');
             $currencyId = 0 === $currencyId ? $default->id : $currencyId;
 
             //            Log::debug(sprintf('Currency ID is #%d', $currencyId));
@@ -227,7 +240,8 @@ class NetWorth implements NetWorthInterface
         if (null === $user) {
             return;
         }
-        $this->user = $user;
+        $this->user      = $user;
+        $this->userGroup = null;
 
         // make repository:
         $this->accountRepository = app(AccountRepositoryInterface::class);
@@ -239,13 +253,12 @@ class NetWorth implements NetWorthInterface
 
     /**
      * @inheritDoc
-     * @throws FireflyException
      */
     public function setUserGroup(UserGroup $userGroup): void
     {
         $this->userGroup              = $userGroup;
         $this->adminAccountRepository = app(AdminAccountRepositoryInterface::class);
-        $this->adminAccountRepository->setAdministrationId($userGroup->id);
+        $this->adminAccountRepository->setUserGroup($userGroup);
     }
 
     /**
@@ -260,7 +273,7 @@ class NetWorth implements NetWorthInterface
         $return   = [];
         $balances = app('steam')->balancesByAccounts($accounts, $date);
         foreach ($accounts as $account) {
-            $currency = $this->accountRepository->getAccountCurrency($account);
+            $currency = $this->getRepository()->getAccountCurrency($account);
             $balance  = $balances[$account->id] ?? '0';
 
             // always subtract virtual balance.
@@ -288,13 +301,13 @@ class NetWorth implements NetWorthInterface
      */
     private function getAccounts(): Collection
     {
-        $accounts = $this->accountRepository->getAccountsByType(
+        $accounts = $this->getRepository()->getAccountsByType(
             [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]
         );
         $filtered = new Collection();
         /** @var Account $account */
         foreach ($accounts as $account) {
-            if (1 === (int)$this->accountRepository->getMetaValue($account, 'include_net_worth')) {
+            if (1 === (int)$this->getRepository()->getMetaValue($account, 'include_net_worth')) {
                 $filtered->push($account);
             }
         }

app/Http/Controllers/Admin/HomeController.php

@@ -27,6 +27,7 @@ use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Notifications\UrlValidator;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -99,7 +100,7 @@ class HomeController extends Controller
         if ('' === $url) {
             FireflyConfig::delete('slack_webhook_url');
         }
-        if (str_starts_with($url, 'https://hooks.slack.com/services/')) {
+        if (UrlValidator::isValidWebhookURL($url)) {
             FireflyConfig::set('slack_webhook_url', $url);
         }
 

app/Http/Controllers/Bill/IndexController.php

@@ -146,7 +146,7 @@ class IndexController extends Controller
     private function getSums(array $bills): array
     {
         $sums  = [];
-        $range = app('navigation')->getViewRange(false);
+        $range = app('navigation')->getViewRange(true);
 
         /** @var array $group */
         foreach ($bills as $groupOrder => $group) {
@@ -177,7 +177,6 @@ class IndexController extends Controller
                 $sums[$groupOrder][$currencyId]['per_period'] = bcadd($sums[$groupOrder][$currencyId]['per_period'], $this->amountPerPeriod($bill, $range));
             }
         }
-
         return $sums;
     }
 

app/Http/Controllers/Budget/IndexController.php

@@ -101,6 +101,7 @@ class IndexController extends Controller
      */
     public function index(Request $request, Carbon $start = null, Carbon $end = null)
     {
+        $this->abRepository->cleanup();
         Log::debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));
 
         // collect some basic vars:
@@ -226,6 +227,7 @@ class IndexController extends Controller
             Log::debug(sprintf('Working on budget #%d ("%s")', $current->id, $current->name));
             $array                = $current->toArray();
             $array['spent']       = [];
+            $array['spent_total'] = [];
             $array['budgeted']    = [];
             $array['attachments'] = $this->repository->getAttachments($current);
             $array['auto_budget'] = $this->repository->getAutoBudget($current);
@@ -234,9 +236,10 @@ class IndexController extends Controller
             foreach ($budgetLimits as $limit) {
                 Log::debug(sprintf('Working on budget limit #%d', $limit->id));
                 $currency            = $limit->transactionCurrency ?? $defaultCurrency;
+                $amount              = app('steam')->bcround($limit->amount, $currency->decimal_places);
                 $array['budgeted'][] = [
                     'id'                      => $limit->id,
-                    'amount'                  => app('steam')->bcround($limit->amount, $currency->decimal_places),
+                    'amount'                  => $amount,
                     'start_date'              => $limit->start_date->isoFormat($this->monthAndDayFormat),
                     'end_date'                => $limit->end_date->isoFormat($this->monthAndDayFormat),
                     'in_range'                => $limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end),
@@ -245,6 +248,7 @@ class IndexController extends Controller
                     'currency_name'           => $currency->name,
                     'currency_decimal_places' => $currency->decimal_places,
                 ];
+                Log::debug(sprintf('The amount budgeted for budget limit #%d is %s %s', $limit->id, $currency->code, $amount));
             }
 
             /** @var TransactionCurrency $currency */
@@ -337,6 +341,7 @@ class IndexController extends Controller
      */
     public function reorder(Request $request, BudgetRepositoryInterface $repository): JsonResponse
     {
+        $this->abRepository->cleanup();
         $budgetIds = $request->get('budgetIds');
 
         foreach ($budgetIds as $index => $budgetId) {

app/Http/Controllers/DebugController.php

@@ -28,7 +28,10 @@ use Exception;
 use FireflyConfig;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
+use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -37,6 +40,8 @@ use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use Monolog\Handler\RotatingFileHandler;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class DebugController
@@ -117,86 +122,9 @@ class DebugController extends Controller
      */
     public function index(Request $request)
     {
-        // basic scope information:
-        $now               = now(config('app.timezone'))->format('Y-m-d H:i:s e');
-        $buildNr           = '(unknown)';
-        $buildDate         = '(unknown)';
-        $baseBuildNr       = '(unknown)';
-        $baseBuildDate     = '(unknown)';
-        $expectedDBversion = config('firefly.db_version');
-        $foundDBversion    = FireflyConfig::get('db_version', 1)->data;
-        try {
-            if (file_exists('/var/www/counter-main.txt')) {
-                $buildNr = trim(file_get_contents('/var/www/counter-main.txt'));
-            }
-        } catch (Exception $e) { // generic catch for open basedir.
-            Log::debug('Could not check counter.');
-            Log::warning($e->getMessage());
-        }
-        try {
-            if (file_exists('/var/www/build-date-main.txt')) {
-                $buildDate = trim(file_get_contents('/var/www/build-date-main.txt'));
-            }
-        } catch (Exception $e) { // generic catch for open basedir.
-            Log::debug('Could not check date.');
-            Log::warning($e->getMessage());
-        }
-        if ('' !== (string)env('BASE_IMAGE_BUILD')) {
-            $baseBuildNr = env('BASE_IMAGE_BUILD');
-        }
-        if ('' !== (string)env('BASE_IMAGE_DATE')) {
-            $baseBuildDate = env('BASE_IMAGE_DATE');
-        }
-
-        $phpVersion = PHP_VERSION;
-        $phpOs      = PHP_OS;
-
-        // system information
-        $tz              = env('TZ');
-        $appEnv          = config('app.env');
-        $appDebug        = var_export(config('app.debug'), true);
-        $cacheDriver     = config('cache.default');
-        $logChannel      = config('logging.default');
-        $appLogLevel     = config('logging.level');
-        $maxFileSize     = app('steam')->phpBytes(ini_get('upload_max_filesize'));
-        $maxPostSize     = app('steam')->phpBytes(ini_get('post_max_size'));
-        $uploadSize      = min($maxFileSize, $maxPostSize);
-        $displayErrors   = ini_get('display_errors');
-        $errorReporting  = $this->errorReporting((int)ini_get('error_reporting'));
-        $interface       = PHP_SAPI;
-        $defaultLanguage = (string)config('firefly.default_language');
-        $defaultLocale   = (string)config('firefly.default_locale');
-        $bcscale         = bcscale();
-        $drivers         = implode(', ', DB::availableDrivers());
-        $currentDriver   = DB::getDriverName();
-        $trustedProxies  = config('firefly.trusted_proxies');
-
-        // user info
-        $loginProvider    = config('auth.providers.users.driver');
-        $userGuard        = config('auth.defaults.guard');
-        $remoteHeader     = $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A';
-        $remoteMailHeader = $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A';
-        $userLanguage     = app('steam')->getLanguage();
-        $userLocale       = app('steam')->getLocale();
-        $userAgent        = $request->header('user-agent');
-        $stateful         = join(', ', config('sanctum.stateful'));
-
-
-        // expected + found DB version:
-
-        // some new vars.
-        $isDocker = env('IS_DOCKER', false);
-
-        // set languages, see what happens:
-        $original       = setlocale(LC_ALL, 0);
-        $localeAttempts = [];
-        $parts          = app('steam')->getLocaleArray(app('steam')->getLocale());
-        foreach ($parts as $code) {
-            $code = trim($code);
-            Log::debug(sprintf('Trying to set %s', $code));
-            $localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true);
-        }
-        setlocale(LC_ALL, $original);
+        $table = $this->generateTable();
+        $table = str_replace(["\n", "\t", '  '], '', $table);
+        $now   = now(config('app.timezone'))->format('Y-m-d H:i:s');
 
         // get latest log file:
         $logger = Log::driver();
@@ -213,50 +141,190 @@ class DebugController extends Controller
         }
         if ('' !== $logContent) {
             // last few lines
-            $logContent = 'Truncated from this point <----|' . substr($logContent, -8192);
+            $logContent = 'Truncated from this point <----|' . substr($logContent, -16384);
         }
 
-        return view(
-            'debug',
-            compact(
-                'phpVersion',
-                'localeAttempts',
-                'expectedDBversion',
-                'foundDBversion',
-                'appEnv',
-                'appDebug',
-                'logChannel',
-                'stateful',
-                'tz',
-                'uploadSize',
-                'appLogLevel',
-                'remoteHeader',
-                'remoteMailHeader',
-                'now',
-                'drivers',
-                'currentDriver',
-                'userGuard',
-                'loginProvider',
-                'buildNr',
-                'buildDate',
-                'baseBuildNr',
-                'baseBuildDate',
-                'bcscale',
-                'userAgent',
-                'displayErrors',
-                'errorReporting',
-                'phpOs',
-                'interface',
-                'logContent',
-                'cacheDriver',
-                'trustedProxies',
-                'userLanguage',
-                'userLocale',
-                'defaultLanguage',
-                'defaultLocale',
-                'isDocker'
-            )
-        );
+        return view('debug', compact('table', 'now', 'logContent'));
+    }
+
+    /**
+     * @return string
+     */
+    private function generateTable(): string
+    {
+        // system information:
+        $system = $this->getSystemInformation();
+        $docker = $this->getBuildInfo();
+        $app    = $this->getAppInfo();
+        $user   = $this->getuserInfo();
+
+        return (string)view('partials.debug-table', compact('system', 'docker', 'app', 'user'));
+    }
+
+    /**
+     * @return array
+     */
+    private function getSystemInformation(): array
+    {
+        $maxFileSize   = app('steam')->phpBytes(ini_get('upload_max_filesize'));
+        $maxPostSize   = app('steam')->phpBytes(ini_get('post_max_size'));
+        $drivers       = DB::availableDrivers();
+        $currentDriver = DB::getDriverName();
+        return [
+            'db_version'      => app('fireflyconfig')->get('db_version', 1)->data,
+            'php_version'     => PHP_VERSION,
+            'php_os'          => PHP_OS,
+            'interface'       => PHP_SAPI,
+            'bcscale'         => bcscale(),
+            'display_errors'  => ini_get('display_errors'),
+            'error_reporting' => $this->errorReporting((int)ini_get('error_reporting')),
+            'upload_size'     => min($maxFileSize, $maxPostSize),
+            'all_drivers'     => $drivers,
+            'current_driver'  => $currentDriver,
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getBuildInfo(): array
+    {
+        $return = [
+            'is_docker'       => env('IS_DOCKER', false),
+            'build'           => '(unknown)',
+            'build_date'      => '(unknown)',
+            'base_build'      => '(unknown)',
+            'base_build_date' => '(unknown)',
+
+        ];
+        try {
+            if (file_exists('/var/www/counter-main.txt')) {
+                $return['build'] = trim(file_get_contents('/var/www/counter-main.txt'));
+            }
+        } catch (Exception $e) { // generic catch for open basedir.
+            Log::debug('Could not check build counter, but thats ok.');
+            Log::warning($e->getMessage());
+        }
+        try {
+            if (file_exists('/var/www/build-date-main.txt')) {
+                $return['build_date'] = trim(file_get_contents('/var/www/build-date-main.txt'));
+            }
+        } catch (Exception $e) { // generic catch for open basedir.
+            Log::debug('Could not check build date, but thats ok.');
+            Log::warning($e->getMessage());
+        }
+        if ('' !== (string)env('BASE_IMAGE_BUILD')) {
+            $return['base_build'] = env('BASE_IMAGE_BUILD');
+        }
+        if ('' !== (string)env('BASE_IMAGE_DATE')) {
+            $return['base_build_date'] = env('BASE_IMAGE_DATE');
+        }
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function getAppInfo(): array
+    {
+        $userGuard = config('auth.defaults.guard');
+
+        return [
+            'tz'                 => env('TZ'),
+            'debug'              => var_export(config('app.debug'), true),
+            'log_channel'        => env('LOG_CHANNEL'),
+            'audit_log_channel'  => envNonEmpty('AUDIT_LOG_CHANNEL', '(empty)'),
+            'default_language'   => (string)config('firefly.default_language'),
+            'default_locale'     => (string)config('firefly.default_locale'),
+            'remote_header'      => $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A',
+            'remote_mail_header' => $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A',
+            'stateful_domains'   => join(', ', config('sanctum.stateful')),
+        ];
+    }
+
+    /**
+     * @return array
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    private function getuserInfo(): array
+    {
+        $userFlags = $this->getUserFlags();
+
+        // user info
+        $userAgent = request()->header('user-agent');
+
+        // set languages, see what happens:
+        $original       = setlocale(LC_ALL, 0);
+        $localeAttempts = [];
+        $parts          = app('steam')->getLocaleArray(app('steam')->getLocale());
+        foreach ($parts as $code) {
+            $code = trim($code);
+            Log::debug(sprintf('Trying to set %s', $code));
+            $result                = setlocale(LC_ALL, $code);
+            $localeAttempts[$code] = $result === $code;
+        }
+        setlocale(LC_ALL, $original);
+
+        return [
+            'user_id'         => auth()->user()->id,
+            'user_count'      => User::count(),
+            'user_flags'      => $userFlags,
+            'user_agent'      => $userAgent,
+            'locale_attempts' => $localeAttempts,
+            'locale'          => app('steam')->getLocale(),
+            'language'        => app('steam')->getLanguage(),
+            'view_range'      => app('preferences')->get('viewRange', '1M')->data,
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    private function getUserFlags(): string
+    {
+        $flags = [];
+        /** @var User $user */
+        $user = auth()->user();
+
+        // has liabilities
+        if ($user->accounts()->accountTypeIn([AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE])->count() > 0) {
+            $flags[] = ':credit_card:';
+        }
+
+        // has piggies
+        if ($user->piggyBanks()->count() > 0) {
+            $flags[] = ':pig:';
+        }
+
+        // has stored reconciliations
+        $type = TransactionType::whereType(TransactionType::RECONCILIATION)->first();
+        if ($user->transactionJournals()->where('transaction_type_id', $type->id)->count()) {
+            $flags[] = ':ledger:';
+        }
+
+        // has used importer?
+
+        // has rules
+        if ($user->rules()->count() > 0) {
+            $flags[] = ':wrench:';
+        }
+
+        // has recurring transactions
+        if ($user->recurrences()->count() > 0) {
+            $flags[] = ':clock130:';
+        }
+
+        // has groups
+        if ($user->objectGroups()->count() > 0) {
+            $flags[] = ':bookmark_tabs:';
+        }
+
+        // uses bills
+        if ($user->bills()->count() > 0) {
+            $flags[] = ':email:';
+        }
+        return join(' ', $flags);
     }
 
     /**
@@ -275,4 +343,5 @@ class DebugController extends Controller
 
         return redirect(route('home'));
     }
+
 }

app/Http/Controllers/HomeController.php

@@ -138,6 +138,9 @@ class HomeController extends Controller
         $accounts = $repository->getAccountsById($frontPage->data);
         $today    = today(config('app.timezone'));
 
+        // sort frontpage accounts by order
+        $accounts = $accounts->sortBy('order');
+
         Log::debug('Frontpage accounts are ', $frontPage->data);
 
         /** @var BillRepositoryInterface $billRepository */

app/Http/Controllers/Json/BoxController.php

@@ -55,10 +55,12 @@ class BoxController extends Controller
      */
     public function available(): JsonResponse
     {
+        app('log')->debug('Now in available()');
         /** @var OperationsRepositoryInterface $opsRepository */
         $opsRepository = app(OperationsRepositoryInterface::class);
         /** @var AvailableBudgetRepositoryInterface $abRepository */
         $abRepository = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository->cleanup();
         /** @var Carbon $start */
         $start = session('start', today(config('app.timezone'))->startOfMonth());
         /** @var Carbon $end */
@@ -73,40 +75,57 @@ class BoxController extends Controller
         $cache->addProperty($today);
         $cache->addProperty('box-available');
         if ($cache->has()) {
-            return response()->json($cache->get());
+            //return response()->json($cache->get());
         }
         $leftPerDayAmount  = '0';
         $leftToSpendAmount = '0';
 
-        $currency         = app('amount')->getDefaultCurrency();
-        $availableBudgets = $abRepository->getAvailableBudgetsByDate($start, $end);
+        $currency = app('amount')->getDefaultCurrency();
+        app('log')->debug(sprintf('Default currency is %s', $currency->code));
+        $availableBudgets = $abRepository->getAvailableBudgetsByExactDate($start, $end);
+        app('log')->debug(sprintf('Found %d available budget(s)', $availableBudgets->count()));
         $availableBudgets = $availableBudgets->filter(
             static function (AvailableBudget $availableBudget) use ($currency) {
                 if ($availableBudget->transaction_currency_id === $currency->id) {
+                    app('log')->debug(sprintf(
+                        'Will include AB #%d: from %s-%s amount %s',
+                        $availableBudget->id,
+                        $availableBudget->start_date->format('Y-m-d'),
+                        $availableBudget->end_date->format('Y-m-d'),
+                        $availableBudget->amount
+                    ));
                     return $availableBudget;
                 }
 
                 return null;
             }
         );
+        app('log')->debug(sprintf('Filtered back to %d available budgets', $availableBudgets->count()));
         // spent in this period, in budgets, for default currency.
         // also calculate spent per day.
         $spent       = $opsRepository->sumExpenses($start, $end, null, null, $currency);
         $spentAmount = $spent[(int)$currency->id]['sum'] ?? '0';
+        app('log')->debug(sprintf('Spent for default currency for all budgets in this period: %s', $spentAmount));
 
-        $days        = $today->between($start, $end) ? $today->diffInDays($start) + 1 : $end->diffInDays($start) + 1;
+        $days = $today->between($start, $end) ? $today->diffInDays($start) + 1 : $end->diffInDays($start) + 1;
+        app('log')->debug(sprintf('Number of days left: %d', $days));
         $spentPerDay = bcdiv($spentAmount, (string)$days);
+        app('log')->debug(sprintf('Available to spend per day: %s', $spentPerDay));
         if ($availableBudgets->count() > 0) {
             $display           = 0; // assume user overspent
             $boxTitle          = (string)trans('firefly.overspent');
             $totalAvailableSum = (string)$availableBudgets->sum('amount');
+            app('log')->debug(sprintf('Total available sum is %s', $totalAvailableSum));
             // calculate with available budget.
             $leftToSpendAmount = bcadd($totalAvailableSum, $spentAmount);
+            app('log')->debug(sprintf('So left to spend is %s', $leftToSpendAmount));
             if (1 === bccomp($leftToSpendAmount, '0')) {
+                app('log')->debug(sprintf('Left to spend is positive!'));
                 $boxTitle         = (string)trans('firefly.left_to_spend');
                 $days             = $today->diffInDays($end) + 1;
                 $display          = 1; // not overspent
                 $leftPerDayAmount = bcdiv($leftToSpendAmount, (string)$days);
+                app('log')->debug(sprintf('Left to spend per day is %s', $leftPerDayAmount));
             }
         }
 
@@ -118,9 +137,10 @@ class BoxController extends Controller
             'left_per_day'  => app('amount')->formatAnything($currency, $leftPerDayAmount, false),
             'title'         => $boxTitle,
         ];
+        app('log')->debug('Final output', $return);
 
         $cache->store($return);
-
+        app('log')->debug('Now done with available()');
         return response()->json($return);
     }
 

app/Http/Controllers/Json/FrontpageController.php

@@ -75,6 +75,7 @@ class FrontpageController extends Controller
                 $html = view('json.piggy-banks', compact('info'))->render();
             } catch (Throwable $e) {
                 Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
+                Log::error($e->getTraceAsString());
                 $html = 'Could not render view.';
                 throw new FireflyException($html, 0, $e);
             }

app/Http/Controllers/Json/ReconcileController.php

@@ -157,6 +157,7 @@ class ReconcileController extends Controller
             )->render();
         } catch (Throwable $e) {
             Log::debug(sprintf('View error: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
             throw new FireflyException($view, 0, $e);
         }
@@ -258,6 +259,7 @@ class ReconcileController extends Controller
             )->render();
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());
             throw new FireflyException($html, 0, $e);
         }

app/Http/Controllers/Json/RuleController.php

@@ -55,6 +55,7 @@ class RuleController extends Controller
             $view = view('rules.partials.action', compact('actions', 'count'))->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $view = 'Could not render view.';
             throw new FireflyException($view, 0, $e);
         }
@@ -86,6 +87,7 @@ class RuleController extends Controller
             $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $view = 'Could not render view.';
             throw new FireflyException($view, 0, $e);
         }

app/Http/Controllers/PreferencesController.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Notifications\UrlValidator;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -207,7 +208,7 @@ class PreferencesController extends Controller
         // slack URL:
         if (!auth()->user()->hasRole('demo')) {
             $url = (string)$request->get('slackUrl');
-            if (str_starts_with($url, 'https://hooks.slack.com/services/')) {
+            if (UrlValidator::isValidWebhookURL($url)) {
                 app('preferences')->set('slack_webhook_url', $url);
             }
             if ('' === $url) {

app/Http/Controllers/Recurring/TriggerController.php

@@ -22,25 +22,6 @@
  */
 
 declare(strict_types=1);
-/*
- * TriggerController.php
- * Copyright (c) 2022 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 
 namespace FireflyIII\Http\Controllers\Recurring;
 

app/Http/Controllers/Report/AccountController.php

@@ -65,7 +65,8 @@ class AccountController extends Controller
         try {
             $result = view('reports.partials.accounts', compact('accountReport'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render view.';
             throw new FireflyException($result, 0, $e);
         }

app/Http/Controllers/Report/BalanceController.php

@@ -141,7 +141,8 @@ class BalanceController extends Controller
         try {
             $result = view('reports.partials.balance', compact('report'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render view.';
             throw new FireflyException($result, 0, $e);
         }

app/Http/Controllers/Report/BillController.php

@@ -61,7 +61,8 @@ class BillController extends Controller
         try {
             $result = view('reports.partials.bills', compact('report'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render view.';
             throw new FireflyException($result, 0, $e);
         }

app/Http/Controllers/Report/BudgetController.php

@@ -195,8 +195,9 @@ class BudgetController extends Controller
         try {
             $result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
+            Log::error($e->getTraceAsString());
             throw new FireflyException($result, 0, $e);
         }
 
@@ -353,7 +354,8 @@ class BudgetController extends Controller
         try {
             $result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
+            Log::error($e->getTraceAsString());
             $result = 'Could not render view.';
             throw new FireflyException($result, 0, $e);
         }
@@ -406,7 +408,7 @@ class BudgetController extends Controller
         try {
             $result = view('reports.budget.partials.top-expenses', compact('result'))->render();
         } catch (Throwable $e) {
-            Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
+            Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
             throw new FireflyException($result, 0, $e);
         }