Merge branch 'release/5.5.7' into main

added has_no_bill and has_any_bill search parameters

.ci/.env.ci

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

.ci/firefly-iii-standard.yml

@@ -0,0 +1,250 @@
+parameters:
+    indentation: spaces
+
+    file_extensions:
+        - php
+
+    exclude_files:
+        - fixtures/*
+        - fixtures*/*
+        - temp/*
+        - tmp/*
+
+services:
+    # Checkers bellow aim on 1:1 copy of https://nette.org/en/coding-standard
+
+    # General rules - https://nette.org/en/coding-standard#toc-general-rules
+
+    # use tabs over spaces
+    # PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\DisallowSpaceIndentSniff: ~
+    # PHP code must use only UTF-8 without BOM
+    PhpCsFixer\Fixer\Basic\EncodingFixer: ~
+    # <?php opening tag
+    PhpCsFixer\Fixer\PhpTag\FullOpeningTagFixer: ~
+    # Ensure there is no code on the same line as the PHP open tag.
+    PhpCsFixer\Fixer\PhpTag\LinebreakAfterOpeningTagFixer: ~
+    # The closing ?> tag must be omitted from files containing only PHP.
+    PhpCsFixer\Fixer\PhpTag\NoClosingTagFixer: ~
+    # There must not be trailing whitespace at the end of lines.
+    PhpCsFixer\Fixer\Whitespace\NoTrailingWhitespaceFixer: ~
+    # ...and at the end of blank lines.
+    PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer: ~
+    # All files must end with a single blank line.
+    PhpCsFixer\Fixer\Whitespace\SingleBlankLineAtEofFixer: ~
+    # File name should match class name if possible.
+    PhpCsFixer\Fixer\Basic\Psr4Fixer: ~
+    # Enforces using shorthand scalar typehint variants in phpDocs: `int` instead of `integer` and `bool` instead of `boolean`
+    SlevomatCodingStandard\Sniffs\TypeHints\LongTypeHintsSniff: ~
+
+    # File Header - https://nette.org/en/coding-standard#toc-file-header
+
+    # empty line before namespace
+    PhpCsFixer\Fixer\NamespaceNotation\SingleBlankLineBeforeNamespaceFixer: ~
+    # 1 Use statement per line
+    PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer: ~
+    # Use statements are alphabetically ordered
+    PhpCsFixer\Fixer\Import\OrderedImportsFixer: ~
+    # disallow group use declarations use FooLibrary\Bar\Baz\{ ClassA, ClassB, ClassC, ClassD as Fizbo }
+    SlevomatCodingStandard\Sniffs\Namespaces\DisallowGroupUseSniff: ~
+    # Disallows leading backslash in use statement: use \Foo\Bar;
+    SlevomatCodingStandard\Sniffs\Namespaces\UseDoesNotStartWithBackslashSniff: ~
+    # Looks for unused imports from other namespaces.
+    Nette\CodingStandard\Sniffs\Namespaces\UnusedUsesSniff:
+        searchAnnotations: yes
+        ignoredAnnotationNames: ['@testCase']
+        ignoredAnnotations: ['@internal']
+
+    # Language Construct (should be placed before some other fixers)
+
+    # Functions should be used with `$strict` param set to `true`
+    PhpCsFixer\Fixer\Strict\StrictParamFixer: ~
+    # replaces is_null(parameter) expression with `null === parameter`.
+    PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer:
+        use_yoda_style: true
+    # Calling `unset` on multiple items should be done in one call.
+    PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer: ~
+    # Replace all `<>` with `!=`.
+    PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer: ~
+    # Include/Require and file path should be divided with a single space. File path should not be placed under brackets.
+    PhpCsFixer\Fixer\ControlStructure\IncludeFixer: ~
+    # Requires short ternary operator ?: when possible
+    SlevomatCodingStandard\Sniffs\ControlStructures\RequireShortTernaryOperatorSniff: ~
+
+    # Arrays - https://nette.org/en/coding-standard#toc-arrays
+
+    # use short array fixes
+    PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer:
+        syntax: short
+    # use trailing command in last array element
+    PhpCsFixer\Fixer\ArrayNotation\TrailingCommaInMultilineArrayFixer: ~
+    # PHP single-line arrays should not have trailing comma.
+    # PhpCsFixer\Fixer\ArrayNotation\NoTrailingCommaInSinglelineArrayFixer: ~
+    # In array declaration, there MUST NOT be a whitespace before each comma.
+    PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceBeforeCommaInArrayFixer: ~
+    # Arrays should be formatted like function/method arguments, without leading or trailing single line space.
+    PhpCsFixer\Fixer\ArrayNotation\TrimArraySpacesFixer: ~
+    # In array declaration, there MUST be a whitespace after each comma.
+    PhpCsFixer\Fixer\ArrayNotation\WhitespaceAfterCommaInArrayFixer: ~
+
+    # Strings
+
+    # Convert `heredoc` to `nowdoc` where possible.
+    PhpCsFixer\Fixer\StringNotation\HeredocToNowdocFixer: ~
+    # Convert double quotes to single quotes for simple strings.
+    PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer: ~
+
+    # Keywords and True/False/Null - https://nette.org/en/coding-standard#toc-keywords-and-true-false-null
+
+    # PHP keywords must be in lower case
+    PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer: ~
+    # The PHP constants `true`, `false`, and `null` MUST be in lower case
+    PhpCsFixer\Fixer\Casing\LowercaseConstantsFixer: ~
+
+    # Method and Functions Calls - https://nette.org/en/coding-standard#toc-method-and-function-calls
+
+    # Function defined by PHP should be called using the correct casing
+    PhpCsFixer\Fixer\Casing\NativeFunctionCasingFixer: ~
+    # In the argument list, there must be one space after each comma, and there must no be a space before each comma
+    PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer: ~
+    # This sniff checks that there are two blank lines between functions declarations and single between signatures.
+    #Nette\CodingStandard\Sniffs\WhiteSpace\FunctionSpacingSniff: ~
+
+    # Classes - https://nette.org/en/coding-standard#toc-classes
+
+    # Inside a classy element "self" should be preferred to the class name itself.
+    PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer: ~
+    # class element order: constants, properties, from public to private
+    PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer:
+        order:
+            - use_trait
+            - constant
+            - constant_public
+            - constant_protected
+            - constant_private
+            - property_public
+            - property_protected
+            - property_private
+
+    # Constants - https://nette.org/en/coding-standard#toc-constants
+
+    # constant names are CAPITALIZED (manuall fixing only :()
+    PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\UpperCaseConstantNameSniff: ~
+
+    # Class Properties - https://nette.org/en/coding-standard#toc-class-properties
+
+    # There MUST NOT be more than one property declared per statement.
+    PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer:
+        elements: ['property']
+
+    # Methods - https://nette.org/en/coding-standard#toc-methods
+
+    # They must be declared in camelCase.
+    PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff: ~
+    # Checks that there's a single space between a typehint and a parameter name and no whitespace between a nullability symbol and a typehint
+    SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSpacingSniff: ~
+    # Spaces should be properly placed in a function declaration.
+    PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer: ~
+    # In function arguments there must not be arguments with default values before non-default ones.
+    PhpCsFixer\Fixer\FunctionNotation\NoUnreachableDefaultArgumentValueFixer: ~
+
+    # Constans, Class Properties, Methods
+
+    # Constants and Properties should be separated by 1 blank line
+    #PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer:
+    #    elements: [const, property]
+
+    # Last property and 1st method should be separated by 2 spaces
+    Nette\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer:
+        space_count: 2
+
+    # Control Statements - https://nette.org/en/coding-standard#toc-control-statements
+
+    # The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.
+    PhpCsFixer\Fixer\ControlStructure\ElseifFixer: ~
+    # Remove useless semicolon statements.
+    PhpCsFixer\Fixer\Semicolon\NoEmptyStatementFixer: ~
+    # Remove trailing commas in list() calls.
+    PhpCsFixer\Fixer\ControlStructure\NoTrailingCommaInListCallFixer: ~
+    # Removes unneeded parentheses around control statements.
+    PhpCsFixer\Fixer\ControlStructure\NoUnneededControlParenthesesFixer: ~
+    # A case should be followed by a colon and not a semicolon.
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSemicolonToColonFixer: ~
+    # The structure body must be indented once.
+    # The closing brace must be on the next line after the body.
+    # There should not be more than one statement per line.
+    #Nette\CodingStandard\Fixer\Basic\BracesFixer:
+    #    allow_single_line_closure: true
+    # changes if (1 === $cond) to if ($cond === 1)
+    #SlevomatCodingStandard\Sniffs\ControlStructures\DisallowYodaComparisonSniff: ~
+    # finds unreachable catch blocks:
+    SlevomatCodingStandard\Sniffs\Exceptions\DeadCatchSniff: ~
+
+    # Casting
+
+    # A single space or none should be between cast and variable (int) $val
+    PhpCsFixer\Fixer\CastNotation\CastSpacesFixer: ~
+    # Cast should be written in lower case.
+    PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer: ~
+    # Replaces `intval`, `floatval`, `doubleval`, `strval` and `boolval` function calls with according type casting operator
+    PhpCsFixer\Fixer\CastNotation\ModernizeTypesCastingFixer: ~
+    # Short cast `bool` using double exclamation mark should not be used
+    PhpCsFixer\Fixer\CastNotation\NoShortBoolCastFixer: ~
+    # Cast `(boolean)` and `(integer)` should be written as `(bool)` and `(int)`, `(double)` and `(real)` as `(float)`
+    PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer: ~
+
+    # Language Whitespace
+
+    # Binary operators should be surrounded by at least one space. DO NOT USE
+    #PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer: ~
+    # Unary operators should be placed adjacent to their operands.
+    PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer: ~
+    # No space after the opening parenthesis and before the closing parenthesis
+    PhpCsFixer\Fixer\Whitespace\NoSpacesInsideParenthesisFixer: ~
+    # There MUST NOT be spaces around offset braces $a[0]
+    PhpCsFixer\Fixer\Whitespace\NoSpacesAroundOffsetFixer: ~
+    # There should not be space before or after object `T_OBJECT_OPERATOR` `->`.
+    PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer: ~
+    # Standardize spaces around ternary operator.
+    PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer: ~
+    # Concatenation $a . $b should be spaced according configuration
+    PhpCsFixer\Fixer\Operator\ConcatSpaceFixer:
+        spacing: one
+    # Removes extra spaces between colon and case value.
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSpaceFixer: ~
+
+    # Comments
+
+    # Docblocks should have the same indentation as the documented subject.
+    PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer: ~
+    # There should not be any empty comments.
+    PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer: ~
+    # There should not be empty PHPDoc blocks.
+    #PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer: ~
+    # Phpdocs should start and end with content, excluding the very first and last line of the docblocks.
+    PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer: ~
+    # Single-line comments comments with only one line of actual content should use the `//` syntax.
+    PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer:
+        comment_types: ['hash']
+    # Require comments with single-line content to be written as one-liners
+    SlevomatCodingStandard\Sniffs\Commenting\RequireOneLinePropertyDocCommentSniff: ~
+
+
+    # Properties MUST not be explicitly initialized with `null`.
+    #PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer: ~
+
+    PhpCsFixer\Fixer\ControlStructure\NoBreakCommentFixer:
+        comment_text: 'break omitted'
+
+    # declare(strict_types=1);
+    PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer: ~
+    # Enforces consistent formatting of return typehints: function foo(): ?int
+    SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSpacingSniff: ~
+    # Use `null` coalescing operator `??` where possible.
+    PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: ~
+
+    Nette\CodingStandard\Fixer\ClassNotation\ClassAndTraitVisibilityRequiredFixer:
+        elements: ['const', 'property', 'method']
+
+    # short list() syntax []
+    PhpCsFixer\Fixer\ListNotation\ListSyntaxFixer:
+        syntax: short

.ci/phpstan.neon

@@ -0,0 +1,33 @@
+includes:
+  - ../vendor/nunomaduro/larastan/extension.neon
+  - ../vendor/ergebnis/phpstan-rules/rules.neon
+  - ../vendor/phpstan/phpstan-deprecation-rules/rules.neon
+  - ../vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
+
+parameters:
+  ignoreErrors:
+    - '#is not allowed to extend#'
+    - '#is neither abstract nor final#'
+    - '#Control structures using switch should not be used\.#'
+    - '#has a nullable return type declaration#'
+    - '#with a nullable type declaration#'
+    - '#with null as default value#'
+    - '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
+    -
+        message: '#Function compact\(\) should not be used.#'
+        paths:
+            - ../app/Http/Controllers
+            - ../app/Support/Http/Controllers/RenderPartialViews.php
+            - ../app/Support/Form/FormSupport.php
+            - ../app/Support/Form/CurrencyForm.php
+            - ../app/Support/Form/AccountForm.php
+            - ../app/Support/ExpandedForm.php
+            - ../app/Generator/Report
+  paths:
+    - ../app
+    - ../database
+    - ../routes
+    - ../bootstrap/app.php
+
+  # The level 8 is the highest level. original was 5
+  level: 2

.ci/phpstan.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+#
+# phpstan.sh
+# Copyright (c) 2021 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Install composer packages
+#composer install --no-scripts --no-ansi
+
+# enable test .env file.
+cp .ci/.env.ci .env
+
+# Do static code analysis.
+# ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
+./vendor/bin/phpstan analyse -c .ci/phpstan.neon
+
+exit 0

.ci/phpunit.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+#
+# phpunit.sh
+# Copyright (c) 2021 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# enable test .env file.
+cp .ci/.env.ci ../.env
+
+# download test database
+# TODO no longer exists
+wget --quiet https://raw.githubusercontent.com/firefly-iii/test-data/main/test_db.sqlite -o storage/database/test_db.sqlite
+
+# run phpunit
+./vendor/bin/phpunit --configuration phpunit.coverage.xml
+
+exit 0

.deploy/heroku/.env.heroku

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

.deploy/heroku/.locales

@@ -1,19 +1,23 @@
-en_US
+bg_BG
 cs_CZ
-es_ES
 de_DE
+el_GR
+en_GB
+en_US
+es_ES
+fi_FI
 fr_FR
+hu_HU
 it_IT
 nb_NO
 nl_NL
 pl_PL
 pt_BR
+pt_PT
 ro_RO
 ru_RU
-hu_HU
-el_GR
+sk_SK
 sv_SE
+vi_VN
 zh-hans_CN
 zh-hant_CN
-fi_FI
-vi_VN

.env.example

@@ -10,27 +10,25 @@ APP_DEBUG=false
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
-# If you generate a new one existing data must be considered LOST.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
 
-#
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
 #
 # If text is still in English, remember that not everything may have been translated.
 DEFAULT_LANGUAGE=en_US
 
+# The locale defines how numbers are formatted.
+# by default this value is the same as whatever the language is.
+DEFAULT_LOCALE=equal
+
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
 # For a list of supported time zones, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TZ=Europe/Amsterdam
 
-# This variable must match your installation's external address but keep in mind that
-# it's only used on the command line as a fallback value.
-APP_URL=http://localhost
-
 # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 # Set it to ** and reverse proxies work just fine.
 TRUSTED_PROXIES=
@@ -54,17 +52,35 @@ LOG_CHANNEL=stack
 # nothing will get logged, ever.
 APP_LOG_LEVEL=notice
 
+# Audit log level.
+# set to "emergency" if you dont want to store audit logs.
+# leave on info otherwise.
+AUDIT_LOG_LEVEL=info
+
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-# Use "mysql" for MySQL and MariaDB. Use "sqlite" for SQLite.
-DB_CONNECTION=pgsql
+# Use "pgsql" for PostgreSQL
+# Use "mysql" for MySQL and MariaDB.
+# Use "sqlite" for SQLite.
+DB_CONNECTION=mysql
 DB_HOST=fireflyiiidb
-DB_PORT=5432
+DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
 
+# MySQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MYSQL_USE_SSL=false
+MYSQL_SSL_VERIFY_SERVER_CERT=true
+# You need to set at least of these options
+MYSQL_SSL_CAPATH=/etc/ssl/certs/
+MYSQL_SSL_CA=
+MYSQL_SSL_CERT=
+MYSQL_SSL_KEY=
+MYSQL_SSL_CIPHER=
+
 # PostgreSQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 PGSQL_SSL_MODE=prefer
@@ -80,9 +96,18 @@ SESSION_DRIVER=file
 # If you set either of these to 'redis', you might want to update these settings too
 # If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
 # REDIS_PORT_FILE to set the value from a file instead of from an environment variable
+
+# can be tcp, unix or http
+REDIS_SCHEME=tcp
+
+# use only when using 'unix' for REDIS_SCHEME. Leave empty otherwise.
+REDIS_PATH=
+
+# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
 REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
 REDIS_PORT=6379
+
+REDIS_PASSWORD=null
 # always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
 REDIS_DB="0"
 REDIS_CACHE_DB="1"
@@ -93,12 +118,13 @@ REDIS_CACHE_DB="1"
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
+COOKIE_SAMESITE=lax
 
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
+MAIL_MAILER=log
+MAIL_HOST=null
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -119,36 +145,31 @@ MAILGUN_ENDPOINT=api.mailgun.net
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
-
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
+SEND_LOGIN_NEW_IP_WARNING=true
 
 # These messages contain (sensitive) transaction information:
 SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+# Take note: it is no longer necessary to set this value, and it will be removed in future versions.
 MAPBOX_API_KEY=
 
+#
+# Instead of the mapbox API key, just set this value to true if you want to set the location
+# of certain things, like transactions. Since this involves an external service, it's optional
+# and disabled by default.
+#
+ENABLE_EXTERNAL_MAP=false
+
 # The map will default to this location:
 MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
 MAP_DEFAULT_ZOOM=6
 
-# Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer", and "ratesapi".
-# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
-CER_PROVIDER=ratesapi
-
-# If you have select "fixer" as default currency exchange rates,
-# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
-# the free API up to the point where you might as well offer nothing.
-# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
-FIXER_API_KEY=
-
 # Firefly III has two options for user authentication. "eloquent" is the default,
 # and "ldap" for LDAP servers.
 # For full instructions on these settings please visit:
@@ -156,6 +177,46 @@ FIXER_API_KEY=
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
+# It's also possible to change the way users are authenticated. You could use Authelia for example.
+# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
+#
+# This will also allow Windows SSO.
+#
+# If you do this please read the documentation for instructions and warnings:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+# This function is available in Firefly III v5.3.0 and higher.
+AUTHENTICATION_GUARD=web
+
+# If the guard is changed, Firefly III uses the 'REMOTE_USER' header as per RFC 3875.
+# You can also use another header, like AUTH_USER when using Windows SSO.
+# Some systems use X-Auth headers. In that case, use HTTP_X_AUTH_USERNAME or HTTP_X_AUTH_EMAIL
+# Depending on your system, REMOTE_USER may need to be changed to HTTP_REMOTE_USER
+#
+# If this header is 'unexpectedly empty', check out the documentation.
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+AUTHENTICATION_GUARD_HEADER=REMOTE_USER
+
+#
+# Firefly III uses email addresses as user identifiers. When you're using an external authentication guard
+# that doesn't do this, Firefly III is incapable of emailing you. Messages sent to "Bill Gates" always fail.
+#
+# However, if you set this value, Firefly III will store the value from this header as the user's backup
+# email address and use it to communicate. So user "Bill Gates" could still have
+# the email address "bill@microsoft.com".
+#
+# Example value: AUTHENTICATION_GUARD_EMAIL=HTTP_X_AUTH_EMAIL
+#
+AUTHENTICATION_GUARD_EMAIL=
+
+
+# It's impossible to log out users who's authentication is handled by an external system.
+# Enter a custom URL here that will force a logout (your authentication provider can tell you).
+# Setting this variable only works when AUTHENTICATION_GUARD != web
+#
+CUSTOM_LOGOUT_URI=
+
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
 # # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
@@ -170,8 +231,16 @@ ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
 ADLDAP_BASEDN=""
 ADLDAP_FOLLOW_REFFERALS=false
+
+# SSL/TLS settings
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
+ADLDAP_SSL_CACERTDIR=
+ADLDAP_SSL_CACERTFILE=
+ADLDAP_SSL_CERTFILE=
+ADLDAP_SSL_KEYFILE=
+ADLDAP_SSL_CIPHER_SUITE=
+ADLDAP_SSL_REQUIRE_CERT=
 
 # You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
@@ -181,7 +250,6 @@ ADLDAP_ADMIN_PASSWORD=
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
-
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
@@ -189,11 +257,6 @@ ADLDAP_LOGIN_FALLBACK=false
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
-# Will allow SSO if your server provides an AUTH_USER field.
-# You can set the following variables from a file by appending them with _FILE:
-WINDOWS_SSO_DISCOVER=samaccountname
-WINDOWS_SSO_KEY=AUTH_USER
-
 # field to sync as local username.
 # You can set the following variable from a file by appending it with _FILE:
 ADLDAP_SYNC_FIELD=userprincipalname
@@ -217,11 +280,16 @@ DISABLE_CSP_HEADER=false
 TRACKER_SITE_ID=
 TRACKER_URL=
 
-#
-# Firefly III could (in the future) collect telemetry on how you use Firefly III.
-# In order to allow this, change the following variable to true:
+# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
+# In order to allow this, change the following variable to true.
+# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
 SEND_TELEMETRY=false
 
+#
+# Firefly III supports webhooks. These are security sensitive and must be enabled manually first.
+#
+ALLOW_WEBHOOKS=false
+
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.
@@ -259,14 +327,23 @@ ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 CACHE_PREFIX=firefly
-SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
+IPINFO_TOKEN=
 PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-USE_ENCRYPTION=false
-IS_SANDSTORM=false
-IS_DOCKER=false
 IS_HEROKU=false
-BUNQ_USE_SANDBOX=false
+FIREFLY_III_LAYOUT=v1
+
+#
+# If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.
+# It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
+# This configuration value WILL NOT HELP.
+#
+# This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
+# So when configuring anything WEB related this variable doesn't do anything. Nothing
+#
+# If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
+#
+APP_URL=http://localhost

.gitattributes

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

.github/.mergify.yml

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

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help Firefly III improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
@@ -13,13 +16,18 @@ I am running Firefly III version x.x.x, and my problem is:
 <!-- What do you need to do to trigger this bug? -->
 
 **Extra info**
-<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
+<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). 
+
+DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
+
+-->
+
 
 **Bonus points**
-<!-- Earn bonus points by checking the boxes -->
+<!-- Before you submit, verify the following please: -->
 
-- [ ] Nobody reported this bug before
-- [ ] I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
-- [ ] I have added a screenshot.
-- [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/
-<!-- - [ ] I donated money (this is a joke :wink:)-->
+- I searched and nobody reported this bug before
+- I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
+- I have added a screenshot.
+- I was able to replicate it on the demo site https://demo.firefly-iii.org/
+<!-- - I donated money (this is a joke ;)-->

.github/ISSUE_TEMPLATE/Custom.md

@@ -10,14 +10,18 @@ I am running Firefly III version x.x.x.
 <!-- (if relevant of course) -->
 
 **Extra info**
-<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). --> 
+<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). 
+
+DO NOT PUT ```BACKTICKS``` AROUND THE OUTPUT OF THE /debug PAGE
+
+--> 
 
 **Bonus points**
 
 <!-- Complete the following checklist for bonus points -->
 
-- [ ] I have read the FAQ at https://bit.ly/FF3-FAQ
-- [ ] I added a screenshot
-- [ ] I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
-- [ ] I was able to replicate the issue on the demo site.
-<!-- - [ ] I donated money (this is a joke :wink:)-->
+- I have read the FAQ at https://bit.ly/FF3-FAQ
+- I added a screenshot
+- I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
+- I was able to replicate the issue on the demo site.
+<!-- - I donated money (this is a joke :wink:)-->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea or feature for Firefly III
+title: ''
+labels: ''
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/config.yml

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

.github/contributing.md

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

.github/dependabot.yml

@@ -0,0 +1,26 @@
+version: 2
+updates:
+
+  # composer updates
+  - package-ecosystem: "composer"
+    directory: "/" # Location of package manifests
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"
+
+  # yarn / JS updates
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"
+
+  # yarn / JS updates for new frontend
+  - package-ecosystem: "npm"
+    directory: "/frontend"
+    target-branch: develop
+    labels: ["bug"]
+    schedule:
+      interval: "weekly"

.github/funding.yml

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

.github/pull_request_template.md

@@ -1,8 +1,9 @@
 <!--
-Before you create a new PR, please consider the following two considerations.
+Before you create a new PR, please consider:
 
-1) Pull request for the MASTER branch will be closed.
+1) Pull requests for the MAIN branch will be closed.
 2) We cannot accept pull requests to add new currencies.
+3) DO NOT include translations in your PR. Only English US sentences.
 
 Thanks.
 -->

.github/security.md

@@ -1,12 +1,54 @@
 # Security Policy
 
+Firefly III is an application to manage your personal finances. As such, the developer has adopted this security disclosure and response policy to ensure that critical issues are responsibly handled.
+
 ## Supported Versions
+Only the latest Firefly III release is maintained. Applicable fixes, including security fixes, will not backported to older release branches. Please refer to [releases.md](https://github.com/firefly-iii/firefly-iii/blob/main/releases.md) for details.
 
-Only the latest version of Firefly III is supported. If you're not running the latest version of Firefly III, please upgrade at your earliest convenience.  
+## Reporting a Vulnerability - Private Disclosure Process
+Security is of the highest importance and all security vulnerabilities or suspected security vulnerabilities should be reported to Firefly III privately, to minimize attacks against current users of Firefly III before they are fixed. Vulnerabilities will be investigated and patched on the next patch (or minor) release as soon as possible. This information could be kept entirely internal to the project.  
 
-## Reporting a Vulnerability
+If you know of a publicly disclosed security vulnerability for Firefly III, please **IMMEDIATELY** contact james@firefly-iii.org to inform the Firefly III developer. You can use my [GPG key](https://keybase.io/jc5) for extra security.
 
-If you find something that compromises the security of Firefly III, you should [send me a message](mailto:james@firefly-iii.org) as soon as possible. These issues will be fixed immediately. You can also open an issue, but if you feel the issue is sensitive, please drop me a message instead.
+**IMPORTANT: Do not file public issues on GitHub for security vulnerabilities**
 
-You can use my [GPG key](https://keybase.io/jc5) for extra security. My [GitHub commits](https://github.com/firefly-iii/firefly-iii/commits/master) are almost always signed with this key.
+To report a vulnerability or a security-related issue, please email the private address james@firefly-iii.org with the details of the vulnerability. The email will be received by the developer of Firefly III. Emails will be addressed within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in the meantime. Do not report non-security-impacting bugs through this channel. Use [GitHub issues](https://github.com/firefly-iii/firefly-iii/issues/new/choose) instead.
 
+### Proposed Email Content
+Provide a descriptive subject line and in the body of the email include the following information:
+* Basic identity information, such as your name and your affiliation or company.
+* Detailed steps to reproduce the vulnerability  (POC scripts, screenshots, and compressed packet captures are all helpful to us).
+* Description of the effects of the vulnerability on Firefly III and the related hardware and software configurations, so that the developer can reproduce it.
+* How the vulnerability affects Firefly III usage and an estimation of the attack surface, if there is one.
+* List other projects or dependencies that were used in conjunction with Firefly III to produce the vulnerability.
+
+## When to report a vulnerability
+* When you think Firefly III has a potential security vulnerability.
+* When you suspect a potential vulnerability but you are unsure that it impacts Firefly III.
+* When you know of or suspect a potential vulnerability on another project that is used by Firefly III. For example Firefly III has a dependency on Docker, MySQL, etc.
+  
+## Patch, Release, and Disclosure
+The Firefly III developer will respond to vulnerability reports as follows:
+ 
+1.  The developer will investigate the vulnerability and determine its effects and criticality.
+2.  If the issue is not deemed to be a vulnerability, the developer will follow up with a detailed reason for rejection.
+3.  The developer will initiate a conversation with the reporter within 3 business days.
+4.  If a vulnerability is acknowledged and the timeline for a fix is determined, the developer will work on a plan to communicate with the appropriate community, including identifying mitigating steps that affected users can take to protect themselves until the fix is rolled out.
+5.  The developer will also create a [CVSS](https://www.first.org/cvss/specification-document) using the [CVSS Calculator](https://www.first.org/cvss/calculator/3.0). The developer makes the final call on the calculated CVSS; it is better to move quickly than making the CVSS perfect. Issues may also be reported to [Mitre](https://cve.mitre.org/) using this [scoring calculator](https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator). The CVE will initially be set to private.
+6.  The developer will work on fixing the vulnerability and perform internal testing before preparing to roll out the fix.
+7. A public disclosure date is negotiated by the Firefly III developer and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation or patch is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for distributor coordination. The timeframe for disclosure is from immediate (especially if it’s already publicly known) to a few weeks. For a critical vulnerability with a straightforward mitigation, we expect report date to public disclosure date to be on the order of 14 business days. The Firefly III developer holds the final say when setting a public disclosure date.
+9.  Once the fix is confirmed, the developer will patch the vulnerability in the next patch or minor release. Upon release of the patched version of Firefly III, we will follow the **Public Disclosure Process**.
+
+### Public Disclosure Process
+The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the Firefly III community via GitHub. In most cases, additional communication via Twitter, reddit and other channels will assist in educating Firefly III users and rolling out the patched release to affected users. 
+
+The develop will also publish any mitigating steps users can take until the fix can be applied to their Firefly III instances.
+ 
+## Confidentiality, integrity and availability
+We consider vulnerabilities leading to the compromise of data confidentiality, elevation of privilege, or integrity to be our highest priority concerns. Availability, in particular in areas relating to DoS and resource exhaustion, is also a serious security concern. The Firefly III developer takes all vulnerabilities, potential vulnerabilities, and suspected vulnerabilities seriously and will investigate them in an urgent and expeditious manner.
+
+Note that we do not currently consider the default settings for Firefly III to be secure-by-default. It is necessary for operators to explicitly configure settings, role based access control, and other resource related features in Firefly III to provide a hardened Firefly III environment. We will not act on any security disclosure that relates to a lack of safe defaults. Over time, we will work towards improved safe-by-default configuration, taking into account backwards compatibility.
+
+## Credits
+
+This security policy is based on [Harbor](https://github.com/goharbor/harbor)'s security policy.

.github/workflows/laravel.yml

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

.github/workflows/stale.yml

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

.gitignore

@@ -1,4 +1,7 @@
 /node_modules
+/frontend/node_modules
+/frontend/fonts
+/frontend/images
 /public/hot
 /public/storage
 /storage/*.key

.travis.yml

@@ -0,0 +1,20 @@
+language: php
+php:
+- '7.4'
+dist: xenial
+os: linux
+cache:
+  directories:
+  - "/home/travis/.config"
+  - "/home/travis/build/firefly-iii/firefly-iii/vendor"
+
+branches:
+  only:
+  - develop
+
+before_script:
+- phpenv config-rm xdebug.ini || return 0
+
+script:
+- "./.ci/phpstan.sh"
+- "./.ci/phpunit.sh"

app.json

@@ -3,7 +3,7 @@
   "description": "A free and open source personal finances manager",
   "repository": "https://github.com/firefly-iii/firefly-iii",
   "website": "https://firefly-iii.org/",
-  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
+  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/public/mstile-150x150.png",
   "keywords": [
     "finance",
     "finances",
@@ -41,7 +41,7 @@
     {
       "plan": "heroku-postgresql",
       "options": {
-        "version": "9.5"
+        "version": "12"
       }
     }
   ],
@@ -58,7 +58,7 @@
   ],
   "env": {
     "APP_KEY": {
-      "description": "This key is used to encrypt your data.",
+      "description": "This key is used to create app cookies en secure attachments.",
       "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
     }
   }

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

@@ -0,0 +1,116 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use AccountFilter;
+
+    private array                      $balanceTypes;
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,];
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function accounts(AutocompleteRequest $request): JsonResponse
+    {
+        $data  = $request->getData();
+        $types = $data['types'];
+        $query = $data['query'];
+        $date  = $data['date'] ?? today(config('app.timezone'));
+
+        $return          = [];
+        $result          = $this->repository->searchAccount((string)$query, $types, $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+
+        /** @var Account $account */
+        foreach ($result as $account) {
+            $nameWithBalance = $account->name;
+            $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
+
+            if (in_array($account->accountType->type, $this->balanceTypes, true)) {
+                $balance         = app('steam')->balance($account, $date);
+                $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
+            }
+
+            $return[] = [
+                'id'                      => (string)$account->id,
+                'name'                    => $account->name,
+                'name_with_balance'       => $nameWithBalance,
+                'type'                    => $account->accountType->type,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        // custom order.
+        $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
+        usort(
+            $return, function ($a, $b) use ($order) {
+            $pos_a = array_search($a['type'], $order);
+            $pos_b = array_search($b['type'], $order);
+
+            return $pos_a - $pos_b;
+        }
+        );
+
+        return response()->json($return);
+    }
+}

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

@@ -0,0 +1,79 @@
+<?php
+/**
+ * BillController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BillController
+ */
+class BillController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function bills(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchBill($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Bill $item) {
+                return [
+                    'id'   => (string)$item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered->toArray());
+    }
+
+}

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * BudgetController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    private BudgetRepositoryInterface $repository;
+
+    /**
+     * BudgetController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function budgets(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchBudget($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Budget $item) {
+                return [
+                    'id'   => (string)$item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * CategoryController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * CategoryController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function categories(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchCategory($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Category $item) {
+                return [
+                    'id'   => (string)$item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

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

@@ -0,0 +1,107 @@
+<?php
+/**
+ * CurrencyController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class CurrencyController
+ */
+class CurrencyController extends Controller
+{
+    private CurrencyRepositoryInterface $repository;
+
+    /**
+     * CurrencyController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(CurrencyRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function currencies(AutocompleteRequest $request): JsonResponse
+    {
+        $data       = $request->getData();
+        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $result     = [];
+
+        /** @var TransactionCurrency $currency */
+        foreach ($collection as $currency) {
+            $result[] = [
+                'id'             => (string)$currency->id,
+                'name'           => $currency->name,
+                'code'           => $currency->code,
+                'symbol'         => $currency->symbol,
+                'decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
+    {
+        $data       = $request->getData();
+        $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
+        $result     = [];
+
+        /** @var TransactionCurrency $currency */
+        foreach ($collection as $currency) {
+            $result[] = [
+                'id'             => (string)$currency->id,
+                'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
+                'code'           => $currency->code,
+                'symbol'         => $currency->symbol,
+                'decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($result);
+    }
+}

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

@@ -0,0 +1,81 @@
+<?php
+/**
+ * ObjectGroupController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ObjectGroupController
+ */
+class ObjectGroupController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+    /**
+     * CurrencyController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function objectGroups(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $return = [];
+        $result = $this->repository->search($data['query'], $data['limit']);
+
+        /** @var ObjectGroup $objectGroup */
+        foreach ($result as $objectGroup) {
+            $return[] = [
+                'id'    => (string)$objectGroup->id,
+                'name'  => $objectGroup->title,
+                'title' => $objectGroup->title,
+            ];
+        }
+
+        return response()->json($return);
+    }
+
+}

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

@@ -0,0 +1,122 @@
+<?php
+/**
+ * PiggyBankController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class PiggyBankController
+ */
+class PiggyBankController extends Controller
+{
+    private AccountRepositoryInterface $accountRepository;
+    private PiggyBankRepositoryInterface $piggyRepository;
+
+    /**
+     * PiggyBankController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                    = auth()->user();
+                $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->piggyRepository->setUser($user);
+                $this->accountRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function piggyBanks(AutocompleteRequest $request): JsonResponse
+    {
+        $data            = $request->getData();
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $response        = [];
+
+        /** @var PiggyBank $piggy */
+        foreach ($piggies as $piggy) {
+            $currency   = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $response[] = [
+                'id'                      => (string)$piggy->id,
+                'name'                    => $piggy->name,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
+    {
+        $data            = $request->getData();
+        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $data['limit']);
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $response        = [];
+        /** @var PiggyBank $piggy */
+        foreach ($piggies as $piggy) {
+            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $response[]    = [
+                'id'                      => (string)$piggy->id,
+                'name'                    => $piggy->name,
+                'name_with_balance'       => sprintf(
+                    '%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false),
+                    app('amount')->formatAnything($currency, $piggy->targetamount, false),
+                ),
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+}

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * RecurrenceController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Rule;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class RecurrenceController
+ */
+class RecurrenceController extends Controller
+{
+    private RecurringRepositoryInterface $repository;
+
+    /**
+     * RecurrenceController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(RecurringRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function recurring(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $rules    = $this->repository->searchRecurrence($data['query'], $data['limit']);
+        $response = [];
+
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            $response[] = [
+                'id'          => (string)$rule->id,
+                'name'        => $rule->title,
+                'description' => $rule->description,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+}

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * RuleController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Rule;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class RuleController
+ */
+class RuleController extends Controller
+{
+    private RuleRepositoryInterface $repository;
+
+    /**
+     * RuleController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(RuleRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function rules(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $rules    = $this->repository->searchRule($data['query'], $data['limit']);
+        $response = [];
+
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            $response[] = [
+                'id'          => (string)$rule->id,
+                'name'        => $rule->title,
+                'description' => $rule->description,
+            ];
+        }
+
+        return response()->json($response);
+    }
+
+}

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

@@ -0,0 +1,77 @@
+<?php
+/**
+ * RuleGroupController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class RuleGroupController
+ */
+class RuleGroupController extends Controller
+{
+    private RuleGroupRepositoryInterface $repository;
+
+    /**
+     * RuleGroupController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(RuleGroupRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function ruleGroups(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $groups   = $this->repository->searchRuleGroup($data['query'], $data['limit']);
+        $response = [];
+
+        /** @var RuleGroup $group */
+        foreach ($groups as $group) {
+            $response[] = [
+                'id'          => (string)$group->id,
+                'name'        => $group->title,
+                'description' => $group->description,
+            ];
+        }
+
+        return response()->json($response);
+    }
+}

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

@@ -0,0 +1,80 @@
+<?php
+/**
+ * TagController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+    /**
+     * TagController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tags(AutocompleteRequest $request): JsonResponse
+    {
+        $data = $request->getData();
+
+        $result = $this->repository->searchTags($data['query'], $data['limit']);
+        $array  = [];
+        /** @var Tag $tag */
+        foreach ($result as $tag) {
+            $array[] = [
+                'id'   => (string)$tag->id,
+                'name' => $tag->tag,
+                'tag'  => $tag->tag,
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

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

@@ -0,0 +1,128 @@
+<?php
+/**
+ * TransactionController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    private TransactionGroupRepositoryInterface $groupRepository;
+    private JournalRepositoryInterface          $repository;
+
+    /**
+     * TransactionController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                  = auth()->user();
+                $this->repository      = app(JournalRepositoryInterface::class);
+                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+                $this->groupRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function transactions(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+
+        // limit and unique
+        $filtered = $result->unique('description');
+        $array    = [];
+
+        /** @var TransactionJournal $journal */
+        foreach ($filtered as $journal) {
+            $array[] = [
+                'id'                   => (string)$journal->id,
+                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'name'                 => $journal->description,
+                'description'          => $journal->description,
+            ];
+        }
+
+        return response()->json($array);
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function transactionsWithID(AutocompleteRequest $request): JsonResponse
+    {
+        $data   = $request->getData();
+        $result = new Collection;
+        if (is_numeric($data['query'])) {
+            // search for group, not journal.
+            $firstResult = $this->groupRepository->find((int)$data['query']);
+            if (null !== $firstResult) {
+                // group may contain multiple journals, each a result:
+                foreach ($firstResult->transactionJournals as $journal) {
+                    $result->push($journal);
+                }
+            }
+        }
+        if (!is_numeric($data['query'])) {
+            $result = $this->repository->searchJournalDescriptions($data['query'], $data['limit']);
+        }
+
+        // limit and unique
+        $array = [];
+
+        /** @var TransactionJournal $journal */
+        foreach ($result as $journal) {
+            $array[] = [
+                'id'                   => (string)$journal->id,
+                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
+                'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * TransactionTypeController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Autocomplete;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TransactionTypeController
+ */
+class TransactionTypeController extends Controller
+{
+    private TransactionTypeRepositoryInterface $repository;
+
+    /**
+     * TransactionTypeController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(TransactionTypeRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AutocompleteRequest $request
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactionTypes(AutocompleteRequest $request): JsonResponse
+    {
+        $data  = $request->getData();
+        $types = $this->repository->searchTypes($data['query'], $data['limit']);
+        $array = [];
+
+        /** @var TransactionType $type */
+        foreach ($types as $type) {
+            // different key for consistency.
+            $array[] = [
+                'id'   => (string)$type->id,
+                'name' => $type->type,
+                'type' => $type->type,
+            ];
+        }
+
+        return response()->json($array);
+    }
+}

app/Api/V1/Controllers/BudgetLimitController.php

@@ -1,260 +0,0 @@
-<?php
-/**
- * BudgetLimitController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers;
-
-
-use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
-use FireflyIII\Transformers\BudgetLimitTransformer;
-use FireflyIII\Transformers\TransactionGroupTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
-
-/**
- * Class BudgetLimitController.
- *
- */
-class BudgetLimitController extends Controller
-{
-    use TransactionFilter;
-    /** @var BudgetLimitRepositoryInterface */
-    private $blRepository;
-    /** @var BudgetRepositoryInterface The budget repository */
-    private $repository;
-
-    /**
-     * BudgetLimitController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->repository   = app(BudgetRepositoryInterface::class);
-                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->repository->setUser($user);
-                $this->blRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function delete(BudgetLimit $budgetLimit): JsonResponse
-    {
-        $this->blRepository->destroyBudgetLimit($budgetLimit);
-
-        return response()->json([], 204);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param Request $request
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function index(Request $request): JsonResponse
-    {
-        $manager  = $this->getManager();
-        $budgetId = (int) ($request->get('budget_id') ?? 0);
-        $budget   = $this->repository->findNull($budgetId);
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $this->parameters->set('budget_id', $budgetId);
-
-        $collection = new Collection;
-        if (null === $budget) {
-            $collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
-        }
-        if (null !== $budget) {
-            $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
-        }
-
-        $count        = $collection->count();
-        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(BudgetLimit $budgetLimit): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param BudgetLimitRequest $request
-     *
-     * @throws FireflyException
-     *
-     * @return JsonResponse
-     */
-    public function store(BudgetLimitRequest $request): JsonResponse
-    {
-        $data   = $request->getAll();
-        $budget = $this->repository->findNull($data['budget_id']);
-        if (null === $budget) {
-            throw new FireflyException('200004: Budget does not exist.'); // @codeCoverageIgnore
-        }
-        $data['budget'] = $budget;
-        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = $this->getManager();
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show all transactions.
-     *
-     * @param Request     $request
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function transactions(Request $request, BudgetLimit $budgetLimit): JsonResponse
-    {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $type     = $request->get('type') ?? 'default';
-        $this->parameters->set('type', $type);
-
-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
-
-        /** @var User $admin */
-        $admin = auth()->user();
-
-        // use new group collector:
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector
-            ->setUser($admin)
-            // filter on budget.
-            ->setBudget($budgetLimit->budget)
-            // all info needed for the API:
-            ->withAPIInformation()
-            // set page size:
-            ->setLimit($pageSize)
-            // set page to retrieve
-            ->setPage($this->parameters->get('page'))
-            // set types of transactions to return.
-            ->setTypes($types);
-
-        $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
-        $collector->setTypes($types);
-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budget_limits.transactions', [$budgetLimit->id]) . $this->buildParams());
-        $transactions = $paginator->getCollection();
-
-        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($transactions, $transformer, 'transactions');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param BudgetLimitRequest $request
-     * @param BudgetLimit        $budgetLimit
-     *
-     * @return JsonResponse
-     */
-    public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
-    {
-        $data           = $request->getAll();
-        $data['budget'] = $budgetLimit->budget;
-        $budgetLimit    = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
-        $manager        = $this->getManager();
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-}

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

@@ -26,10 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
@@ -42,10 +41,9 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use ApiSupport;
-    /** @var CurrencyRepositoryInterface */
-    private $currencyRepository;
-    /** @var AccountRepositoryInterface */
-    private $repository;
+
+    private CurrencyRepositoryInterface $currencyRepository;
+    private AccountRepositoryInterface  $repository;
 
     /**
      * AccountController constructor.
@@ -70,92 +68,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * @param DateRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function expenseOverview(DateRequest $request): JsonResponse
-    {
-        // parameters for chart:
-        $dates = $request->getAll();
-        /** @var Carbon $start */
-        $start = $dates['start'];
-        /** @var Carbon $end */
-        $end = $dates['end'];
-
-        $start->subDay();
-
-        // prep some vars:
-        $currencies = [];
-        $chartData  = [];
-        $tempData   = [];
-
-        // grab all accounts and names
-        $accounts      = $this->repository->getAccountsByType([AccountType::EXPENSE]);
-        $accountNames  = $this->extractNames($accounts);
-        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
-        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
-
-        // loop the end balances. This is an array for each account ($expenses)
-        foreach ($endBalances as $accountId => $expenses) {
-            $accountId = (int) $accountId;
-            // loop each expense entry (each entry can be a different currency).
-            foreach ($expenses as $currencyId => $endAmount) {
-                $currencyId = (int) $currencyId;
-
-                // see if there is an accompanying start amount.
-                // grab the difference and find the currency.
-                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
-                $diff                    = bcsub($endAmount, $startAmount);
-                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
-                if (0 !== bccomp($diff, '0')) {
-                    // store the values in a temporary array.
-                    $tempData[] = [
-                        'name'        => $accountNames[$accountId],
-                        'difference'  => $diff,
-                        'diff_float'  => (float) $diff,
-                        'currency_id' => $currencyId,
-                    ];
-                }
-            }
-        }
-
-        // sort temp array by amount.
-        $amounts = array_column($tempData, 'diff_float');
-        array_multisort($amounts, SORT_DESC, $tempData);
-
-        // loop all found currencies and build the data array for the chart.
-        /**
-         * @var int                 $currencyId
-         * @var TransactionCurrency $currency
-         */
-        foreach ($currencies as $currencyId => $currency) {
-            $currentSet             = [
-                'label'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
-                'currency_id'             => $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'type'                    => 'bar', // line, area or bar
-                'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => $this->expandNames($tempData),
-            ];
-            $chartData[$currencyId] = $currentSet;
-        }
-
-        // loop temp data and place data in correct array:
-        foreach ($tempData as $entry) {
-            $currencyId                               = $entry['currency_id'];
-            $name                                     = $entry['name'];
-            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
-        }
-        $chartData = array_values($chartData);
-
-        return response()->json($chartData);
-    }
-
-
     /**
      * @param DateRequest $request
      *
@@ -174,12 +86,12 @@ class AccountController extends Controller
         $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
         $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
         $default    = app('amount')->getDefaultCurrency();
-        // @codeCoverageIgnoreStart
+
         if (0 === count($frontPage->data)) {
             $frontPage->data = $defaultSet;
             $frontPage->save();
         }
-        // @codeCoverageIgnoreEnd
+
 
         // get accounts:
         $accounts  = $this->repository->getAccountsById($frontPage->data);
@@ -188,14 +100,16 @@ class AccountController extends Controller
         foreach ($accounts as $account) {
             $currency = $this->repository->getAccountCurrency($account);
             if (null === $currency) {
-                $currency = $default; // @codeCoverageIgnore
+                $currency = $default; 
             }
             $currentSet = [
                 'label'                   => $account->name,
-                'currency_id'             => $currency->id,
+                'currency_id'             => (string)$currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
+                'start_date'              => $start->toAtomString(),
+                'end_date'                => $end->toAtomString(),
                 'type'                    => 'line', // line, area or bar
                 'yAxisID'                 => 0, // 0, 1, 2
                 'entries'                 => [],
@@ -203,11 +117,11 @@ class AccountController extends Controller
             /** @var Carbon $currentStart */
             $currentStart = clone $start;
             $range        = app('steam')->balanceInRange($account, $start, clone $end);
-            $previous     = round(array_values($range)[0], 12);
+            $previous     = round((float)array_values($range)[0], 12);
             while ($currentStart <= $end) {
                 $format   = $currentStart->format('Y-m-d');
-                $label    = $currentStart->format('Y-m-d');
-                $balance  = isset($range[$format]) ? round($range[$format], 12) : $previous;
+                $label    = $currentStart->toAtomString();
+                $balance  = array_key_exists($format, $range) ? round((float)$range[$format], 12) : $previous;
                 $previous = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;
@@ -217,91 +131,4 @@ class AccountController extends Controller
 
         return response()->json($chartData);
     }
-
-    /**
-     * @param DateRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function revenueOverview(DateRequest $request): JsonResponse
-    {
-        // parameters for chart:
-        $dates = $request->getAll();
-        /** @var Carbon $start */
-        $start = $dates['start'];
-        /** @var Carbon $end */
-        $end = $dates['end'];
-
-        $start->subDay();
-
-        // prep some vars:
-        $currencies = [];
-        $chartData  = [];
-        $tempData   = [];
-
-        // grab all accounts and names
-        $accounts      = $this->repository->getAccountsByType([AccountType::REVENUE]);
-        $accountNames  = $this->extractNames($accounts);
-        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
-        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
-
-        // loop the end balances. This is an array for each account ($expenses)
-        foreach ($endBalances as $accountId => $expenses) {
-            $accountId = (int) $accountId;
-            // loop each expense entry (each entry can be a different currency).
-            foreach ($expenses as $currencyId => $endAmount) {
-                $currencyId = (int) $currencyId;
-
-                // see if there is an accompanying start amount.
-                // grab the difference and find the currency.
-                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
-                $diff                    = bcsub($endAmount, $startAmount);
-                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
-                if (0 !== bccomp($diff, '0')) {
-                    // store the values in a temporary array.
-                    $tempData[] = [
-                        'name'        => $accountNames[$accountId],
-                        'difference'  => bcmul($diff, '-1'),
-                        //  For some reason this line is never covered in code coverage:
-                        'diff_float'  => ((float) $diff) * -1, // @codeCoverageIgnore
-                        'currency_id' => $currencyId,
-                    ];
-                }
-            }
-        }
-
-        // sort temp array by amount.
-        $amounts = array_column($tempData, 'diff_float');
-        array_multisort($amounts, SORT_DESC, $tempData);
-
-        // loop all found currencies and build the data array for the chart.
-        /**
-         * @var int                 $currencyId
-         * @var TransactionCurrency $currency
-         */
-        foreach ($currencies as $currencyId => $currency) {
-            $currentSet             = [
-                'label'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
-                'currency_id'             => $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'type'                    => 'bar', // line, area or bar
-                'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => $this->expandNames($tempData),
-            ];
-            $chartData[$currencyId] = $currentSet;
-        }
-
-        // loop temp data and place data in correct array:
-        foreach ($tempData as $entry) {
-            $currencyId                               = $entry['currency_id'];
-            $name                                     = $entry['name'];
-            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
-        }
-        $chartData = array_values($chartData);
-
-        return response()->json($chartData);
-    }
-
 }

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

@@ -1,118 +0,0 @@
-<?php
-
-/**
- * AvailableBudgetController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Chart;
-
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Models\AvailableBudget;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
-
-/**
- * Class AvailableBudgetController
- */
-class AvailableBudgetController extends Controller
-{
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
-    /** @var BudgetRepositoryInterface */
-    private $repository;
-
-    /**
-     * AvailableBudgetController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                = auth()->user();
-                $this->repository    = app(BudgetRepositoryInterface::class);
-                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->repository->setUser($user);
-                $this->opsRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * @param AvailableBudget $availableBudget
-     *
-     * @return JsonResponse
-     */
-    public function overview(AvailableBudget $availableBudget): JsonResponse
-    {
-        $currency          = $availableBudget->transactionCurrency;
-        $budgets           = $this->repository->getActiveBudgets();
-        $budgetInformation = $this->opsRepository->spentInPeriodMc($budgets, new Collection, $availableBudget->start_date, $availableBudget->end_date);
-        $spent             = 0.0;
-
-        // get for current currency
-        foreach ($budgetInformation as $spentInfo) {
-            if ($spentInfo['currency_id'] === $availableBudget->transaction_currency_id) {
-                $spent = $spentInfo['amount'];
-            }
-        }
-        $left = bcadd($availableBudget->amount, (string) $spent);
-        // left less than zero? Set to zero.
-        if (-1 === bccomp($left, '0')) {
-            $left = '0';
-        }
-
-        $chartData = [
-            [
-                'label'                   => trans('firefly.spent'),
-                'currency_id'             => $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'type'                    => 'pie',
-                'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => [$spent * -1],
-            ],
-            [
-                'label'                   => trans('firefly.left'),
-                'currency_id'             => $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'type'                    => 'line', // line, area or bar
-                'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => [round($left, $currency->decimal_places)],
-            ],
-        ];
-
-        return response()->json($chartData);
-    }
-
-}

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

@@ -1,202 +0,0 @@
-<?php
-
-/**
- * CategoryController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Chart;
-
-use Carbon\Carbon;
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
-use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-
-/**
- * Class CategoryController
- */
-class CategoryController extends Controller
-{
-    /** @var CategoryRepositoryInterface */
-    private $categoryRepository;
-    /** @var NoCategoryRepositoryInterface */
-    private $noCatRepository;
-    /** @var OperationsRepositoryInterface */
-    private $opsRepository;
-
-    /**
-     * AccountController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                     = auth()->user();
-                $this->categoryRepository = app(CategoryRepositoryInterface::class);
-                $this->opsRepository      = app(OperationsRepositoryInterface::class);
-                $this->noCatRepository    = app(NoCategoryRepositoryInterface::class);
-                $this->categoryRepository->setUser($user);
-                $this->opsRepository->setUser($user);
-                $this->noCatRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-
-    /**
-     * @param DateRequest $request
-     *
-     * @return JsonResponse
-     *
-     * TODO after 4.8,0, simplify
-     */
-    public function overview(DateRequest $request): JsonResponse
-    {
-        // parameters for chart:
-        $dates = $request->getAll();
-        /** @var Carbon $start */
-        $start = $dates['start'];
-        /** @var Carbon $end */
-        $end = $dates['end'];
-
-
-        $tempData      = [];
-        $spentWith     = $this->opsRepository->listExpenses($start, $end);
-        $earnedWith    = $this->opsRepository->listIncome($start, $end);
-        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
-        $earnedWithout = $this->noCatRepository->listIncome($start, $end);
-        $categories    = [];
-
-
-        foreach ([$spentWith, $earnedWith, $spentWithout, $earnedWithout] as $set) {
-            foreach ($set as $currency) {
-                foreach ($currency['categories'] as $category) {
-                    $categories[] = $category['name'];
-                    $inKey        = sprintf('%d-i', $currency['currency_id']);
-                    $outKey       = sprintf('%d-e', $currency['currency_id']);
-                    // make data arrays if not yet present.
-                    $tempData[$inKey]  = $tempData[$inKey] ?? [
-                            'currency_id'             => $currency['currency_id'],
-                            'label'                   => (string) trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                            'currency_code'           => $currency['currency_code'],
-                            'currency_symbol'         => $currency['currency_symbol'],
-                            'currency_decimal_places' => $currency['currency_decimal_places'],
-                            'type'                    => 'bar', // line, area or bar
-                            'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [
-                                // per category:
-                                // "category" => 5,
-                            ],
-                        ];
-                    $tempData[$outKey] = $tempData[$outKey] ?? [
-                            'currency_id'             => $currency['currency_id'],
-                            'label'                   => (string) trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                            'currency_code'           => $currency['currency_code'],
-                            'currency_symbol'         => $currency['currency_symbol'],
-                            'currency_decimal_places' => $currency['currency_decimal_places'],
-                            'type'                    => 'bar', // line, area or bar
-                            'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [
-                                // per category:
-                                // "category" => 5,
-                            ],
-                        ];
-
-                    foreach ($category['transaction_journals'] as $journal) {
-                        // is it expense or income?
-                        $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
-                        $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
-                        $name                                    = $category['name'];
-                        $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
-                        $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
-                    }
-                }
-            }
-        }
-
-        //        foreach ([] as $set) {
-        //            foreach ($set as $currency) {
-        //                $inKey        = sprintf('%d-i', $currency['currency_id']);
-        //                $outKey       = sprintf('%d-e', $currency['currency_id']);
-        //                $categories[] = (string)trans('firefly.no_category');
-        //                // make data arrays if not yet present.
-        //                $tempData[$inKey]  = $tempData[$inKey] ?? [
-        //                        'currency_id'             => $currency['currency_id'],
-        //                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-        //                        'currency_code'           => $currency['currency_code'],
-        //                        'currency_symbol'         => $currency['currency_symbol'],
-        //                        'currency_decimal_places' => $currency['currency_decimal_places'],
-        //                        'type'                    => 'bar', // line, area or bar
-        //                        'yAxisID'                 => 0, // 0, 1, 2
-        //                        'entries'                 => [
-        //                            // per category:
-        //                            // "category" => 5,
-        //                        ],
-        //                    ];
-        //                $tempData[$outKey] = $tempData[$outKey] ?? [
-        //                        'currency_id'             => $currency['currency_id'],
-        //                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-        //                        'currency_code'           => $currency['currency_code'],
-        //                        'currency_symbol'         => $currency['currency_symbol'],
-        //                        'currency_decimal_places' => $currency['currency_decimal_places'],
-        //                        'type'                    => 'bar', // line, area or bar
-        //                        'yAxisID'                 => 0, // 0, 1, 2
-        //                        'entries'                 => [
-        //                            // per category:
-        //                            // "category" => 5,
-        //                        ],
-        //                    ];
-        //                foreach ($currency['transaction_journals'] as $journal) {
-        //                    // is it expense or income?
-        //                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
-        //                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
-        //                    $name                                    = (string)trans('firefly.no_category');
-        //                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
-        //                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
-        //                }
-        //            }
-        //        }
-
-        // re-sort every spent array and add 0 for missing entries.
-        foreach ($tempData as $index => $set) {
-            $oldSet = $set['entries'];
-            $newSet = [];
-            foreach ($categories as $category) {
-                $value             = $oldSet[$category] ?? '0';
-                $value             = -1 === bccomp($value, '0') ? bcmul($value, '-1') : $value;
-                $newSet[$category] = $value;
-            }
-            $tempData[$index]['entries'] = $newSet;
-        }
-        $chartData = array_values($tempData);
-
-        return response()->json($chartData);
-    }
-}

app/Api/V1/Controllers/ConfigurationController.php

@@ -1,119 +0,0 @@
-<?php
-/**
- * ConfigurationController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers;
-
-use FireflyIII\Api\V1\Requests\ConfigurationRequest;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Models\Configuration;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-
-/**
- * Class ConfigurationController.
- *
- * @codeCoverageIgnore
- */
-class ConfigurationController extends Controller
-{
-
-
-    /** @var UserRepositoryInterface The user repository */
-    private $repository;
-
-    /**
-     * ConfigurationController constructor.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                $this->repository = app(UserRepositoryInterface::class);
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                if (!$this->repository->hasRole($admin, 'owner')) {
-                    throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
-                }
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * Show all configuration.
-     *
-     * @return JsonResponse
-     */
-    public function index(): JsonResponse
-    {
-        $configData = $this->getConfigData();
-
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the configuration.
-     *
-     * @param ConfigurationRequest $request
-     * @param string               $name
-     *
-     * @return JsonResponse
-     */
-    public function update(ConfigurationRequest $request, string $name): JsonResponse
-    {
-        $data = $request->getAll();
-        app('fireflyconfig')->set($name, $data['value']);
-        $configData = $this->getConfigData();
-
-        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Get all config values.
-     *
-     * @return array
-     */
-    private function getConfigData(): array
-    {
-        /** @var Configuration $isDemoSite */
-        $isDemoSite = app('fireflyconfig')->get('is_demo_site');
-        /** @var Configuration $updateCheck */
-        $updateCheck = app('fireflyconfig')->get('permission_update_check');
-        /** @var Configuration $lastCheck */
-        $lastCheck = app('fireflyconfig')->get('last_update_check');
-        /** @var Configuration $singleUser */
-        $singleUser = app('fireflyconfig')->get('single_user_mode');
-
-        return [
-            'is_demo_site'            => null === $isDemoSite ? null : $isDemoSite->data,
-            'permission_update_check' => null === $updateCheck ? null : (int) $updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int) $lastCheck->data,
-            'single_user_mode'        => null === $singleUser ? null : $singleUser->data,
-        ];
-    }
-}

app/Api/V1/Controllers/Controller.php

@@ -39,61 +39,32 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  * Class Controller.
  *
  * @codeCoverageIgnore
- *
  */
-class Controller extends BaseController
+abstract class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
-    /** @var ParameterBag Parameters from the URI are stored here. */
-    protected $parameters;
+    protected const CONTENT_TYPE = 'application/vnd.api+json';
+    protected ParameterBag $parameters;
 
     /**
      * Controller constructor.
-     *
      */
     public function __construct()
     {
         // get global parameters
         $this->parameters = $this->getParameters();
+        $this->middleware(
+            function ($request, $next) {
+                if (auth()->check()) {
+                    $language = app('steam')->getLanguage();
+                    app()->setLocale($language);
                 }
 
-    /**
-     * Method to help build URI's.
-     *
-     * @return string
-     *
-     */
-    protected function buildParams(): string
-    {
-        $return = '?';
-        $params = [];
-        foreach ($this->parameters as $key => $value) {
-            if ('page' === $key) {
-                continue;
+                return $next($request);
             }
-            if ($value instanceof Carbon) {
-                $params[$key] = $value->format('Y-m-d');
-                continue;
-            }
-            $params[$key] = $value;
-        }
-        $return .= http_build_query($params);
+        );
 
-        return $return;
-    }
-
-    /**
-     * @return Manager
-     */
-    protected function getManager(): Manager
-    {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        return $manager;
     }
 
     /**
@@ -138,4 +109,40 @@ class Controller extends BaseController
         return $bag;
 
     }
+
+    /**
+     * Method to help build URI's.
+     *
+     * @return string
+     */
+    final protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return $return . http_build_query($params);
+    }
+
+    /**
+     * @return Manager
+     */
+    final protected function getManager(): Manager
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        return $manager;
+    }
 }

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * CurrencyExchangeRateController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers;
-
-use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Services\Currency\ExchangeRateInterface;
-use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use League\Fractal\Resource\Item;
-
-/**
- * Class CurrencyExchangeRateController
- *
- * @codeCoverageIgnore
- */
-class CurrencyExchangeRateController extends Controller
-{
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $repository;
-
-    /**
-     * CurrencyExchangeRateController constructor.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($admin);
-
-                return $next($request);
-            }
-        );
-
-    }
-
-    /**
-     * Show an exchange rate.
-     *
-     * @param Request $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function index(Request $request): JsonResponse
-    {
-        $manager      = $this->getManager();
-        $fromCurrency = $this->repository->findByCodeNull($request->get('from') ?? 'EUR');
-        $toCurrency   = $this->repository->findByCodeNull($request->get('to') ?? 'USD');
-
-        if (null === $fromCurrency) {
-            throw new FireflyException('200007: Unknown source currency');
-        }
-        if (null === $toCurrency) {
-            throw new FireflyException('200007: Unknown destination currency');
-        }
-
-        /** @var Carbon $dateObj */
-        $dateObj = Carbon::createFromFormat('Y-m-d', $request->get('date') ?? date('Y-m-d'));
-        $this->parameters->set('from', $fromCurrency->code);
-        $this->parameters->set('to', $toCurrency->code);
-        $this->parameters->set('date', $dateObj->format('Y-m-d'));
-        $this->parameters->set('amount', $request->get('amount'));
-
-        $rate = $this->repository->getExchangeRate($fromCurrency, $toCurrency, $dateObj);
-        if (null === $rate) {
-            /** @var User $admin */
-            $admin = auth()->user();
-            // create service:
-            /** @var ExchangeRateInterface $service */
-            $service = app(ExchangeRateInterface::class);
-            $service->setUser($admin);
-            $rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
-        }
-        /** @var CurrencyExchangeRateTransformer $transformer */
-        $transformer = app(CurrencyExchangeRateTransformer::class);
-        $transformer->setParameters($this->parameters);
-        $resource = new Item($rate, $transformer, 'currency_exchange_rates');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-}

app/Api/V1/Controllers/Data/Bulk/AccountController.php

@@ -0,0 +1,71 @@
+<?php
+declare(strict_types=1);
+/*
+ * AccountController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    private AccountRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param MoveTransactionsRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function moveTransactions(MoveTransactionsRequest $request): JsonResponse
+    {
+        $accountIds  = $request->getAll();
+        $original    = $this->repository->findNull($accountIds['original_account']);
+        $destination = $this->repository->findNull($accountIds['destination_account']);
+
+        /** @var AccountDestroyService $service */
+        $service = app(AccountDestroyService::class);
+        $service->moveTransactions($original, $destination);
+
+        return response()->json([], 204);
+
+    }
+
+}

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

@@ -0,0 +1,281 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Data;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
+use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    /**
+     * @param DestroyRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function destroy(DestroyRequest $request): JsonResponse
+    {
+        $objects = $request->getObjects();
+
+        switch ($objects) {
+            default:
+                throw new FireflyException(sprintf('This endpoint can\'t handle object "%s"', $objects));
+            case 'budgets':
+                $this->destroyBudgets();
+                break;
+            case 'bills':
+                $this->destroyBills();
+                break;
+            case 'piggy_banks':
+                $this->destroyPiggyBanks();
+                break;
+            case 'rules':
+                $this->destroyRules();
+                break;
+            case 'recurring':
+                $this->destroyRecurringTransactions();
+                break;
+            case 'categories':
+                $this->destroyCategories();
+                break;
+            case 'tags':
+                $this->destroyTags();
+                break;
+            case 'object_groups':
+                $this->destroyObjectGroups();
+                break;
+            case 'accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::ASSET, AccountType::DEFAULT,
+                        AccountType::BENEFICIARY, AccountType::EXPENSE,
+                        AccountType::REVENUE, AccountType::INITIAL_BALANCE,
+                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                    ]
+                );
+                break;
+            case 'asset_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::ASSET, AccountType::DEFAULT,
+                    ]
+                );
+                break;
+            case 'expense_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::BENEFICIARY, AccountType::EXPENSE,
+                    ]
+                );
+                break;
+            case 'revenue_accounts':
+                $this->destroyAccounts(
+                    [
+                        AccountType::REVENUE,
+                    ]
+                );
+                break;
+            case 'liabilities':
+                $this->destroyAccounts(
+                    [
+                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                    ]
+                );
+                break;
+            case 'transactions':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::WITHDRAWAL,
+                        TransactionType::DEPOSIT,
+                        TransactionType::TRANSFER,
+                        TransactionType::RECONCILIATION,
+                        TransactionType::OPENING_BALANCE,
+                    ]
+                );
+                break;
+            case 'withdrawals':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::WITHDRAWAL,
+                    ]
+                );
+                break;
+            case 'deposits':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::DEPOSIT,
+                    ]
+                );
+                break;
+            case 'transfers':
+                $this->destroyTransactions(
+                    [
+                        TransactionType::TRANSFER,
+                    ]
+                );
+                break;
+        }
+
+        return response()->json([], 204);
+    }
+
+    /**
+     *
+     */
+    private function destroyBudgets(): void
+    {
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+        $abRepository->destroyAll();
+
+        /** @var BudgetLimitRepositoryInterface $blRepository */
+        $blRepository = app(BudgetLimitRepositoryInterface::class);
+        $blRepository->destroyAll();
+
+        /** @var BudgetRepositoryInterface $budgetRepository */
+        $budgetRepository = app(BudgetRepositoryInterface::class);
+        $budgetRepository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyBills(): void
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyPiggyBanks(): void
+    {
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyRules(): void
+    {
+        /** @var RuleGroupRepositoryInterface $repository */
+        $repository = app(RuleGroupRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyRecurringTransactions(): void
+    {
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $repository->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyCategories(): void
+    {
+        /** @var CategoryRepositoryInterface $categoryRepos */
+        $categoryRepos = app(CategoryRepositoryInterface::class);
+        $categoryRepos->destroyAll();
+    }
+
+    /**
+     *
+     */
+    private function destroyTags(): void
+    {
+        /** @var TagRepositoryInterface $tagRepository */
+        $tagRepository = app(TagRepositoryInterface::class);
+        $tagRepository->destroyAll();
+    }
+
+    private function destroyObjectGroups(): void
+    {
+        /** @var ObjectGroupRepositoryInterface $repository */
+        $repository = app(ObjectGroupRepositoryInterface::class);
+        $repository->deleteAll();
+    }
+
+    /**
+     * @param array $types
+     */
+    private function destroyAccounts(array $types): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $collection = $repository->getAccountsByType($types);
+        $service    = app(AccountDestroyService::class);
+        /** @var Account $account */
+        foreach ($collection as $account) {
+            $service->destroy($account, null);
+        }
+    }
+
+    /**
+     * @param array $types
+     */
+    private function destroyTransactions(array $types): void
+    {
+        /** @var JournalRepositoryInterface $repository */
+        $repository = app(JournalRepositoryInterface::class);
+        $journals   = $repository->findByType($types);
+        $service    = app(JournalDestroyService::class);
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $service->destroy($journal);
+        }
+    }
+
+}

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

@@ -0,0 +1,204 @@
+<?php
+declare(strict_types=1);
+/*
+ * AccountController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Data\Export;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
+use FireflyIII\Support\Export\ExportDataGenerator;
+use Illuminate\Http\Response as LaravelResponse;
+use League\Csv\CannotInsertRecord;
+
+/**
+ * Class ExportController
+ */
+class ExportController extends Controller
+{
+    private ExportDataGenerator $exporter;
+
+    /**
+     * ExportController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->exporter = app(ExportDataGenerator::class);
+                $this->exporter->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function accounts(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportAccounts(true);
+
+        return $this->returnExport('accounts');
+
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    private function returnExport(string $key): LaravelResponse
+    {
+        $date     = date('Y-m-d-H-i-s');
+        $fileName = sprintf('%s-export-%s.csv', $date, $key);
+        $data     = $this->exporter->export();
+
+        /** @var LaravelResponse $response */
+        $response = response($data[$key]);
+        $response
+            ->header('Content-Description', 'File Transfer')
+            ->header('Content-Type', 'application/octet-stream')
+            ->header('Content-Disposition', 'attachment; filename=' . $fileName)
+            ->header('Content-Transfer-Encoding', 'binary')
+            ->header('Connection', 'Keep-Alive')
+            ->header('Expires', '0')
+            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+            ->header('Pragma', 'public')
+            ->header('Content-Length', (string)strlen($data[$key]));
+
+        return $response;
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function bills(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportBills(true);
+
+        return $this->returnExport('bills');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function budgets(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportBudgets(true);
+
+        return $this->returnExport('budgets');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function categories(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportCategories(true);
+
+        return $this->returnExport('categories');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function piggyBanks(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportPiggies(true);
+
+        return $this->returnExport('piggies');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function recurring(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportRecurring(true);
+
+        return $this->returnExport('recurrences');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function rules(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportRules(true);
+
+        return $this->returnExport('rules');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function tags(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportTags(true);
+
+        return $this->returnExport('tags');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function transactions(ExportRequest $request): LaravelResponse
+    {
+        $params = $request->getAll();
+        $this->exporter->setStart($params['start']);
+        $this->exporter->setEnd($params['end']);
+        $this->exporter->setAccounts($params['accounts']);
+        $this->exporter->setExportTransactions(true);
+
+        return $this->returnExport('transactions');
+    }
+
+}

app/Api/V1/Controllers/ImportController.php

@@ -1,181 +0,0 @@
-<?php
-/**
- * ImportController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers;
-
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
-use FireflyIII\Transformers\ImportJobTransformer;
-use FireflyIII\Transformers\TransactionGroupTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
-
-/**
- * Class ImportController
- *
- * @deprecated
- * @codeCoverageIgnore
- */
-class ImportController extends Controller
-{
-    use TransactionFilter;
-    /** @var ImportJobRepositoryInterface Import job repository. */
-    private $repository;
-
-    /**
-     * ImportController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(ImportJobRepositoryInterface::class);
-                $this->repository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function listAll(): JsonResponse
-    {
-        // create some objects:
-        $manager  = $this->getManager();
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of accounts. Count it and split it.
-        $collection = $this->repository->get();
-        $count      = $collection->count();
-        $importJobs = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($importJobs, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.import.list') . $this->buildParams());
-
-        /** @var ImportJobTransformer $transformer */
-        $transformer = app(ImportJobTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($importJobs, $transformer, 'import_jobs');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * @param ImportJob $importJob
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(ImportJob $importJob): JsonResponse
-    {
-        $manager = $this->getManager();
-        /** @var ImportJobTransformer $transformer */
-        $transformer = app(ImportJobTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($importJob, $transformer, 'import_jobs');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show all transactions
-     *
-     * @param Request   $request
-     * @param ImportJob $importJob
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function transactions(Request $request, ImportJob $importJob): JsonResponse
-    {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $type     = $request->get('type') ?? 'default';
-        $this->parameters->set('type', $type);
-
-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
-
-        $tag          = $importJob->tag;
-        $transactions = new Collection();
-        $paginator    = new LengthAwarePaginator($transactions, 0, $pageSize);
-        $paginator->setPath(route('api.v1.import.transactions', [$importJob->key]) . $this->buildParams());
-
-        if (null !== $tag) {
-            /** @var User $admin */
-            $admin = auth()->user();
-
-            // use new group collector:
-            /** @var GroupCollectorInterface $collector */
-            $collector = app(GroupCollectorInterface::class);
-            $collector
-                ->setUser($admin)
-                // filter on tag.
-                ->setTag($tag)
-                // all info needed for the API:
-                ->withAPIInformation()
-                // set page size:
-                ->setLimit($pageSize)
-                // set page to retrieve
-                ->setPage($this->parameters->get('page'))
-                // set types of transactions to return.
-                ->setTypes($types);
-
-            if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-                $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
-            }
-            $paginator = $collector->getPaginatedGroups();
-            $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
-            $transactions = $paginator->getCollection();
-        }
-
-        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($transactions, $transformer, 'transactions');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-}

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

@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * DateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
+use Illuminate\Http\JsonResponse;
+
+/**
+ *
+ * Class AccountController
+ *
+ * Shows expense information grouped or limited by date.
+ * Ie. all expenses grouped by account + currency.
+ */
+class AccountController extends Controller
+{
+    use ApiSupport;
+
+    private CurrencyRepositoryInterface   $currencyRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private AccountRepositoryInterface    $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->opsRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function asset(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $expenses      = $this->opsRepository->sumExpensesBySource($start, $end, $assetAccounts);
+        $result        = [];
+
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'id'               => (string)$expense['id'],
+                'name'             => $expense['name'],
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function expense(GenericRequest $request): JsonResponse
+    {
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $assetAccounts   = $request->getAssetAccounts();
+        $expenseAccounts = $request->getExpenseAccounts();
+        $expenses        = $this->opsRepository->sumExpensesByDestination($start, $end, $assetAccounts, $expenseAccounts);
+        $result          = [];
+
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'id'               => (string)$expense['id'],
+                'name'             => $expense['name'],
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+}

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

@@ -0,0 +1,166 @@
+<?php
+declare(strict_types=1);
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BillController
+ */
+class BillController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user             = auth()->user();
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Expenses per bill, possibly filtered by bill and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function bill(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $bills    = $request->getBills();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all bills:
+        if (0 === $bills->count()) {
+            $bills = $this->repository->getBills();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setBills($bills);
+
+        $genericSet = $collector->getExtractedJournals();
+        foreach ($genericSet as $journal) {
+            $billId            = (int)$journal['bill_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $key               = sprintf('%d-%d', $billId, $currencyId);
+            $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
+
+            if (0 !== $currencyId) {
+                $response[$key]                     = $response[$key] ?? [
+                        'id'               => (string)$billId,
+                        'name'             => $journal['bill_name'],
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignKey]                     = $response[$foreignKey] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
+                $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+    /**
+     * Expenses for no bill filtered by account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noBill(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->withoutBill();
+
+        $genericSet = $collector->getExtractedJournals();
+
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -0,0 +1,127 @@
+<?php
+/*
+ * BudgetController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\NoBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    private NoBudgetRepositoryInterface   $noRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private BudgetRepositoryInterface     $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->noRepository  = app(NoBudgetRepositoryInterface::class);
+                $user                = auth()->user();
+                $this->opsRepository->setUser($user);
+                $this->repository->setUser($user);
+                $this->noRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function budget(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $budgets       = $request->getBudgets();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        if (0 === $budgets->count()) {
+            $budgets = $this->repository->getActiveBudgets();
+        }
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$budget]), null);
+            /** @var array $expense */
+            foreach ($expenses as $expense) {
+                $result[] = [
+                    'id'               => (string)$budget->id,
+                    'name'             => $budget->name,
+                    'difference'       => $expense['sum'],
+                    'difference_float' => (float)$expense['sum'],
+                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_code'    => $expense['currency_code'],
+                ];
+            }
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noBudget(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        $expenses      = $this->noRepository->sumExpenses($start, $end, $assetAccounts, null);
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+
+    }
+
+}

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

@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * CategoryController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    private NoCategoryRepositoryInterface $noRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private CategoryRepositoryInterface   $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->repository    = app(CategoryRepositoryInterface::class);
+                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+                $user                = auth()->user();
+                $this->opsRepository->setUser($user);
+                $this->repository->setUser($user);
+                $this->noRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function category(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $categories    = $request->getCategories();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        if (0 === $categories->count()) {
+            $categories = $this->repository->getCategories();
+        }
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $expenses = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, new Collection([$category]));
+            /** @var array $expense */
+            foreach ($expenses as $expense) {
+                $result[] = [
+                    'id'               => (string)$category->id,
+                    'name'             => $category->name,
+                    'difference'       => $expense['sum'],
+                    'difference_float' => (float)$expense['sum'],
+                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_code'    => $expense['currency_code'],
+                ];
+            }
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noCategory(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        $expenses      = $this->noRepository->sumExpenses($start, $end, $assetAccounts);
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+
+    }
+}

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

@@ -0,0 +1,83 @@
+<?php
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class PeriodController
+ */
+class PeriodController extends Controller
+{
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function total(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type)
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $genericSet = $collector->getExtractedJournals();
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -0,0 +1,172 @@
+<?php
+declare(strict_types=1);
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+    /**
+     * TagController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Expenses for no tag filtered by account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noTag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->withoutTags();
+
+        $genericSet = $collector->getExtractedJournals();
+
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+    /**
+     * Expenses per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // on currency ID
+                if (0 !== $currencyId) {
+                    $response[$key]                     = $response[$key] ?? [
+                            'id'               => (string)$tagId,
+                            'name'             => $tag['name'],
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$currencyId,
+                            'currency_code'    => $journal['currency_code'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                }
+
+                // on foreign ID
+                if (0 !== $foreignCurrencyId) {
+                    $response[$foreignKey]                     = $journal[$foreignKey] ?? [
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$foreignCurrencyId,
+                            'currency_code'    => $journal['foreign_currency_code'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * DateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
+use Illuminate\Http\JsonResponse;
+
+/**
+ *
+ * Class AccountController
+ *
+ * Shows income information grouped or limited by date.
+ * Ie. all income grouped by account + currency.
+ * TODO same code as Expense/AccountController.
+ */
+class AccountController extends Controller
+{
+    use ApiSupport;
+
+    private CurrencyRepositoryInterface   $currencyRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private AccountRepositoryInterface    $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->opsRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO same code as Expense/AccountController.
+     * TODO does not actually include the name of the expense account.
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function asset(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $income        = $this->opsRepository->sumIncomeByDestination($start, $end, $assetAccounts);
+        $result        = [];
+        /** @var array $entry */
+        foreach ($income as $entry) {
+            $result[] = [
+                'id'               => (string)$entry['id'],
+                'name'             => $entry['name'],
+                'difference'       => $entry['sum'],
+                'difference_float' => (float)$entry['sum'],
+                'currency_id'      => (string)$entry['currency_id'],
+                'currency_code'    => $entry['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * TODO does not actually include the name of the expense account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function revenue(GenericRequest $request): JsonResponse
+    {
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $assetAccounts   = $request->getAssetAccounts();
+        $revenueAccounts = $request->getRevenueAccounts();
+        $income          = $this->opsRepository->sumIncomeBySource($start, $end, $assetAccounts, $revenueAccounts);
+        $result          = [];
+
+        /** @var array $entry */
+        foreach ($income as $entry) {
+            $result[] = [
+                'id'               => (string)$entry['id'],
+                'name'             => $entry['name'],
+                'difference'       => $entry['sum'],
+                'difference_float' => (float)$entry['sum'],
+                'currency_id'      => (string)$entry['currency_id'],
+                'currency_code'    => $entry['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+    }
+
+}

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

@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * CategoryController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class CategoryController
+ * TODO same as opposing category controller
+ */
+class CategoryController extends Controller
+{
+    private NoCategoryRepositoryInterface $noRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private CategoryRepositoryInterface   $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->repository    = app(CategoryRepositoryInterface::class);
+                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+                $user                = auth()->user();
+                $this->opsRepository->setUser($user);
+                $this->repository->setUser($user);
+                $this->noRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function category(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $categories    = $request->getCategories();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        if (0 === $categories->count()) {
+            $categories = $this->repository->getCategories();
+        }
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $expenses = $this->opsRepository->sumIncome($start, $end, $assetAccounts, new Collection([$category]));
+            /** @var array $expense */
+            foreach ($expenses as $expense) {
+                $result[] = [
+                    'id'               => (string)$category->id,
+                    'name'             => $category->name,
+                    'difference'       => $expense['sum'],
+                    'difference_float' => (float)$expense['sum'],
+                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_code'    => $expense['currency_code'],
+                ];
+            }
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noCategory(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        $expenses      = $this->noRepository->sumIncome($start, $end, $assetAccounts);
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+
+    }
+}

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

@@ -0,0 +1,85 @@
+<?php
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class PeriodController
+ */
+class PeriodController extends Controller
+{
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function total(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type)
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $genericSet = $collector->getExtractedJournals();
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -0,0 +1,177 @@
+<?php
+declare(strict_types=1);
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+    /**
+     * TagController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user             = auth()->user();
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Expenses for no tag filtered by account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noTag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->withoutTags();
+
+        $genericSet = $collector->getExtractedJournals();
+
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+    /**
+     * Expenses per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // on currency ID
+                if (0 !== $currencyId) {
+                    $response[$key]                     = $response[$key] ?? [
+                            'id'               => (string)$tagId,
+                            'name'             => $tag['name'],
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$currencyId,
+                            'currency_code'    => $journal['currency_code'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                }
+
+                // on foreign ID
+                if (0 !== $foreignCurrencyId) {
+                    $response[$foreignKey]                     = $journal[$foreignKey] ?? [
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$foreignCurrencyId,
+                            'currency_code'    => $journal['foreign_currency_code'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd(
+                        $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    );
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -0,0 +1,76 @@
+<?php
+/*
+ * AccountController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use ApiSupport;
+
+    private OperationsRepositoryInterface $opsRepository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user                = auth()->user();
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->opsRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO same code as Expense/AccountController.
+     * TODO does not actually include the name of the expense account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function asset(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $transfers     = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
+        return response()->json($transfers);
+    }
+}

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -0,0 +1,126 @@
+<?php
+/*
+ * CategoryController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    private NoCategoryRepositoryInterface $noRepository;
+    private OperationsRepositoryInterface $opsRepository;
+    private CategoryRepositoryInterface   $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->repository    = app(CategoryRepositoryInterface::class);
+                $this->noRepository  = app(NoCategoryRepositoryInterface::class);
+                $user                = auth()->user();
+                $this->opsRepository->setUser($user);
+                $this->repository->setUser($user);
+                $this->noRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function category(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $categories    = $request->getCategories();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        if (0 === $categories->count()) {
+            $categories = $this->repository->getCategories();
+        }
+        /** @var Category $category */
+        foreach ($categories as $category) {
+            $expenses = $this->opsRepository->sumTransfers($start, $end, $assetAccounts, new Collection([$category]));
+            /** @var array $expense */
+            foreach ($expenses as $expense) {
+                $result[] = [
+                    'id'               => (string)$category->id,
+                    'name'             => $category->name,
+                    'difference'       => $expense['sum'],
+                    'difference_float' => (float)$expense['sum'],
+                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_code'    => $expense['currency_code'],
+                ];
+            }
+        }
+
+        return response()->json($result);
+    }
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noCategory(GenericRequest $request): JsonResponse
+    {
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $result        = [];
+        $expenses      = $this->noRepository->sumTransfers($start, $end, $assetAccounts);
+        /** @var array $expense */
+        foreach ($expenses as $expense) {
+            $result[] = [
+                'difference'       => $expense['sum'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
+                'currency_code'    => $expense['currency_code'],
+            ];
+        }
+
+        return response()->json($result);
+
+    }
+}

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -0,0 +1,85 @@
+<?php
+/*
+ * PeriodController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class PeriodController
+ */
+class PeriodController extends Controller
+{
+
+    /**
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function total(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type)
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $genericSet = $collector->getExtractedJournals();
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -0,0 +1,178 @@
+<?php
+/*
+ * TagController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+    /**
+     * TagController constructor.
+     * TODO lots of copying and pasting here.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $user             = auth()->user();
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Expenses for no tag filtered by account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function noTag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->withoutTags();
+
+        $genericSet = $collector->getExtractedJournals();
+
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            if (0 !== $currencyId) {
+                $response[$currencyId]                     = $response[$currencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$currencyId,
+                        'currency_code'    => $journal['currency_code'],
+                    ];
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            }
+            if (0 !== $foreignCurrencyId) {
+                $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
+                $response[$foreignCurrencyId]['difference']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+    /**
+     * Transfers per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // on currency ID
+                if (0 !== $currencyId) {
+                    $response[$key]                     = $response[$key] ?? [
+                            'id'               => (string)$tagId,
+                            'name'             => $tag['name'],
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$currencyId,
+                            'currency_code'    => $journal['currency_code'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                }
+
+                // on foreign ID
+                if (0 !== $foreignCurrencyId) {
+                    $response[$foreignKey]                     = $journal[$foreignKey] ?? [
+                            'difference'       => '0',
+                            'difference_float' => 0,
+                            'currency_id'      => (string)$foreignCurrencyId,
+                            'currency_code'    => $journal['foreign_currency_code'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd(
+                        $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    );
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+}

app/Api/V1/Controllers/LinkTypeController.php

@@ -1,272 +0,0 @@
-<?php
-/**
- * LinkTypeController.php
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers;
-
-use FireflyIII\Api\V1\Requests\LinkTypeRequest;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\LinkType;
-use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
-use FireflyIII\Transformers\LinkTypeTransformer;
-use FireflyIII\Transformers\TransactionGroupTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
-
-/**
- * Class LinkTypeController.
- *
- */
-class LinkTypeController extends Controller
-{
-    use TransactionFilter;
-    /** @var LinkTypeRepositoryInterface The link type repository */
-    private $repository;
-
-    /** @var UserRepositoryInterface The user repository */
-    private $userRepository;
-
-    /**
-     * LinkTypeController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user                 = auth()->user();
-                $this->repository     = app(LinkTypeRepositoryInterface::class);
-                $this->userRepository = app(UserRepositoryInterface::class);
-                $this->repository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * Delete the resource.
-     *
-     * @param LinkType $linkType
-     *
-     * @throws FireflyException
-     * @codeCoverageIgnore
-     * @return JsonResponse
-     */
-    public function delete(LinkType $linkType): JsonResponse
-    {
-        if (false === $linkType->editable) {
-            throw new FireflyException('200020: Link type cannot be changed.');
-        }
-        $this->repository->destroy($linkType);
-
-        return response()->json([], 204);
-    }
-
-    /**
-     * List all of them.
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function index(): JsonResponse
-    {
-        // create some objects:
-        $manager  = $this->getManager();
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of accounts. Count it and split it.
-        $collection = $this->repository->get();
-        $count      = $collection->count();
-        $linkTypes  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.link_types.index') . $this->buildParams());
-
-        /** @var LinkTypeTransformer $transformer */
-        $transformer = app(LinkTypeTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($linkTypes, $transformer, 'link_types');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-
-    /**
-     * List single resource.
-     *
-     * @param LinkType $linkType
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(LinkType $linkType): JsonResponse
-    {
-        $manager = $this->getManager();
-        /** @var LinkTypeTransformer $transformer */
-        $transformer = app(LinkTypeTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($linkType, $transformer, 'link_types');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-
-    /**
-     * Store new object.
-     *
-     * @param LinkTypeRequest $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function store(LinkTypeRequest $request): JsonResponse
-    {
-        /** @var User $admin */
-        $admin = auth()->user();
-
-        if (!$this->userRepository->hasRole($admin, 'owner')) {
-            throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
-        }
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        $linkType = $this->repository->store($data);
-        $manager  = $this->getManager();
-
-        /** @var LinkTypeTransformer $transformer */
-        $transformer = app(LinkTypeTransformer::class);
-        $transformer->setParameters($this->parameters);
-        $resource = new Item($linkType, $transformer, 'link_types');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-
-    /**
-     * Delete the resource.
-     *
-     * @param Request  $request
-     * @param LinkType $linkType
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function transactions(Request $request, LinkType $linkType): JsonResponse
-    {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $type     = $request->get('type') ?? 'default';
-        $this->parameters->set('type', $type);
-
-        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager = $this->getManager();
-
-        // whatever is returned by the query, it must be part of these journals:
-        $journalIds = $this->repository->getJournalIds($linkType);
-
-        /** @var User $admin */
-        $admin = auth()->user();
-
-        // use new group collector:
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector
-            ->setUser($admin)
-            // filter on journal IDs.
-            ->setJournalIds($journalIds)
-            // all info needed for the API:
-            ->withAPIInformation()
-            // set page size:
-            ->setLimit($pageSize)
-            // set page to retrieve
-            ->setPage($this->parameters->get('page'))
-            // set types of transactions to return.
-            ->setTypes($types);
-
-
-        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
-            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
-        }
-        $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
-        $transactions = $paginator->getCollection();
-
-        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($transactions, $transformer, 'transactions');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-
-    /**
-     * Update object.
-     *
-     * @param LinkTypeRequest $request
-     * @param LinkType        $linkType
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
-    {
-        if (false === $linkType->editable) {
-            throw new FireflyException('200020: Link type cannot be changed.');
-        }
-
-        /** @var User $admin */
-        $admin = auth()->user();
-
-        if (!$this->userRepository->hasRole($admin, 'owner')) {
-            throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
-        }
-
-        $data = $request->getAll();
-        $this->repository->update($linkType, $data);
-        $manager = $this->getManager();
-        /** @var LinkTypeTransformer $transformer */
-        $transformer = app(LinkTypeTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($linkType, $transformer, 'link_types');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-}

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

@@ -0,0 +1,72 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Account $account
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function destroy(Account $account): JsonResponse
+    {
+        $this->repository->destroy($account, null);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -21,16 +21,13 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
 
-use FireflyIII\Api\V1\Requests\AccountStoreRequest;
-use FireflyIII\Api\V1\Requests\AccountUpdateRequest;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
-use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -41,17 +38,17 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
 
 /**
- * Class AccountController.
- *
+ * Class ListController
  */
-class AccountController extends Controller
+class ListController extends Controller
 {
-    use AccountFilter, TransactionFilter;
-    /** @var AccountRepositoryInterface The account repository */
-    private $repository;
+    use TransactionFilter;
+
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
 
     /**
      * AccountController constructor.
@@ -63,11 +60,8 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-                // @var AccountRepositoryInterface repository
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -100,63 +94,9 @@ class AccountController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Account $account
-     *
-     * @codeCoverageIgnore
-     * @return JsonResponse
-     */
-    public function delete(Account $account): JsonResponse
-    {
-        $this->repository->destroy($account, null);
-
-        return response()->json([], 204);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param Request $request
-     *
-     * @codeCoverageIgnore
-     * @return JsonResponse
-     */
-    public function index(Request $request): JsonResponse
-    {
-        $manager = $this->getManager();
-        $type    = $request->get('type') ?? 'all';
-        $this->parameters->set('type', $type);
-
-        // types to get, page size:
-        $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of accounts. Count it and split it.
-        $collection = $this->repository->getAccountsByType($types);
-        $count      = $collection->count();
-        $accounts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
-
-
-        /** @var AccountTransformer $transformer */
-        $transformer = app(AccountTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($accounts, $transformer, 'accounts');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-
     /**
      * List all piggies.
      *
@@ -164,7 +104,6 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      * @codeCoverageIgnore
-     *
      */
     public function piggyBanks(Account $account): JsonResponse
     {
@@ -190,51 +129,10 @@ class AccountController extends Controller
         $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
-    /**
-     * Show single instance.
-     *
-     * @param Account $account
-     *
-     * @return JsonResponse
-     */
-    public function show(Account $account): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        /** @var AccountTransformer $transformer */
-        $transformer = app(AccountTransformer::class);
-        $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a new instance.
-     *
-     * @param AccountStoreRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function store(AccountStoreRequest $request): JsonResponse
-    {
-        $data    = $request->getAllAccountData();
-        $account = $this->repository->store($data);
-        $manager = $this->getManager();
-
-        /** @var AccountTransformer $transformer */
-        $transformer = app(AccountTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($account, $transformer, 'accounts');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
     /**
      * Show all transaction groups related to the account.
      *
@@ -244,7 +142,6 @@ class AccountController extends Controller
      * @param Account $account
      *
      * @return JsonResponse
-     *
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
@@ -283,29 +180,6 @@ class AccountController extends Controller
         $resource = new FractalCollection($groups, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update account.
-     *
-     * @param AccountUpdateRequest $request
-     * @param Account              $account
-     *
-     * @return JsonResponse
-     */
-    public function update(AccountUpdateRequest $request, Account $account): JsonResponse
-    {
-        $data         = $request->getUpdateData();
-        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
-        $this->repository->update($account, $data);
-        $manager = $this->getManager();
-
-        /** @var AccountTransformer $transformer */
-        $transformer = app(AccountTransformer::class);
-        $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 }

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

@@ -0,0 +1,127 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    use AccountFilter;
+
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $manager = $this->getManager();
+        $type    = $request->get('type') ?? 'all';
+        $this->parameters->set('type', $type);
+
+        // types to get, page size:
+        $types    = $this->mapAccountTypes($this->parameters->get('type'));
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $this->repository->resetAccountOrder();
+        $collection = $this->repository->getAccountsByType($types);
+        $count      = $collection->count();
+        $accounts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show single instance.
+     *
+     * @param Account $account
+     *
+     * @return JsonResponse
+     */
+    public function show(Account $account): JsonResponse
+    {
+        // get list of accounts. Count it and split it.
+        $this->repository->resetAccountOrder();
+        $account->refresh();
+        $manager = $this->getManager();
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,83 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Account\StoreRequest;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a new instance.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $data = $request->getAllAccountData();
+        $this->repository->resetAccountOrder();
+        $account = $this->repository->store($data);
+        $manager = $this->getManager();
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,86 @@
+<?php
+/**
+ * AccountController.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Account\UpdateRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+use Log;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    public const RESOURCE_KEY = 'accounts';
+
+    private AccountRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update account.
+     *
+     * @param UpdateRequest $request
+     * @param Account       $account
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Account $account): JsonResponse
+    {
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        $data         = $request->getUpdateData();
+        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $account      = $this->repository->update($account, $data);
+        $manager      = $this->getManager();
+        $account->refresh();
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,76 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private AttachmentRepositoryInterface $repository;
+
+    /**
+     * DestroyController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AttachmentRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @codeCoverageIgnore
+     *
+     * @param Attachment $attachment
+     *
+     * @return JsonResponse
+     */
+    public function destroy(Attachment $attachment): JsonResponse
+    {
+        $this->repository->destroy($attachment);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
-/**
- * AttachmentController.php
- * Copyright (c) 2019 james@firefly-iii.org
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,43 +21,38 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
 
-use FireflyIII\Api\V1\Requests\AttachmentStoreRequest;
-use FireflyIII\Api\V1\Requests\AttachmentUpdateRequest;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use Log;
-use function strlen;
 
 /**
- * Class AttachmentController.
- *
+ * Class ShowController
  */
-class AttachmentController extends Controller
+class ShowController extends Controller
 {
-    /** @var AttachmentRepositoryInterface The attachment repository */
-    private $repository;
+    private AttachmentRepositoryInterface $repository;
 
     /**
-     * AccountController constructor.
+     * ShowController constructor.
      *
      * @codeCoverageIgnore
      */
     public function __construct()
     {
         parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
@@ -70,30 +65,14 @@ class AttachmentController extends Controller
         );
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @codeCoverageIgnore
-     *
-     * @param Attachment $attachment
-     *
-     * @return JsonResponse
-     */
-    public function delete(Attachment $attachment): JsonResponse
-    {
-        $this->repository->destroy($attachment);
-
-        return response()->json([], 204);
-    }
-
     /**
      * Download an attachment.
      *
      * @param Attachment $attachment
      *
      * @codeCoverageIgnore
-     * @throws   FireflyException
      * @return LaravelResponse
+     * @throws   FireflyException
      */
     public function download(Attachment $attachment): LaravelResponse
     {
@@ -121,7 +100,7 @@ class AttachmentController extends Controller
                 ->header('Expires', '0')
                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                 ->header('Pragma', 'public')
-                ->header('Content-Length', strlen($content));
+                ->header('Content-Length', (string)strlen($content));
 
             return $response;
         }
@@ -141,7 +120,7 @@ class AttachmentController extends Controller
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
-        // get list of accounts. Count it and split it.
+        // get list of attachments. Count it and split it.
         $collection  = $this->repository->get();
         $count       = $collection->count();
         $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -157,7 +136,7 @@ class AttachmentController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -176,78 +155,6 @@ class AttachmentController extends Controller
 
         $resource = new Item($attachment, $transformer, 'attachments');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param AttachmentStoreRequest $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function store(AttachmentStoreRequest $request): JsonResponse
-    {
-        $data       = $request->getAll();
-        $attachment = $this->repository->store($data);
-        $manager    = $this->getManager();
-
-        /** @var AttachmentTransformer $transformer */
-        $transformer = app(AttachmentTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($attachment, $transformer, 'attachments');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param AttachmentUpdateRequest $request
-     * @param Attachment              $attachment
-     *
-     * @return JsonResponse
-     */
-    public function update(AttachmentUpdateRequest $request, Attachment $attachment): JsonResponse
-    {
-        $data = $request->getAll();
-        $this->repository->update($attachment, $data);
-        $manager = $this->getManager();
-
-        /** @var AttachmentTransformer $transformer */
-        $transformer = app(AttachmentTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($attachment, $transformer, 'attachments');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Upload an attachment.
-     *
-     * @codeCoverageIgnore
-     *
-     * @param Request    $request
-     * @param Attachment $attachment
-     *
-     * @return JsonResponse
-     */
-    public function upload(Request $request, Attachment $attachment): JsonResponse
-    {
-        /** @var AttachmentHelperInterface $helper */
-        $helper = app(AttachmentHelperInterface::class);
-        $body   = $request->getContent();
-        if ('' === $body) {
-            Log::error('Body of attachment is empty.');
-
-            return response()->json([], 422);
-        }
-        $helper->saveAttachmentFromApi($attachment, $body);
-
-        return response()->json([], 204);
-    }
-
 }

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

@@ -0,0 +1,116 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
+use FireflyIII\Api\V1\Requests\Models\Attachment\StoreRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use League\Fractal\Resource\Item;
+use Log;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private AttachmentRepositoryInterface $repository;
+
+    /**
+     * StoreController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AttachmentRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        $data       = $request->getAll();
+        $attachment = $this->repository->store($data);
+        $manager    = $this->getManager();
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($attachment, $transformer, 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Upload an attachment.
+     *
+     * @codeCoverageIgnore
+     *
+     * @param Request    $request
+     * @param Attachment $attachment
+     *
+     * @return JsonResponse
+     */
+    public function upload(Request $request, Attachment $attachment): JsonResponse
+    {
+        /** @var AttachmentHelperInterface $helper */
+        $helper = app(AttachmentHelperInterface::class);
+        $body   = $request->getContent();
+        if ('' === $body) {
+            Log::error('Body of attachment is empty.');
+
+            return response()->json([], 422);
+        }
+        $helper->saveAttachmentFromApi($attachment, $body);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -0,0 +1,86 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
+use FireflyIII\Api\V1\Requests\Models\Attachment\UpdateRequest;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private AttachmentRepositoryInterface $repository;
+
+    /**
+     * UpdateController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AttachmentRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param UpdateRequest $request
+     * @param Attachment    $attachment
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Attachment $attachment): JsonResponse
+    {
+        $data = $request->getAll();
+        $this->repository->update($attachment, $data);
+        $manager = $this->getManager();
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($attachment, $transformer, 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,74 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private AvailableBudgetRepositoryInterface $abRepository;
+
+    /**
+     * AvailableBudgetController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
+                $this->abRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param AvailableBudget $availableBudget
+     *
+     * @codeCoverageIgnore
+     *
+     * @return JsonResponse
+     */
+    public function destroy(AvailableBudget $availableBudget): JsonResponse
+    {
+        $this->abRepository->destroyAvailableBudget($availableBudget);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
-/**
- * AvailableBudgetController.php
- * Copyright (c) 2019 james@firefly-iii.org
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,12 +21,10 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
 
-use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
-use FireflyIII\Factory\TransactionCurrencyFactory;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\AvailableBudget;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\User;
@@ -37,13 +35,11 @@ use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 
 /**
- * Class AvailableBudgetController.
- *
+ * Class ShowController
  */
-class AvailableBudgetController extends Controller
+class ShowController extends Controller
 {
-    /** @var AvailableBudgetRepositoryInterface */
-    private $abRepository;
+    private AvailableBudgetRepositoryInterface $abRepository;
 
     /**
      * AvailableBudgetController constructor.
@@ -65,22 +61,6 @@ class AvailableBudgetController extends Controller
         );
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param AvailableBudget $availableBudget
-     *
-     * @codeCoverageIgnore
-     *
-     * @return JsonResponse
-     */
-    public function delete(AvailableBudget $availableBudget): JsonResponse
-    {
-        $this->abRepository->destroyAvailableBudget($availableBudget);
-
-        return response()->json([], 204);
-    }
-
     /**
      * Display a listing of the resource.
      *
@@ -113,7 +93,7 @@ class AvailableBudgetController extends Controller
         $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -134,77 +114,7 @@ class AvailableBudgetController extends Controller
 
         $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param AvailableBudgetRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function store(AvailableBudgetRequest $request): JsonResponse
-    {
-        $data = $request->getAll();
-        /** @var TransactionCurrencyFactory $factory */
-        $factory  = app(TransactionCurrencyFactory::class);
-        $currency = $factory->find($data['currency_id'], $data['currency_code']);
-
-        if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrency();
-        }
-        $data['currency'] = $currency;
-        $availableBudget  = $this->abRepository->store($data);
-        $manager          = $this->getManager();
-
-        /** @var AvailableBudgetTransformer $transformer */
-        $transformer = app(AvailableBudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($availableBudget, $transformer, 'available_budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param AvailableBudgetRequest $request
-     * @param AvailableBudget        $availableBudget
-     *
-     * @return JsonResponse
-     */
-    public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
-    {
-        $data = $request->getAll();
-
-        /** @var TransactionCurrencyFactory $factory */
-        $factory = app(TransactionCurrencyFactory::class);
-        /** @var TransactionCurrency $currency */
-        $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
-
-        if (null === $currency) {
-            // use default currency:
-            $currency = app('amount')->getDefaultCurrency();
-        }
-        $currency->enabled = true;
-        $currency->save();
-        unset($data['currency_code']);
-        $data['currency_id'] = $currency->id;
-
-
-        $this->abRepository->updateAvailableBudget($availableBudget, $data);
-        $manager = $this->getManager();
-
-        /** @var AvailableBudgetTransformer $transformer */
-        $transformer = app(AvailableBudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($availableBudget, $transformer, 'available_budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
 }

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

@@ -0,0 +1,98 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
+use FireflyIII\Factory\TransactionCurrencyFactory;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Transformers\AvailableBudgetTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private AvailableBudgetRepositoryInterface $abRepository;
+
+    /**
+     * AvailableBudgetController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
+                $this->abRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function store(Request $request): JsonResponse
+    {
+        $data = $request->getAll();
+        $data['start']->startOfDay();
+        $data['end']->endOfDay();
+
+        // currency is not mandatory:
+        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
+            $factory             = app(TransactionCurrencyFactory::class);
+            $currency            = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
+            $data['currency_id'] = $currency->id;
+            unset($data['currency_code']);
+        }
+        if (!array_key_exists('currency_id', $data)) {
+            $currency            = app('amount')->getDefaultCurrencyByUser(auth()->user());
+            $data['currency_id'] = $currency->id;
+        }
+
+        $availableBudget = $this->abRepository->store($data);
+        $manager         = $this->getManager();
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,97 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
+use FireflyIII\Factory\TransactionCurrencyFactory;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Transformers\AvailableBudgetTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private AvailableBudgetRepositoryInterface $abRepository;
+
+    /**
+     * AvailableBudgetController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
+                $this->abRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param Request         $request
+     * @param AvailableBudget $availableBudget
+     *
+     * @return JsonResponse
+     */
+    public function update(Request $request, AvailableBudget $availableBudget): JsonResponse
+    {
+        $data = $request->getAll();
+
+        // find and validate currency ID
+        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
+            $factory           = app(TransactionCurrencyFactory::class);
+            $currency          = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null) ?? app('amount')->getDefaultCurrency();
+            $currency->enabled = true;
+            $currency->save();
+            unset($data['currency_code']);
+            $data['currency_id'] = $currency->id;
+        }
+
+        $this->abRepository->updateAvailableBudget($availableBudget, $data);
+        $manager = $this->getManager();
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Bill $bill
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function destroy(Bill $bill): JsonResponse
+    {
+        $this->repository->destroy($bill);
+
+        return response()->json([], 204);
+    }
+
+}

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

@@ -1,8 +1,7 @@
 <?php
-
-/**
- * BillController.php
- * Copyright (c) 2019 james@firefly-iii.org
+/*
+ * ListController.php
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,16 +21,14 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
-use FireflyIII\Api\V1\Requests\BillRequest;
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
-use FireflyIII\Transformers\BillTransformer;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -40,17 +37,15 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
 
 /**
- * Class BillController.
- *
+ * Class ListController
  */
-class BillController extends Controller
+class ListController extends Controller
 {
     use TransactionFilter;
-    /** @var BillRepositoryInterface The bill repository */
-    private $repository;
+
+    private BillRepositoryInterface $repository;
 
     /**
      * BillController constructor.
@@ -62,12 +57,8 @@ class BillController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -102,47 +93,7 @@ class BillController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function delete(Bill $bill): JsonResponse
-    {
-        $this->repository->destroy($bill);
-
-        return response()->json([], 204);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function index(): JsonResponse
-    {
-        $bills     = $this->repository->getBills();
-        $manager   = $this->getManager();
-        $pageSize  = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $count     = $bills->count();
-        $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-
-        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($bills, $transformer, 'bills');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -172,57 +123,13 @@ class BillController extends Controller
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
 
-    /**
-     * Show the specified bill.
-     *
-     * @param Bill $bill
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(Bill $bill): JsonResponse
-    {
-        $manager = $this->getManager();
-        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($bill, $transformer, 'bills');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a bill.
-     *
-     * @param BillRequest $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function store(BillRequest $request): JsonResponse
-    {
-        $bill    = $this->repository->store($request->getAll());
-        $manager = $this->getManager();
-
-        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($bill, $transformer, 'bills');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
     /**
      * Show all transactions.
      *
@@ -278,30 +185,7 @@ class BillController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * Update a bill.
-     *
-     * @param BillRequest $request
-     * @param Bill        $bill
-     *
-     * @return JsonResponse
-     */
-    public function update(BillRequest $request, Bill $bill): JsonResponse
-    {
-        $data    = $request->getAll();
-        $bill    = $this->repository->update($bill, $data);
-        $manager = $this->getManager();
-
-        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($bill, $transformer, 'bills');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
 }

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

@@ -0,0 +1,107 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(): JsonResponse
+    {
+        $this->repository->correctOrder();
+        $bills     = $this->repository->getBills();
+        $manager   = $this->getManager();
+        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $count     = $bills->count();
+        $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'bills');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show the specified bill.
+     *
+     * @param Bill $bill
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(Bill $bill): JsonResponse
+    {
+        $manager = $this->getManager();
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($bill, $transformer, 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,85 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Bill\StoreRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    use TransactionFilter;
+
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a bill.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $data    = $request->getAll();
+        $bill    = $this->repository->store($data);
+        $manager = $this->getManager();
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($bill, $transformer, 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Bill\UpdateRequest;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private BillRepositoryInterface $repository;
+
+    /**
+     * BillController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update a bill.
+     *
+     * @param UpdateRequest $request
+     * @param Bill          $bill
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Bill $bill): JsonResponse
+    {
+        $data    = $request->getAll();
+        $bill    = $this->repository->update($bill, $data);
+        $manager = $this->getManager();
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($bill, $transformer, 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+
+}

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

@@ -0,0 +1,70 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private BudgetRepositoryInterface $repository;
+
+    /**
+     * DestroyController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Budget $budget
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function destroy(Budget $budget): JsonResponse
+    {
+        $this->repository->destroy($budget);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
-/**
- * BudgetController.php
- * Copyright (c) 2019 james@firefly-iii.org
+/*
+ * ListController.php
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,13 +21,9 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
-use Exception;
-use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
-use FireflyIII\Api\V1\Requests\BudgetStoreRequest;
-use FireflyIII\Api\V1\Requests\BudgetUpdateRequest;
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
@@ -35,7 +31,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BudgetLimitTransformer;
-use FireflyIII\Transformers\BudgetTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -43,22 +38,19 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
 
-/**
- * Class BudgetController.
- *
+/***
+ * Class ListController
  */
-class BudgetController extends Controller
+class ListController extends Controller
 {
     use TransactionFilter;
-    /** @var BudgetLimitRepositoryInterface */
-    private $blRepository;
-    /** @var BudgetRepositoryInterface The budget repository */
-    private $repository;
+
+    private BudgetLimitRepositoryInterface $blRepository;
+    private BudgetRepositoryInterface      $repository;
 
     /**
-     * BudgetController constructor.
+     * ListController constructor.
      *
      * @codeCoverageIgnore
      */
@@ -67,49 +59,16 @@ class BudgetController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
                 $this->repository   = app(BudgetRepositoryInterface::class);
                 $this->blRepository = app(BudgetLimitRepositoryInterface::class);
-                $this->repository->setUser($admin);
-                $this->blRepository->setUser($admin);
+                $this->repository->setUser(auth()->user());
+                $this->blRepository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * Display a listing of the resource.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function budgetLimits(Budget $budget): JsonResponse
-    {
-        $manager  = $this->getManager();
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $this->parameters->set('budget_id', $budget->id);
-        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
-        $count        = $collection->count();
-        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-
-        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
     /**
      * @param Budget $budget
      *
@@ -136,123 +95,35 @@ class BudgetController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function delete(Budget $budget): JsonResponse
-    {
-        $this->repository->destroy($budget);
-
-        return response()->json([], 204);
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
      * Display a listing of the resource.
      *
+     * @param Budget $budget
+     *
      * @return JsonResponse
      * @codeCoverageIgnore
      */
-    public function index(): JsonResponse
+    public function budgetLimits(Budget $budget): JsonResponse
     {
         $manager  = $this->getManager();
-
-        // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getBudgets();
+        $this->parameters->set('budget_id', $budget->id);
+        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
-        $budgets    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
-
-        /** @var BudgetTransformer $transformer */
-        $transformer = app(BudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($budgets, $transformer, 'budgets');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Show a budget.
-     *
-     * @param Budget $budget
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(Budget $budget): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        /** @var BudgetTransformer $transformer */
-        $transformer = app(BudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budget, $transformer, 'budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a budget.
-     *
-     * @param BudgetStoreRequest $request
-     *
-     * @throws FireflyException
-     *
-     * @return JsonResponse
-     */
-    public function store(BudgetStoreRequest $request): JsonResponse
-    {
-        $budget  = $this->repository->store($request->getAll());
-        $manager = $this->getManager();
-
-        /** @var BudgetTransformer $transformer */
-        $transformer = app(BudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budget, $transformer, 'budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param BudgetLimitRequest $request
-     * @param Budget             $budget
-     *
-     * @throws Exception
-     * @return JsonResponse
-     */
-    public function storeBudgetLimit(BudgetLimitRequest $request, Budget $budget): JsonResponse
-    {
-        $data           = $request->getAll();
-        $data['budget'] = $budget;
-        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
-        $manager        = $this->getManager();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -311,36 +182,10 @@ class BudgetController extends Controller
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update a budget.
-     *
-     * @param BudgetUpdateRequest $request
-     * @param Budget              $budget
-     *
-     * @return JsonResponse
-     */
-    public function update(BudgetUpdateRequest $request, Budget $budget): JsonResponse
-    {
-        $data    = $request->getAll();
-        $budget  = $this->repository->update($budget, $data);
-        $manager = $this->getManager();
-
-        /** @var BudgetTransformer $transformer */
-        $transformer = app(BudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budget, $transformer, 'budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 }

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

@@ -0,0 +1,118 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+    private BudgetRepositoryInterface      $repository;
+
+    /**
+     * ListController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+                $this->blRepository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getBudgets();
+        $count      = $collection->count();
+        $budgets    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
+
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgets, $transformer, 'budgets');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show a budget.
+     *
+     * @param Budget $budget
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(Budget $budget): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budget, $transformer, 'budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,82 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Budget\StoreRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetTransformer;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private BudgetRepositoryInterface $repository;
+
+    /**
+     * StoreController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a budget.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     *
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $budget = $this->repository->store($request->getAll());
+        $budget->refresh();
+        $manager = $this->getManager();
+
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budget, $transformer, 'budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,82 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Budget\UpdateRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetTransformer;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private BudgetRepositoryInterface $repository;
+
+    /**
+     * UpdateController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update a budget.
+     *
+     * @param UpdateRequest $request
+     * @param Budget        $budget
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Budget $budget): JsonResponse
+    {
+        $data    = $request->getAll();
+        $budget  = $this->repository->update($budget, $data);
+        $manager = $this->getManager();
+
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budget, $transformer, 'budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+}

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

@@ -0,0 +1,79 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+
+    /**
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->blRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    {
+        if ($budget->id !== $budgetLimit->budget_id) {
+            throw new FireflyException('20028: The budget limit does not belong to the budget.');
+        }
+        $this->blRepository->destroyBudgetLimit($budgetLimit);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -0,0 +1,121 @@
+<?php
+/*
+ * ListController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+/**
+ * Class ListController
+ */
+class ListController extends Controller
+{
+    use TransactionFilter;
+
+    private BudgetLimitRepositoryInterface $blRepository;
+
+    /**
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->blRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request     $request
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = $this->getManager();
+
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // filter on budget.
+            ->setBudget($budget)
+            // all info needed for the API:
+            ->withAPIInformation()
+            // set page size:
+            ->setLimit($pageSize)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes($types);
+
+        $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,154 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+    private BudgetRepositoryInterface      $repository;
+
+    /**
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->repository->setUser($user);
+                $this->blRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the budget limits for this budget..
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(Request $request, Budget $budget): JsonResponse
+    {
+        $manager = $this->getManager();
+        $manager->parseIncludes('budget');
+        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]) . $this->buildParams());
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Display a listing of the budget limits for this budget..
+     *
+     * @param DateRequest $request
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function indexAll(DateRequest $request): JsonResponse
+    {
+        $manager = $this->getManager();
+        $manager->parseIncludes('budget');
+        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budget-limits.index') . $this->buildParams());
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * @param Request     $request
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    {
+        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+            throw new FireflyException('20028: The budget limit does not belong to the budget.');
+        }
+        // continue!
+        $manager = $this->getManager();
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,89 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\BudgetLimit\StoreRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+
+    /**
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->blRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     *
+     */
+    public function store(StoreRequest $request, Budget $budget): JsonResponse
+    {
+        $data               = $request->getAll();
+        $data['start_date'] = $data['start'];
+        $data['end_date']   = $data['end'];
+        $data['budget_id']  = $budget->id;
+
+        $budgetLimit = $this->blRepository->store($data);
+        $manager     = $this->getManager();
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,93 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\BudgetLimit\UpdateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+
+    /**
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user               = auth()->user();
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
+                $this->blRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param UpdateRequest $request
+     * @param Budget        $budget
+     * @param BudgetLimit   $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    {
+
+        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+            throw new FireflyException('20028: The budget limit does not belong to the budget.');
+        }
+        $data              = $request->getAll();
+        $data['budget_id'] = $budget->id;
+        $budgetLimit       = $this->blRepository->update($budgetLimit, $data);
+        $manager           = $this->getManager();
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+}

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

@@ -0,0 +1,71 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * CategoryController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Category $category
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function destroy(Category $category): JsonResponse
+    {
+        $this->repository->destroy($category);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
-/**
- * CategoryController.php
- * Copyright (c) 2019 james@firefly-iii.org
+/*
+ * ListController.php
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -21,16 +21,14 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V1\Controllers;
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
-use FireflyIII\Api\V1\Requests\CategoryRequest;
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
-use FireflyIII\Transformers\CategoryTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -38,17 +36,15 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Resource\Item;
 
 /**
- * Class CategoryController.
- *
+ * Class ListController
  */
-class CategoryController extends Controller
+class ListController extends Controller
 {
     use TransactionFilter;
-    /** @var CategoryRepositoryInterface The category repository */
-    private $repository;
+
+    private CategoryRepositoryInterface $repository;
 
     /**
      * CategoryController constructor.
@@ -60,12 +56,8 @@ class CategoryController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -98,99 +90,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Category $category
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function delete(Category $category): JsonResponse
-    {
-        $this->repository->destroy($category);
-
-        return response()->json([], 204);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function index(): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // get list of budgets. Count it and split it.
-        $collection = $this->repository->getCategories();
-        $count      = $collection->count();
-        $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
-
-        /** @var CategoryTransformer $transformer */
-        $transformer = app(CategoryTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-
-        $resource = new FractalCollection($categories, $transformer, 'categories');
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-
-    /**
-     * Show the category.
-     *
-     * @param Category $category
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function show(Category $category): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        /** @var CategoryTransformer $transformer */
-        $transformer = app(CategoryTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($category, $transformer, 'categories');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Store new category.
-     *
-     * @param CategoryRequest $request
-     *
-     * @throws FireflyException
-     * @return JsonResponse
-     */
-    public function store(CategoryRequest $request): JsonResponse
-    {
-        $category = $this->repository->store($request->getAll());
-        $manager  = $this->getManager();
-
-        /** @var CategoryTransformer $transformer */
-        $transformer = app(CategoryTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($category, $transformer, 'categories');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
     /**
@@ -246,31 +146,7 @@ class CategoryController extends Controller
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-    }
-
-    /**
-     * Update the category.
-     *
-     * @param CategoryRequest $request
-     * @param Category        $category
-     *
-     * @return JsonResponse
-     */
-    public function update(CategoryRequest $request, Category $category): JsonResponse
-    {
-        $data     = $request->getAll();
-        $category = $this->repository->update($category, $data);
-        $manager  = $this->getManager();
-
-        /** @var CategoryTransformer $transformer */
-        $transformer = app(CategoryTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($category, $transformer, 'categories');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
 }

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

@@ -0,0 +1,113 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Transformers\CategoryTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * CategoryController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getCategories();
+        $count      = $collection->count();
+        $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
+
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new FractalCollection($categories, $transformer, 'categories');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show the category.
+     *
+     * @param Category $category
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(Category $category): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,82 @@
+<?php
+/*
+ * StoreController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Category\StoreRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Transformers\CategoryTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class StoreController
+ */
+class StoreController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * CategoryController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Store new category.
+     *
+     * @param StoreRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $category = $this->repository->store($request->getAll());
+        $manager  = $this->getManager();
+
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

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

@@ -0,0 +1,83 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Category\UpdateRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Transformers\CategoryTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * CategoryController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Update the category.
+     *
+     * @param UpdateRequest $request
+     * @param Category      $category
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, Category $category): JsonResponse
+    {
+        $data     = $request->getAll();
+        $category = $this->repository->update($category, $data);
+        $manager  = $this->getManager();
+
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+}

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

@@ -0,0 +1,73 @@
+<?php
+/*
+ * DestroyController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class DestroyController
+ */
+class DestroyController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+    /**
+     * ObjectGroupController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function destroy(ObjectGroup $objectGroup): JsonResponse
+    {
+        $this->repository->destroy($objectGroup);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -0,0 +1,131 @@
+<?php
+/*
+ * ListController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\Transformers\PiggyBankTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+/**
+ * Class ListController
+ */
+class ListController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+    /**
+     * ObjectGroupController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * List all bills
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function bills(ObjectGroup $objectGroup): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        // get list of piggy banks. Count it and split it.
+        $collection = $this->repository->getBills($objectGroup);
+        $count      = $collection->count();
+        $bills      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'bills');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * List all piggies under the object group.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
+    {
+        // create some objects:
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of piggy banks. Count it and split it.
+        $collection = $this->repository->getPiggyBanks($objectGroup);
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]) . $this->buildParams());
+
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+
+    }
+}

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

@@ -0,0 +1,119 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Transformers\ObjectGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+    /**
+     * ObjectGroupController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        $this->repository->resetOrder();
+        $collection   = $this->repository->get();
+        $count        = $collection->count();
+        $objectGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams());
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($objectGroups, $transformer, 'object_groups');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+    /**
+     * Show single instance.
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     */
+    public function show(ObjectGroup $objectGroup): JsonResponse
+    {
+        $manager = $this->getManager();
+        $this->repository->resetOrder();
+        $objectGroup->refresh();
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($objectGroup, $transformer, 'object_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

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

@@ -0,0 +1,82 @@
+<?php
+/*
+ * UpdateController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\ObjectGroup\UpdateRequest;
+use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Transformers\ObjectGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class UpdateController
+ */
+class UpdateController extends Controller
+{
+    private ObjectGroupRepositoryInterface $repository;
+
+    /**
+     * ObjectGroupController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ObjectGroupRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param UpdateRequest $request
+     * @param ObjectGroup   $objectGroup
+     *
+     * @return JsonResponse
+     */
+    public function update(UpdateRequest $request, ObjectGroup $objectGroup): JsonResponse
+    {
+        $data = $request->getUpdateData();
+        $this->repository->update($objectGroup, $data);
+        $this->repository->resetOrder();
+        $manager = $this->getManager();
+
+        /** @var ObjectGroupTransformer $transformer */
+        $transformer = app(ObjectGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($objectGroup, $transformer, 'object_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}