Merge branch 'release/5.2.6'

Feature/add single sign on

.codeclimate.yml

@@ -1,12 +0,0 @@
---- 
-exclude_patterns: 
-  - public/lib/
-  - public/js/lib/
-  - public/fonts/
-  - public/css/jquery-ui/
-  - public/css/bootstrap-multiselect.css
-  - public/css/bootstrap-sortable.css
-  - public/css/bootstrap-tagsinput.css
-  - public/css/daterangepicker.css
-  - public/css/google-fonts.css
-  - .sandstorm/

.deploy/docker/apache-firefly.conf

@@ -1,21 +0,0 @@
-<VirtualHost *:80>
-
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/firefly-iii/public
-
-        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-        # error, crit, alert, emerg.
-        # It is also possible to configure the loglevel for particular
-        # modules, e.g.
-        #LogLevel info ssl:warn
-
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-    <Directory /var/www/firefly-iii/public>
-        Options -Indexes +FollowSymLinks
-        AllowOverride All
-        Order allow,deny
-        allow from all
-    </Directory>
-</VirtualHost>

.deploy/docker/apache2.conf

@@ -1,221 +0,0 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf-enabled
-#	|	`-- *.conf
-# 	`-- sites-enabled
-#	 	`-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-<Directory /usr/share>
-	AllowOverride None
-	Require all granted
-</Directory>
-
-<Directory /var/www/>
-	Options Indexes FollowSymLinks
-	AllowOverride All
-	Require all granted
-</Directory>
-
-#<Directory /srv/>
-#	Options Indexes FollowSymLinks
-#	AllowOverride None
-#	Require all granted
-#</Directory>
-
-
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
-	Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

.deploy/docker/cronjob.conf

@@ -1,11 +0,0 @@
-[program:cron]
-command=/usr/sbin/cron -f -L 15
-user=root
-autostart=true
-autorestart=true
-stdout_events_enabled=true
-stderr_events_enabled=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-startsecs=10
-startretries=3

.deploy/docker/docker.env

@@ -1,6 +0,0 @@
-FF_APP_ENV=local
-FF_APP_KEY=S0m3R@nd0mString0f32Ch@rsEx@ct1y
-FF_DB_HOST=
-FF_DB_NAME=
-FF_DB_USER=
-FF_DB_PASSWORD=

.deploy/docker/entrypoint.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# make sure the correct directories exists (suggested by @chrif):
-mkdir -p $FIREFLY_PATH/storage/app
-mkdir -p $FIREFLY_PATH/storage/app/public
-mkdir -p $FIREFLY_PATH/storage/build
-mkdir -p $FIREFLY_PATH/storage/database
-mkdir -p $FIREFLY_PATH/storage/debugbar
-mkdir -p $FIREFLY_PATH/storage/export
-mkdir -p $FIREFLY_PATH/storage/framework/cache
-mkdir -p $FIREFLY_PATH/storage/framework/sessions
-mkdir -p $FIREFLY_PATH/storage/framework/testing
-mkdir -p $FIREFLY_PATH/storage/framework/views
-mkdir -p $FIREFLY_PATH/storage/logs
-mkdir -p $FIREFLY_PATH/storage/upload
-
-
-# make sure we own the volumes:
-chown -R www-data:www-data -R $FIREFLY_PATH/storage
-chmod -R 775 $FIREFLY_PATH/storage
-
-# remove any lingering files that may break upgrades:
-rm -f $FIREFLY_PATH/storage/logs/laravel.log
-
-cat .env.docker | envsubst > .env
-composer dump-autoload
-php artisan package:discover
-php artisan firefly:instructions install
-exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon

.deploy/docker/firefly-iii.conf

@@ -1,6 +0,0 @@
-[program:apache2]
-command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
-stdout_events_enabled=true
-stderr_events_enabled=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0

.deploy/docker/supervisord.conf

@@ -1,30 +0,0 @@
-# supervisor config file
-# Adapted from the config file distributed with the supervisor package on Debian
-# Jessie
-
-# Enable supervisord in non-daemon mode. Disable the logfile as we receive
-# log messages via stdout/err. Set up the child process log directory in case
-# the user doesn't set logging to stdout/err.
-[supervisord]
-nodaemon = true
-logfile = NONE
-pidfile = /var/run/supervisord.pid
-childlogdir = /var/log/supervisor
-loglevel=debug
-
-# Enable supervisorctl via RPC interface over Unix socket
-[unix_http_server]
-file = /var/run/supervisor.sock
-chmod = 0700
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl = unix:///var/run/supervisor.sock
-
-
-# Include conf files for child processes
-# Debian/Ubuntu packages use /etc/supervisor/conf.d
-[include]
-files = /etc/supervisor/conf.d/*.conf

.deploy/docker/vhost.conf

@@ -1,26 +0,0 @@
-server {
-    listen 80 default_server;
-
-    server_name  _ *.vm docker;
-
-    root "/app/public";
-    index index.php;
-
-    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
-    listen 443 default_server;
-
-    server_name  _ *.vm docker;
-
-    root "/app/public";
-    index index.php;
-
-    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-    include /opt/docker/etc/nginx/vhost.ssl.conf;
-}

.deploy/heroku/.env.heroku

@@ -42,13 +42,31 @@ DB_CONNECTION=pgsql
 
 
 
-
+# PostgreSQL supports SSL. You can configure it here.
+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=
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=
+SFTP_PASSWORD=
+SFTP_PRIV_KEY=
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -74,24 +92,79 @@ SPARKPOST_SECRET=
 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.
 MAPBOX_API_KEY=
 
-# 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 severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# 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
+# 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.
 FIXER_API_KEY=
 
 # If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
+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
+LOGIN_PROVIDER=eloquent
+
+# LDAP connection configuration
+# OpenLDAP, FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+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.
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+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.
+DISABLE_FRAME_HEADER=false
+
 # 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
@@ -104,9 +177,7 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_DOCKER=false
 IS_SANDSTORM=false
 IS_HEROKU=true
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+FFIII_LAYOUT=v1

.deploy/heroku/.locales

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

.deploy/kubernetes/firefly.yaml

@@ -1,82 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mysql-pv-export-claim
-  labels:
-    app: firefly-local
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Gi
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mysql-pv-upload-claim
-  labels:
-    app: firefly-local
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Gi
---- 
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: firefly-local
-  namespace: firefly
-  labels:
-    app: firefly-local
-spec:
-  selector:
-    matchLabels:
-      app: firefly-local
-  template:
-    metadata:
-      labels:
-        app: firefly-local
-    spec:
-      containers:
-      - image: firefly-local
-        name: firefly-local
-        env:
-        - name: FF_APP_ENV
-          value: "local"
-        - name: FF_APP_KEY
-          value: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
-        - name: FF_DB_HOST
-          value: "172.17.0.9" 
-        - name: FF_DB_NAME
-          value: "firefly_db"
-        - name: FF_DB_USER
-          value: "firefly_db"
-        - name: FF_DB_PASSWORD
-          value: "password" 
-        volumeMounts:
-        - mountPath: "/var/www/firefly-iii/storage/export"
-          name: mysql-persistent-export
-        - mountPath: "/var/www/firefly-iii/storage/upload"
-          name: mysql-persistent-upload 
-        imagePullPolicy: IfNotPresent
-      volumes:
-        - name: mysql-persistent-export
-          persistentVolumeClaim:
-            claimName: mysql-pv-export-claim
-        - name: mysql-persistent-upload
-          persistentVolumeClaim:
-            claimName: mysql-pv-upload-claim
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: firefly-local
-spec:
-  ports:
-    - port: 80
-  type: NodePort
-  selector:
-    app: firefly-local

.deploy/kubernetes/sql.yaml

@@ -1,49 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: sql-pass
-type: Opaque
-data:
-  password: cGFzc3dvcmQ=
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: mysql
-  namespace: firefly
-  labels:
-    app: mysql
-spec:
-  selector:
-    matchLabels:
-      app: mysql
-  template:
-    metadata:
-      labels:
-        app: mysql
-    spec:
-      containers:
-      - image: mysql
-        imagePullPolicy: IfNotPresent
-        name: mysql
-        env:
-          - name: MYSQL_ROOT_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: sql-pass
-                key: password
-        ports:
-        - containerPort: 3306
-          name: mysql
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mysql
-spec:
-  ports:
-    - port: 3306
-  type: NodePort
-  selector:
-    app: mysql
-

.dockerignore

@@ -1,3 +0,0 @@
-# Ignore composer specific files and vendor folder
-composer.phar
-vendor

.env.docker

@@ -1,112 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=${FF_APP_ENV}
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=${APP_DEBUG}
-
-# This should be your email address
-SITE_OWNER=${SITE_OWNER}
-
-# 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
-APP_KEY=${FF_APP_KEY}
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-TZ=${TZ}
-
-# 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=${APP_URL}
-
-# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
-TRUSTED_PROXIES=${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.
-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=${APP_LOG_LEVEL}
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=${FF_DB_CONNECTION}
-DB_HOST=${FF_DB_HOST}
-DB_PORT=${FF_DB_PORT}
-DB_DATABASE=${FF_DB_NAME}
-DB_USERNAME=${FF_DB_USER}
-DB_PASSWORD=${FF_DB_PASSWORD}
-
-# If you're looking for performance improvements, you could install memcached.
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-# Cookie settings. Should not be necessary to change these.
-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=${MAIL_DRIVER}
-MAIL_HOST=${MAIL_HOST}
-MAIL_PORT=${MAIL_PORT}
-MAIL_FROM=${MAIL_FROM}
-MAIL_USERNAME=${MAIL_USERNAME}
-MAIL_PASSWORD=${MAIL_PASSWORD}
-MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
-
-# Other mail drivers:
-MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
-MAILGUN_SECRET=${MAILGUN_SECRET}
-MANDRILL_SECRET=${MANDRILL_SECRET}
-SPARKPOST_SECRET=${SPARKPOST_SECRET}
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=false
-
-# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-MAPBOX_API_KEY=${MAPBOX_API_KEY}
-
-# 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 severly limited
-# the free API up to the point where you might as well offer nothing.
-FIXER_API_KEY=${FIXER_API_KEY}
-
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=${ANALYTICS_ID}
-
-# 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
-
-# Leave the following configuration vars as is.
-# Unless you like to tinker and know what you're doing.
-APP_NAME=FireflyIII
-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=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-IS_DOCKER=true
-IS_SANDSTORM=false
-IS_HEROKU=false
-BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=

.env.example

@@ -5,30 +5,48 @@ 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
+# 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 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 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
+#
+# 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=
 
 # 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.
-LOG_CHANNEL=daily
+# 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=stack
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
@@ -37,25 +55,48 @@ LOG_CHANNEL=daily
 APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+# 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
+DB_HOST=fireflyiiidb
+DB_PORT=5432
+DB_DATABASE=firefly
+DB_USERNAME=firefly
+DB_PASSWORD=secret_firefly_password
+
+# PostgreSQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+PGSQL_SSL_MODE=prefer
+PGSQL_SSL_ROOT_CERT=null
+PGSQL_SSL_CERT=null
+PGSQL_SSL_KEY=null
+PGSQL_SSL_CRL_FILE=null
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# If you set either of these to 'redis', you might want to update these settings too
+# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
+# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+# 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
+# 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_PORT=2525
@@ -65,38 +106,159 @@ 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=
 
-# 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 severly limited
+# 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=
 
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
+# 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
 
-# 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
+# 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
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+# 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 could (in the future) collect telemetry on how you use Firefly III.
+# In order to allow this, change the following variable to true:
+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=
@@ -104,9 +266,20 @@ PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-IS_DOCKER=false
+USE_ENCRYPTION=false
 IS_SANDSTORM=false
+IS_DOCKER=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+
+#
+# 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

.env.sandstorm

@@ -1,112 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=local
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=false
-
-# This should be your email address
-SITE_OWNER=sandstorm@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
-APP_KEY=SomeRandomStringOf32CharsExactly
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-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.
-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.
-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
-
-# 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.
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=firefly
-DB_USERNAME=firefly
-DB_PASSWORD=firefly
-
-# If you're looking for performance improvements, you could install memcached.
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-# Cookie settings. Should not be necessary to change these.
-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
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-# Other mail drivers:
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
-MANDRILL_SECRET=
-SPARKPOST_SECRET=
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-
-# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-MAPBOX_API_KEY=
-
-# 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 severly limited
-# the free API up to the point where you might as well offer nothing.
-FIXER_API_KEY=
-
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
-
-# 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
-
-# Leave the following configuration vars as is.
-# Unless you like to tinker and know what you're doing.
-APP_NAME=FireflyIII
-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=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-IS_DOCKER=false
-IS_SANDSTORM=true
-IS_HEROKU=false
-BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=

.env.testing

@@ -1,112 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=testing
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=true
-
-# This should be your email address
-SITE_OWNER=thegrumpydictator+testing@gmail.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
-APP_KEY=TestTestTestTestTestTestTestTest
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-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.
-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.
-LOG_CHANNEL=dailytest
-
-# 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
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=sqlite
-
-
-
-
-
-
-# If you're looking for performance improvements, you could install memcached.
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-# Cookie settings. Should not be necessary to change these.
-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
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-# Other mail drivers:
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
-MANDRILL_SECRET=
-SPARKPOST_SECRET=
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=false
-
-# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-MAPBOX_API_KEY=
-
-# 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 severly limited
-# the free API up to the point where you might as well offer nothing.
-FIXER_API_KEY=
-
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
-
-# 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=false
-
-# Leave the following configuration vars as is.
-# Unless you like to tinker and know what you're doing.
-APP_NAME=FireflyIII
-BROADCAST_DRIVER=log
-QUEUE_DRIVER=sync
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-CACHE_PREFIX=firefly_tst
-SEARCH_RESULT_LIMIT=50
-PUSHER_KEY=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-IS_DOCKER=false
-IS_SANDSTORM=false
-IS_HEROKU=false
-BUNQ_USE_SANDBOX=true
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -5,18 +5,21 @@ about: Create a report to help Firefly III improve
 ---
 
 **Bug description**
-I am running Firefly III version x.x.x
+I am running Firefly III version x.x.x, and my problem is:
 
-(please give a clear and concise description of what the bug is)
+<!-- Replace the version and describe your problem or your issue may be closed. -->
 
 **Steps to reproduce**
-What do you need to do to trigger this bug?
+<!-- 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). -->
 
 **Bonus points**
-Earn bonus points by:
+<!-- Before you submit, verify the following please: -->
 
-- Post a stacktrace from your log files
-- Add a screenshot
+- 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

@@ -4,24 +4,20 @@ about: Ask away!
 
 ---
 
-I am running Firefly III version x.x.x
+I am running Firefly III version x.x.x.
 
 **Description**
-
-
-
-**Steps to reproduce** 
-(if relevant of course)
-
-
+<!-- (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). --> 
 
 **Bonus points**
-Earn bonus points by:
 
-- Add a screenshot
-- Replicate the problem on the demo site https://demo.firefly-iii.org/
+<!-- 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:)-->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -5,17 +5,27 @@ about: Suggest an idea or feature for Firefly III
 ---
 
 **Description**
+<!--
 Please describe your feature request:
 
-- I would like Firefly III to do X.
-- What if you would add feature Y?
-- Firefly III doesn't do Z.
+- I would like Firefly III to do ABC.
+- What if you would add feature XYZ?
+- Firefly III doesn't do DEF.
+
+-->
 
 **Solution**
-Describe what your feature would add to Firefly III.
+<!-- Describe what your feature would add to Firefly III. -->
 
 **What are alternatives?**
-Please describe what alternatives currently exist.
+<!-- Please describe what alternatives currently exist. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
+
+**Bonus points**
+<!-- Earn bonus points by:
+
+- Make a drawing
+- Donate money (just kidding ;)
+-->

.github/code_of_conduct.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thegrumpydictator@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

.github/contributing.md

@@ -4,7 +4,7 @@
 
 ## Feature requests
 
-I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:thegrumpydictator@gmail.com).
+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
 

.github/funding.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: jc5
+patreon: JC5
+custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA

.github/lock.yml

@@ -0,0 +1,35 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 90
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/pull_request_template.md

@@ -1,4 +1,13 @@
-Fixes # (if relevant)
+<!--
+Before you create a new PR, please consider the following two considerations.
+
+1) Pull request for the MASTER branch will be closed.
+2) We cannot accept pull requests to add new currencies.
+
+Thanks.
+-->
+
+Fixes issue # (if relevant)
 
 Changes in this pull request:
 

.github/security.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+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
+
+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.
+
+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.
+

.github/stale.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 14
+daysUntilStale: 7
 
 # Number of days of inactivity before a stale Issue or Pull Request is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -13,6 +13,7 @@ exemptLabels:
   - enhancement
   - feature
   - bug
+  - announcement
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false
@@ -53,4 +54,4 @@ limitPerRun: 30
 
 # issues:
 #   exemptLabels:
-#     - confirmed
+#     - confirmed

.github/support.md

@@ -8,4 +8,5 @@ First of all: thank you for reporting a bug instead of ditching the tool altoget
 
 ## Installation problems
 
-Please take the time to read the [installation guide FAQ](https://firefly-iii.org/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.
+Please take the time to read the [documentation](https://docs.firefly-iii.org/) and make sure you search through closed issues for the problems other people
+ have had. Your problem may be among them! If not, open an issue and I will help where I can.

.gitignore

@@ -1,4 +1,5 @@
 /node_modules
+/frontend/node_modules
 /public/hot
 /public/storage
 /storage/*.key
@@ -12,3 +13,4 @@ yarn-error.log
 public/google*.html
 report.html
 composer.phar
+app.js.map

.sandstorm/.gitattributes

@@ -1,5 +0,0 @@
-
-
-# vagrant-spk creates shell scripts, which must end in \n, even on a \r\n system.
-*.sh text eol=lf
-

.sandstorm/.gitignore

@@ -1,5 +0,0 @@
-
-
-# This file stores a list of sub-paths of .sandstorm/ that should be ignored by git.
-.vagrant
-

.sandstorm/Vagrantfile

@@ -1,110 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Guess at a reasonable name for the VM based on the folder vagrant-spk is
-# run from.  The timestamp is there to avoid conflicts if you have multiple
-# folders with the same name.
-VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Time.now.utc.to_i}"
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442
-# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3,
-# remove entirely when confident nobody uses vagrant 1.x for anything.
-unless Vagrant::DEFAULT_SERVER_URL.frozen?
-  Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
-end
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
-  config.vm.box = "debian/contrib-jessie64"
-
-  if Vagrant.has_plugin?("vagrant-vbguest") then
-    # vagrant-vbguest is a Vagrant plugin that upgrades
-    # the version of VirtualBox Guest Additions within each
-    # guest. If you have the vagrant-vbguest plugin, then it
-    # needs to know how to compile kernel modules, etc., and so
-    # we give it this hint about operating system type.
-    config.vm.guest = "debian"
-  end
-
-  # We forward port 6080, the Sandstorm web port, so that developers can
-  # visit their sandstorm app from their browser as local.sandstorm.io:6080
-  # (aka 127.0.0.1:6080).
-  config.vm.network :forwarded_port, guest: 6080, host: 6080
-
-  # Use a shell script to "provision" the box. This installs Sandstorm using
-  # the bundled installer.
-  config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/global-setup.sh", keep_color: true
-  # Then, do stack-specific and app-specific setup.
-  config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/setup.sh", keep_color: true
-
-  # Shared folders are configured per-provider since vboxsf can't handle >4096 open files,
-  # NFS requires privilege escalation every time you bring a VM up,
-  # and 9p is only available on libvirt.
-
-  # Calculate the number of CPUs and the amount of RAM the system has,
-  # in a platform-dependent way; further logic below.
-  cpus = nil
-  total_kB_ram = nil
-
-  host = RbConfig::CONFIG['host_os']
-  if host =~ /darwin/
-    cpus = `sysctl -n hw.ncpu`.to_i
-    total_kB_ram =  `sysctl -n hw.memsize`.to_i / 1024
-  elsif host =~ /linux/
-    cpus = `nproc`.to_i
-    total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i
-  elsif host =~ /mingw/
-    # powershell may not be available on Windows XP and Vista, so wrap this in a rescue block
-    begin
-      cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i
-      total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024
-    rescue
-    end
-  end
-  # Use the same number of CPUs within Vagrant as the system, with 1
-  # as a default.
-  #
-  # Use at least 512MB of RAM, and if the system has more than 2GB of
-  # RAM, use 1/4 of the system RAM. This seems a reasonable compromise
-  # between having the Vagrant guest operating system not run out of
-  # RAM entirely (which it basically would if we went much lower than
-  # 512MB) and also allowing it to use up a healthily large amount of
-  # RAM so it can run faster on systems that can afford it.
-  if cpus.nil? or cpus.zero?
-    cpus = 1
-  end
-  if total_kB_ram.nil? or total_kB_ram < 2048000
-    assign_ram_mb = 512
-  else
-    assign_ram_mb = (total_kB_ram / 1024 / 4)
-  end
-  # Actually apply these CPU/memory values to the providers.
-  config.vm.provider :virtualbox do |vb, override|
-    vb.cpus = cpus
-    vb.memory = assign_ram_mb
-    vb.name = VM_NAME
-    vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"]
-
-    # /opt/app and /host-dot-sandstorm are used by vagrant-spk
-    override.vm.synced_folder "..", "/opt/app"
-    override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm"
-    # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
-    # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
-    override.vm.synced_folder "..", "/vagrant", disabled: true
-  end
-  config.vm.provider :libvirt do |libvirt, override|
-    libvirt.cpus = cpus
-    libvirt.memory = assign_ram_mb
-    libvirt.default_prefix = VM_NAME
-
-    # /opt/app and /host-dot-sandstorm are used by vagrant-spk
-    override.vm.synced_folder "..", "/opt/app", type: "9p", accessmode: "passthrough"
-    override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm", type: "9p", accessmode: "passthrough"
-    # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
-    # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
-    override.vm.synced_folder "..", "/vagrant", type: "9p", accessmode: "passthrough", disabled: true
-  end
-end

.sandstorm/build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# Checks if there's a composer.json, and if so, installs/runs composer.
-# This script only runs once, when the app connects to sandstorm.
-set -euo pipefail
-
-echo "In build.sh"
-
-cd /opt/app
-cp .env.sandstorm .env
-
-if [ -f /opt/app/composer.json ] ; then
-    if [ ! -f composer.phar ] ; then
-        curl -sS https://getcomposer.org/installer | php
-    fi
-    php composer.phar install --no-dev --no-suggest
-fi
-
-# link storage folder
-rm -rf /opt/app/storage
-ln -s /var/storage /opt/app

.sandstorm/changelog.md

@@ -1,343 +0,0 @@
-# 4.7.6.1
-- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both.
-- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers
-- Docker build gave a cURL error whenever it runs PHP commands.
-
-# 4.7.6
-- [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB.
-- [Issue 306](https://github.com/firefly-iii/firefly-iii/issues/306) You can now add liabilities to Firefly III.
-- [Issue 740](https://github.com/firefly-iii/firefly-iii/issues/740) Various charts are now currency aware.
-- [Issue 833](https://github.com/firefly-iii/firefly-iii/issues/833) Bills can use non-default currencies.
-- [Issue 1578](https://github.com/firefly-iii/firefly-iii/issues/1578) Firefly III will notify you if the cron job hasn't fired.
-- [Issue 1623](https://github.com/firefly-iii/firefly-iii/issues/1623) New transactions will link back from the success message.
-- [Issue 1624](https://github.com/firefly-iii/firefly-iii/issues/1624) transactions will link to the object.
-- You can call the cron job over the web now (see docs).
-- You don't need to call the cron job every minute any more.
-- Various charts are now red/green to signify income and expenses.
-- Option to add or remove accounts from the net worth calculations.
-- This will be the last release on PHP 7.1. Future versions will require PHP 7.2.
-- [Issue 1460](https://github.com/firefly-iii/firefly-iii/issues/1460) Downloading transactions from bunq should go more smoothly.
-- [Issue 1464](https://github.com/firefly-iii/firefly-iii/issues/1464) Fixed the docker file to work on Raspberry Pi's.
-- [Issue 1540](https://github.com/firefly-iii/firefly-iii/issues/1540) The Docker file now has a working cron job for recurring transactions.
-- [Issue 1564](https://github.com/firefly-iii/firefly-iii/issues/1564) Fix double transfers when importing from bunq.
-- [Issue 1575](https://github.com/firefly-iii/firefly-iii/issues/1575) Some views would give a XSRF token warning
-- [Issue 1576](https://github.com/firefly-iii/firefly-iii/issues/1576) Fix assigning budgets
-- [Issue 1580](https://github.com/firefly-iii/firefly-iii/issues/1580) Missing string for translation
-- [Issue 1581](https://github.com/firefly-iii/firefly-iii/issues/1581) Expand help text
-- [Issue 1584](https://github.com/firefly-iii/firefly-iii/issues/1584) Link to administration is back.
-- [Issue 1586](https://github.com/firefly-iii/firefly-iii/issues/1586) Date fields in import were mislabeled.
-- [Issue 1593](https://github.com/firefly-iii/firefly-iii/issues/1593) Link types are translatable.
-- [Issue 1594](https://github.com/firefly-iii/firefly-iii/issues/1594) Very long breadcrumbs are weird.
-- [Issue 1598](https://github.com/firefly-iii/firefly-iii/issues/1598) Fix budget calculations.
-- [Issue 1597](https://github.com/firefly-iii/firefly-iii/issues/1597) Piggy banks are always inactive.
-- [Issue 1605](https://github.com/firefly-iii/firefly-iii/issues/1605) System will ignore foreign currency setting if user doesn't indicate the amount.
-- [Issue 1608](https://github.com/firefly-iii/firefly-iii/issues/1608) Spelling error in command line import.
-- [Issue 1609](https://github.com/firefly-iii/firefly-iii/issues/1609) Link to budgets page was absolute.
-- [Issue 1615](https://github.com/firefly-iii/firefly-iii/issues/1615) Fix currency bug in transactions.
-- [Issue 1616](https://github.com/firefly-iii/firefly-iii/issues/1616) Fix null pointer exception in pie charts.
-- [Issue 1617](https://github.com/firefly-iii/firefly-iii/issues/1617) Fix for complex tag names in URL's.
-- [Issue 1620](https://github.com/firefly-iii/firefly-iii/issues/1620) Fixed index reference in API.
-- [Issue 1639](https://github.com/firefly-iii/firefly-iii/issues/1639) Firefly III trusts the Heroku load balancer, fixing deployment on Heroku.
-- [Issue 1642](https://github.com/firefly-iii/firefly-iii/issues/1642) Fix issue with split journals.
-- [Issue 1643](https://github.com/firefly-iii/firefly-iii/issues/1643) Fix reconciliation issue.
-- Users can no longer give expenses a budget.
-- Fix bug in Spectre import.
-- Heroku would not make you owner.
-- Add `.htaccess` files to all public directories.
-- New secure headers will make Firefly III slightly more secure.
-
-# 4.7.5.3
-- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget.
-- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system.
-- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget.
-- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart.
-- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount
-- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm
-- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code.
-- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie)
-- Fixed a bug where transfers would be stored inversely when using the CSV import.
-- Retired the "Rabobank description"-fix, because it is no longer necessary.
-- Fixed a bug where users could not delete budget limits in the API.
-- Piggy bank notes are visible again.
-
-# 4.7.5.1
-- [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories.
-- [Issue 1532](https://github.com/firefly-iii/firefly-iii/issues/1532), broken dropdown for autosuggest things.
-- [Issue 1533](https://github.com/firefly-iii/firefly-iii/issues/1533), fix where the import could not import category names.
-- [Issue 1538](https://github.com/firefly-iii/firefly-iii/issues/1538), fix a bug where Spectre would not work when ignoring rules.
-- [Issue 1542](https://github.com/firefly-iii/firefly-iii/issues/1542), fix a bug where the importer was incapable of generating new currencies.
-- [Issue 1541](https://github.com/firefly-iii/firefly-iii/issues/1541), no longer ignore composer.lock in Docker ignore.
-- Bills are stored inactive.
-
-# 4.7.5
-- A new feature called "recurring transactions" that will make Firefly III automatically create transactions for you.
-- New API end points for attachments, available budgets, budgets, budget limits, categories, configuration, currency exchange rates, journal links, link types, piggy banks, preferences, recurring transactions, rules, rule groups and tags.
-- Added support for YunoHost.
-- The 2FA secret is visible so you can type it into 2FA apps.
-- Bunq and Spectre imports will now ask to apply rules.
-- Sandstorm users can now make API keys.
-- Various typo's in the English translations. [issue 1493](https://github.com/firefly-iii/firefly-iii/issues/1493)
-- Bug where Spectre was never called [issue 1492](https://github.com/firefly-iii/firefly-iii/issues/1492)
-- Clear cache after journal is created through API [issue 1483](https://github.com/firefly-iii/firefly-iii/issues/1483)
-- Make sure docker directories exist [issue 1500](https://github.com/firefly-iii/firefly-iii/issues/1500)
-- Broken link to bill edit [issue 1505](https://github.com/firefly-iii/firefly-iii/issues/1505)
-- Several bugs in the editing of split transactions [issue 1509](https://github.com/firefly-iii/firefly-iii/issues/1509)
-- Import routine ignored formatting of several date fields [issue 1510](https://github.com/firefly-iii/firefly-iii/issues/1510)
-- Piggy bank events now show the correct currency [issue 1446](https://github.com/firefly-iii/firefly-iii/issues/1446)
-- Inactive accounts are no longer suggested [issue 1463](https://github.com/firefly-iii/firefly-iii/issues/1463)
-- Some income / expense charts are less confusing [issue 1518](https://github.com/firefly-iii/firefly-iii/issues/1518)
-- Validation bug in multi-currency create view [issue 1521](https://github.com/firefly-iii/firefly-iii/issues/1521)
-
-# 4.7.4
-- [Issue 1409](https://github.com/firefly-iii/firefly-iii/issues/1409), add Indian Rupee and explain that users can do this themselves [issue 1413](https://github.com/firefly-iii/firefly-iii/issues/1413)
-- [Issue 1445](https://github.com/firefly-iii/firefly-iii/issues/1445), upgrade Curl in Docker image.
-- [Issue 1386](https://github.com/firefly-iii/firefly-iii/issues/1386), quick links to often used pages.
-- [Issue 1405](https://github.com/firefly-iii/firefly-iii/issues/1405), show proposed amount to piggy banks.
-- [Issue 1416](https://github.com/firefly-iii/firefly-iii/issues/1416), ability to delete lost attachments.
-- A completely rewritten import routine that can handle bunq (thanks everybody for testing!), CSV files and Spectre. Please make sure you read about this at http://bit.ly/FF3-new-import
-- [Issue 1392](https://github.com/firefly-iii/firefly-iii/issues/1392), explicitly mention rules are inactive (when they are).
-- [Issue 1406](https://github.com/firefly-iii/firefly-iii/issues/1406), bill conversion to rules will be smarter about the rules they create.
-- [Issue 1369](https://github.com/firefly-iii/firefly-iii/issues/1369), you can now properly order piggy banks again.
-- [Issue 1389](https://github.com/firefly-iii/firefly-iii/issues/1389), null-pointer in the import routine.
-- [Issue 1400](https://github.com/firefly-iii/firefly-iii/issues/1400), missing translation.
-- [Issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403), bill would always be marked as inactive in edit screen.
-- [Issue 1418](https://github.com/firefly-iii/firefly-iii/issues/1418), missing note text on bill page.
-- Export routine would break when encountering un-decryptable files.
-- [Issue 1425](https://github.com/firefly-iii/firefly-iii/issues/1425), empty fields when edit multiple transactions at once.
-- [Issue 1449](https://github.com/firefly-iii/firefly-iii/issues/1449), bad calculations in "budget left to spend" view.
-- [Issue 1451](https://github.com/firefly-iii/firefly-iii/issues/1451), same but in another view.
-- [Issue 1453](https://github.com/firefly-iii/firefly-iii/issues/1453), same as [issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403).
-- [Issue 1455](https://github.com/firefly-iii/firefly-iii/issues/1455), could add income to a budget.
-- [Issue 1442](https://github.com/firefly-iii/firefly-iii/issues/1442), issues with editing a split deposit.
-- [Issue 1452](https://github.com/firefly-iii/firefly-iii/issues/1452), date range problems with tags.
-- [Issue 1458](https://github.com/firefly-iii/firefly-iii/issues/1458), same for transactions.
-- [Issue 1415](https://github.com/firefly-iii/firefly-iii/issues/1415), will email you when OAuth2 keys are generated.
-
-# 4.7.3.2
-- Forgot to increase the version number :(.
-
-# 4.7.3.1
-- Fixed a critical bug where the rules-engine would fire inadvertently.
-
-# 4.7.3
-- Currency added to API
-- Firfely III will also generate a cash wallet for new users.
-- Can now reset Spectre and bunq settings
-- Docker file has a time zone
-- Allow database connection to be configured in Docker file
-- Can now view and edit attachments in edit-screen
-- User can visit hidden `/attachments` page
-- [Issue 1356](https://github.com/firefly-iii/firefly-iii/issues/1356): Budgets will show the remaining amount per day
-- [Issue 1367](https://github.com/firefly-iii/firefly-iii/issues/1367): Rules now come in strict and non-strict mode.
-- Added a security.txt
-- More support for trusted proxies
-- Improved edit routine for split transactions.
-- Upgrade routine can handle `proc_close` being disabled.
-- Bills now use rules to match transactions, making it more flexible.
-- [Issue 1328](https://github.com/firefly-iii/firefly-iii/issues/1328): piggy banks no have a more useful chart.
-- Spectre API upgraded to v4
-- Move to MariaDB ([issue 1366](https://github.com/firefly-iii/firefly-iii/issues/1366))
-- Piggy banks take currency from parent account ([issue 1334](https://github.com/firefly-iii/firefly-iii/issues/1334))
-- [Issue 1341](https://github.com/firefly-iii/firefly-iii/issues/1341): Removed depricated command from dockerfile
-- Several issues with docker image ([issue 1320](https://github.com/firefly-iii/firefly-iii/issues/1320), [issue 1382](https://github.com/firefly-iii/firefly-iii/issues/1382)).
-- Fix giant tags and division by zero ([issue 1325](https://github.com/firefly-iii/firefly-iii/issues/1325) and others)
-- Several issues with bunq import ([issue 1352](https://github.com/firefly-iii/firefly-iii/issues/1352), [issue 1330](https://github.com/firefly-iii/firefly-iii/issues/1330), [issue 1378](https://github.com/firefly-iii/firefly-iii/issues/1378), [issue 1380](https://github.com/firefly-iii/firefly-iii/issues/1380))
-- [Issue 1246](https://github.com/firefly-iii/firefly-iii/issues/1246): date picker is internationalised
-- [Issue 1327](https://github.com/firefly-iii/firefly-iii/issues/1327): fix formattting issues in piggy banks
-- [Issue 1348](https://github.com/firefly-iii/firefly-iii/issues/1348): 500 error in API
-- [Issue 1349](https://github.com/firefly-iii/firefly-iii/issues/1349): Errors in import routine
-- Several fixes for (multi-currency) reconciliation ([issue 1336](https://github.com/firefly-iii/firefly-iii/issues/1336), [issue 1363](https://github.com/firefly-iii/firefly-iii/issues/1363))
-- [Issue 1353](https://github.com/firefly-iii/firefly-iii/issues/1353): return NULL values in range-indicator
-- Bug in split transaction edit routine
-- Piggy bank percentage was very specific.
-- Logging in Slack is easier to config.
-- [Issue 1312](https://github.com/firefly-iii/firefly-iii/issues/1312) Import broken for ING accounts
-- [Issue 1313](https://github.com/firefly-iii/firefly-iii/issues/1313) Error when creating new asset account
-- [Issue 1317](https://github.com/firefly-iii/firefly-iii/issues/1317) Forgot an include :(
-- Null pointer exception in transaction overview.
-- Installations running in subdirs were incapable of creating OAuth tokens.
-- OAuth keys were not created in all cases.
-
-# 4.7.2
-- [Issue 1123](https://github.com/firefly-iii/firefly-iii/issues/1123) First browser based update routine.
-- Add support for Italian.
-- [Issue 1232](https://github.com/firefly-iii/firefly-iii/issues/1232) Allow user to specify Docker database port.
-- [Issue 1197](https://github.com/firefly-iii/firefly-iii/issues/1197) Beter account list overview 
-- [Issue 1202](https://github.com/firefly-iii/firefly-iii/issues/1202) Some budgetary warnings 
-- [Issue 1284](https://github.com/firefly-iii/firefly-iii/issues/1284) Experimental support for bunq import
-- [Issue 1248](https://github.com/firefly-iii/firefly-iii/issues/1248) Ability to import BIC, ability to import SEPA fields. 
-- [Issue 1102](https://github.com/firefly-iii/firefly-iii/issues/1102) Summary line for bills 
-- More info to debug page.
-- [Issue 1186](https://github.com/firefly-iii/firefly-iii/issues/1186) You can see the latest account balance in CRUD forms 
-- Add Kubernetes YAML files, kindly created by a FF3 user.
-- [Issue 1244](https://github.com/firefly-iii/firefly-iii/issues/1244) Better line for "today" marker and add it to other chart as well ([issue 1214](https://github.com/firefly-iii/firefly-iii/issues/1214))
-- [Issue 1219](https://github.com/firefly-iii/firefly-iii/issues/1219) Languages in dropdown 
-- [Issue 1189](https://github.com/firefly-iii/firefly-iii/issues/1189) Inactive accounts get removed from net worth 
-- [Issue 1220](https://github.com/firefly-iii/firefly-iii/issues/1220) Attachment description and notes migrated to just "notes". 
-- [Issue 1236](https://github.com/firefly-iii/firefly-iii/issues/1236) Multi currency balance box 
-- [Issue 1240](https://github.com/firefly-iii/firefly-iii/issues/1240) Better overview for accounts. 
-- [Issue 1292](https://github.com/firefly-iii/firefly-iii/issues/1292) Removed some charts from the "all"-overview of budgets and categories 
-- [Issue 1245](https://github.com/firefly-iii/firefly-iii/issues/1245) Improved recognition of IBANs 
-- Improved import routine.
-- Update notifier will wait three days before notifying users.
-- [Issue 1300](https://github.com/firefly-iii/firefly-iii/issues/1300) Virtual balance of credit cards does not count for net worth 
-- [Issue 1247](https://github.com/firefly-iii/firefly-iii/issues/1247) Can now see overspent amount 
-- [Issue 1221](https://github.com/firefly-iii/firefly-iii/issues/1221) Upgrade to Laravel 5.6 
-- [Issue 1187](https://github.com/firefly-iii/firefly-iii/issues/1187) Updated the password verifier to use Troy Hunt's new API 
-- Revenue chart is now on frontpage permanently
-- [Issue 1153](https://github.com/firefly-iii/firefly-iii/issues/1153) 2FA settings are in your profile now 
-- [Issue 1227](https://github.com/firefly-iii/firefly-iii/issues/1227) Can set the timezone in config or in Docker 
-- [Issue 1294](https://github.com/firefly-iii/firefly-iii/issues/1294) Ability to link a transaction to itself 
-- Correct reference to journal description in split form.
-- [Issue 1234](https://github.com/firefly-iii/firefly-iii/issues/1234) Fix budget page issues in SQLite 
-- [Issue 1262](https://github.com/firefly-iii/firefly-iii/issues/1262) Can now use double and epty headers in CSV files 
-- [Issue 1258](https://github.com/firefly-iii/firefly-iii/issues/1258) Fixed a possible date mismatch in piggy banks
-- [Issue 1283](https://github.com/firefly-iii/firefly-iii/issues/1283) Bulk delete was broken 
-- [Issue 1293](https://github.com/firefly-iii/firefly-iii/issues/1293) Layout problem with notes 
-- [Issue 1257](https://github.com/firefly-iii/firefly-iii/issues/1257) Improve transaction lists query count 
-- [Issue 1291](https://github.com/firefly-iii/firefly-iii/issues/1291) Fixer IO problems 
-- [Issue 1239](https://github.com/firefly-iii/firefly-iii/issues/1239) Could not edit expense or revenue accounts ([issue 1298](https://github.com/firefly-iii/firefly-iii/issues/1298)) 
-- [Issue 1297](https://github.com/firefly-iii/firefly-iii/issues/1297) Could not convert to withdrawal 
-- [Issue 1226](https://github.com/firefly-iii/firefly-iii/issues/1226) Category overview in default report shows no income. 
-- Various other bugs and problems ([issue 1198](https://github.com/firefly-iii/firefly-iii/issues/1198), [issue 1213](https://github.com/firefly-iii/firefly-iii/issues/1213), [issue 1237](https://github.com/firefly-iii/firefly-iii/issues/1237), [issue 1238](https://github.com/firefly-iii/firefly-iii/issues/1238), [issue 1199](https://github.com/firefly-iii/firefly-iii/issues/1199), [issue 1200](https://github.com/firefly-iii/firefly-iii/issues/1200))
-- Fixed an issue with token validation on the command line.
-
-# 4.7.1
-- A brand new API. Read about it in the [documentation](http://firefly-iii.readthedocs.io/en/latest/).
-- Add support for Spanish. [issue 1194](https://github.com/firefly-iii/firefly-iii/issues/1194)
-- Some custom preferences are selected by default for a better user experience.
-- Some new currencies [issue 1211](https://github.com/firefly-iii/firefly-iii/issues/1211)
-- Fixed [issue 1155](https://github.com/firefly-iii/firefly-iii/issues/1155) (reported by [ndandanov](https://github.com/ndandanov))
-- [Issue 1156](https://github.com/firefly-iii/firefly-iii/issues/1156) [issue 1182](https://github.com/firefly-iii/firefly-iii/issues/1182) and other issues related to SQLite databases.
-- Multi-page budget overview was broken (reported by [jinformatique](https://github.com/jinformatique))
-- Importing CSV files with semi-colons in them did not work [issue 1172](https://github.com/firefly-iii/firefly-iii/issues/1172) [issue 1183](https://github.com/firefly-iii/firefly-iii/issues/1183) [issue 1210](https://github.com/firefly-iii/firefly-iii/issues/1210)
-- Could not use account number that was in use by a deleted account [issue 1174](https://github.com/firefly-iii/firefly-iii/issues/1174) 
-- Fixed spelling error that lead to 404's [issue 1175](https://github.com/firefly-iii/firefly-iii/issues/1175) [issue 1190](https://github.com/firefly-iii/firefly-iii/issues/1190)
-- Fixed tag autocomplete [issue 1178](https://github.com/firefly-iii/firefly-iii/issues/1178)
-- Better links for "new transaction" buttons [issue 1185](https://github.com/firefly-iii/firefly-iii/issues/1185)
-- Cache errors in budget charts [issue 1192](https://github.com/firefly-iii/firefly-iii/issues/1192)
-- Deleting transactions that are linked to other other transactions would lead to errors [issue 1209](https://github.com/firefly-iii/firefly-iii/issues/1209)
-
-# 4.7.0
-- Support for Russian and Portuguese (Brazil)
-- Support for the Spectre API (Salt Edge)
-- Many strings now translatable thanks to [Nik-vr](https://github.com/Nik-vr) ([issue 1118](https://github.com/firefly-iii/firefly-iii/issues/1118), [issue 1116](https://github.com/firefly-iii/firefly-iii/issues/1116), [issue 1109](https://github.com/firefly-iii/firefly-iii/issues/1109), )
-- Many buttons to quickly create stuff
-- Sum of tables in reports, requested by [MacPaille](https://github.com/MacPaille) ([issue 1106](https://github.com/firefly-iii/firefly-iii/issues/1106))
-- Future versions of Firefly III will notify you there is a new version, as suggested by [8bitgentleman](https://github.com/8bitgentleman) in [issue 1050](https://github.com/firefly-iii/firefly-iii/issues/1050)
-- Improved net worth box [issue 1101](https://github.com/firefly-iii/firefly-iii/issues/1101) ([Nik-vr](https://github.com/Nik-vr))
-- Nice dropdown in transaction list [issue 1082](https://github.com/firefly-iii/firefly-iii/issues/1082)
-- Better support for local fonts thanks to [devlearner](https://github.com/devlearner) ([issue 1145](https://github.com/firefly-iii/firefly-iii/issues/1145))
-- Improve attachment support and view capabilities (suggested by [trinhit](https://github.com/trinhit) in [issue 1146](https://github.com/firefly-iii/firefly-iii/issues/1146))
-- Whole new [read me file](https://github.com/firefly-iii/firefly-iii/blob/master/readme.md), [new end user documentation](https://firefly-iii.readthedocs.io/en/latest/) and an [updated website](https://www.firefly-iii.org/)!
-- Many charts and info-blocks now scale property ([issue 989](https://github.com/firefly-iii/firefly-iii/issues/989) and [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040))
-- Charts work in IE thanks to [devlearner](https://github.com/devlearner) ([issue 1107](https://github.com/firefly-iii/firefly-iii/issues/1107))
-- Various fixes in import routine
-- Bug that left charts empty ([issue 1088](https://github.com/firefly-iii/firefly-iii/issues/1088)), reported by various users amongst which [jinformatique](https://github.com/jinformatique)
-- [Issue 1124](https://github.com/firefly-iii/firefly-iii/issues/1124), as reported by [gavu](https://github.com/gavu)
-- [Issue 1125](https://github.com/firefly-iii/firefly-iii/issues/1125), as reported by [gavu](https://github.com/gavu)
-- [Issue 1126](https://github.com/firefly-iii/firefly-iii/issues/1126), as reported by [gavu](https://github.com/gavu)
-- [Issue 1131](https://github.com/firefly-iii/firefly-iii/issues/1131), as reported by [dp87](https://github.com/dp87)
-- [Issue 1129](https://github.com/firefly-iii/firefly-iii/issues/1129), as reported by [gavu](https://github.com/gavu)
-- [Issue 1132](https://github.com/firefly-iii/firefly-iii/issues/1132), as reported by [gavu](https://github.com/gavu)
-- Issue with cache in Sandstorm ([issue 1130](https://github.com/firefly-iii/firefly-iii/issues/1130))
-- [Issue 1134](https://github.com/firefly-iii/firefly-iii/issues/1134)
-- [Issue 1140](https://github.com/firefly-iii/firefly-iii/issues/1140)
-- [Issue 1141](https://github.com/firefly-iii/firefly-iii/issues/1141), reported by [ErikFontanel](https://github.com/ErikFontanel)
-- [Issue 1142](https://github.com/firefly-iii/firefly-iii/issues/1142)
-- Removed many access rights from the demo user
-
-# 4.6.13
-- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
-- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
-- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
-- Support for Turkish.
-- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
-- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
-- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
-- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
-- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
-- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
-- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
-- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
-- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
-- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
-- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
-- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
-- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
-
-# 4.6.12
-- Support for Indonesian.
-- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
-- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
-- Greatly improved Docker support and documentation.
-- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
-- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
-- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
-- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner) 
-- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reporterd by a user on Tweakers.net
-- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion) 
-- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
-- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
-- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
-- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
-- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
-- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
-- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
-
-# 4.6.1.1
-- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
-- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu) 
-- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
-- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
-- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
-- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
-- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
-- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
-- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
-- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
-- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
-
-# 4.6.11
-- A debug page at `/debug` for easier debug.
-- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)
-- Even more strings are translatable (and translated), thanks to [pkoziol](https://github.com/pkoziol) (see [issue 979](https://github.com/firefly-iii/firefly-iii/issues/979))
-- Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
-- Extended currency list, as suggested by @emuhendis in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
-- [Issue 996](https://github.com/firefly-iii/firefly-iii/issues/996) as suggested by [dp87](https://github.com/dp87)
-- Disabled Heroku support until I get it working again.
-- [Issue 980](https://github.com/firefly-iii/firefly-iii/issues/980), reported by [Tim-Frensch](https://github.com/Tim-Frensch)
-- [Issue 987](https://github.com/firefly-iii/firefly-iii/issues/987), reported by [gavu](https://github.com/gavu)
-- [Issue 988](https://github.com/firefly-iii/firefly-iii/issues/988), reported by [gavu](https://github.com/gavu)
-- [Issue 992](https://github.com/firefly-iii/firefly-iii/issues/992), reported by [ncicovic](https://github.com/ncicovic)
-- [Issue 993](https://github.com/firefly-iii/firefly-iii/issues/993), reported by [gavu](https://github.com/gavu)
-- [Issue 997](https://github.com/firefly-iii/firefly-iii/issues/997), reported by [gavu](https://github.com/gavu)
-- [Issue 1000](https://github.com/firefly-iii/firefly-iii/issues/1000), reported by [xpfgsyb](https://github.com/xpfgsyb)
-- [Issue 1001](https://github.com/firefly-iii/firefly-iii/issues/1001), reported by [gavu](https://github.com/gavu)
-- [Issue 1002](https://github.com/firefly-iii/firefly-iii/issues/1002), reported by [ursweiss](https://github.com/ursweiss)
-- [Issue 1003](https://github.com/firefly-iii/firefly-iii/issues/1003), reported by [ursweiss](https://github.com/ursweiss)
-- [Issue 1004](https://github.com/firefly-iii/firefly-iii/issues/1004), reported by [Aquariu](https://github.com/Aquariu)
-- [Issue 1010](https://github.com/firefly-iii/firefly-iii/issues/1010)
-- [Issue 1014](https://github.com/firefly-iii/firefly-iii/issues/1014), reported by [ursweiss](https://github.com/ursweiss)
-- [Issue 1016](https://github.com/firefly-iii/firefly-iii/issues/1016)
-- [Issue 1024](https://github.com/firefly-iii/firefly-iii/issues/1024), reported by [gavu](https://github.com/gavu)
-- [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
-
-# 4.6.10
-- Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619)
-- [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu)
-- Improved Sandstorm support.
-- [Issue 963](https://github.com/firefly-iii/firefly-iii/issues/963), as reported by [gavu](https://github.com/gavu)
-- [Issue 970](https://github.com/firefly-iii/firefly-iii/issues/970), as reported by [gavu](https://github.com/gavu)
-- [Issue 971](https://github.com/firefly-iii/firefly-iii/issues/971), as reported by [gavu](https://github.com/gavu)
-- Various Sandstorm.io related issues.
-
-# 4.6.9.1
-- Updated license
-- Updated file list
-
-# 4.6.9
-- First version that works!
-
-# 3.4.3
-- Initial release on Sandstorm.io

.sandstorm/description.md

@@ -1,3 +0,0 @@
-"Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared household accounts and savings accounts! It’s pretty fancy. You should use it to save and organise money.
-
-Firefly works on the principle that if you know where you’re money is going, you can stop it from going there.

.sandstorm/global-setup.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Set options for curl. Since we only want to show errors from these curl commands, we also use
-# 'cat' to buffer the output; for more information:
-# https://github.com/sandstorm-io/vagrant-spk/issues/158
-
-CURL_OPTS="--silent --show-error"
-echo localhost > /etc/hostname
-hostname localhost
-
-# Install curl that is needed below.
-apt-get update
-apt-get install -y curl
-
-# The following line copies stderr through stderr to cat without accidentally leaving it in the
-# output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159
-curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat
-
-SANDSTORM_CURRENT_VERSION=$(curl $CURL_OPTS -f "https://install.sandstorm.io/dev?from=0&type=install")
-SANDSTORM_PACKAGE="sandstorm-$SANDSTORM_CURRENT_VERSION.tar.xz"
-if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then
-    echo -n "Downloading Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
-    curl $CURL_OPTS --output "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "https://dl.sandstorm.io/$SANDSTORM_PACKAGE" 2>&1 | cat
-    mv "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE"
-    echo "...done."
-fi
-if [ ! -e /opt/sandstorm/latest/sandstorm ] ; then
-    echo -n "Installing Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
-    bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null
-    echo "...done."
-fi
-modprobe ip_tables
-# Make the vagrant user part of the sandstorm group so that commands like
-# `spk dev` work.
-usermod -a -G 'sandstorm' 'vagrant'
-# Bind to all addresses, so the vagrant port-forward works.
-sudo sed --in-place='' \
-        --expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' \
-        /opt/sandstorm/sandstorm.conf
-sudo service sandstorm restart
-# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP
-GATEWAY_IP=$(ip route  | grep ^default  | cut -d ' ' -f 3)
-if nc -z "$GATEWAY_IP" 3142 ; then
-    echo "Acquire::http::Proxy \"http://$GATEWAY_IP:3142\";" > /etc/apt/apt.conf.d/80httpproxy
-fi
-# Configure apt to retry fetching things that fail to download.
-echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80sandstorm-retry

.sandstorm/launcher.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Runs every time we create a new grain!
-echo "Now in launcher.sh"
-
-# Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist
-mkdir -p /var/lib/mysql
-mkdir -p /var/lib/nginx
-mkdir -p /var/lib/php/sessions/
-mkdir -p /var/log
-mkdir -p /var/log/mysql
-mkdir -p /var/log/nginx
-# Wipe /var/run, since pidfiles and socket files from previous launches should go away
-# TODO someday: I'd prefer a tmpfs for these.
-rm -rf /var/run
-mkdir -p /var/run
-rm -rf /var/tmp
-mkdir -p /var/tmp
-mkdir -p /var/run/mysqld
-
-# make storage directories
-rm -rf /var/storage
-mkdir -p /var/storage/app/public
-mkdir -p /var/storage/build
-mkdir -p /var/storage/database
-mkdir -p /var/storage/debugbar
-mkdir -p /var/storage/export
-mkdir -p /var/storage/framework/cache
-mkdir -p /var/storage/framework/sessions
-mkdir -p /var/storage/framework/views
-mkdir -p /var/storage/logs
-mkdir -p /var/storage/upload
-
-# Ensure mysql tables created
-HOME=/etc/mysql /usr/bin/mysql_install_db --force
-
-# Spawn mysqld, php
-HOME=/etc/mysql /usr/sbin/mysqld &
-
-/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf &
-
-# Wait until mysql and php have bound their sockets, indicating readiness
-while [ ! -e /var/run/mysqld/mysqld.sock ] ; do
-    echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock"
-    sleep .5
-done
-while [ ! -e /var/run/php7.1-fpm.sock ] ; do
-    echo "waiting for php7.1-fpm to be available at /var/run/php7.1-fpm.sock"
-    sleep .5
-done
-
-echo "Installing database.."
-# Install database for Firefly III
-echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly'@'localhost' IDENTIFIED BY 'firefly';" | mysql -uroot
-echo "Done!"
-
-echo "Migrating..."
-php /opt/app/artisan migrate --seed --force
-echo "Done!"
-
-echo "Clear cache.."
-php /opt/app/artisan cache:clear
-echo "Done"
-
-# Start nginx.
-/usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"

.sandstorm/sandstorm-pkgdef.capnp

@@ -1,187 +0,0 @@
-@0xb0032512fca90cd9;
-
-using Spk = import "/sandstorm/package.capnp";
-# This imports:
-#   $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp
-# Check out that file to see the full, documented package definition format.
-
-const pkgdef :Spk.PackageDefinition = (
-  # The package definition. Note that the spk tool looks specifically for the
-  # "pkgdef" constant.
-
-  id = "uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70",
-  # Your app ID is actually its public key. The private key was placed in
-  # your keyring. All updates must be signed with the same key.
-
-  manifest = (
-    appTitle = (defaultText = "Firefly III"),
-    appVersion = 16,
-    appMarketingVersion = (defaultText = "4.7.6.1"),
-
-    actions = [
-      # Define your "new document" handlers here.
-      ( nounPhrase = (defaultText = "administration"),
-        command = .myCommand
-        # The command to run when starting for the first time. (".myCommand"
-        # is just a constant defined at the bottom of the file.)
-      )
-    ],
-
-    continueCommand = .myCommand,
-    # This is the command called to start your app back up after it has been
-    # shut down for inactivity. Here we're using the same command as for
-    # starting a new instance, but you could use different commands for each
-    # case.
-
-    metadata = (
-         icons = (
-        appGrid = (png = (dpi1x = embed "app-graphics/firefly-iii-128.png")),
-        grain = (png = (dpi1x = embed "app-graphics/firefly-iii-24.png",
-                        dpi2x = embed "app-graphics/firefly-iii-48.png")),
-        market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png"))
-      ),
-
-      website = "https://firefly-iii.org/",
-      codeUrl = "https://github.com/firefly-iii/firefly-iii",
-      license = (openSource = gpl3),
-      # The license this package is distributed under.  See
-      # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license
-
-      categories = [productivity],
-      # A list of categories/genres to which this app belongs, sorted with best fit first.
-      # See the list of categories at
-      # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#categories
-
-      author = (
-        contactEmail = "thegrumpydictator@gmail.com",
-        pgpSignature = embed "pgp-signature",
-      ),
-
-      pgpKeyring = embed "pgp-keyring",
-      description = (defaultText = embed "description.md"),
-      shortDescription = (defaultText = "Financial management"),
-      screenshots = [
-        # Screenshots to use for marketing purposes.  Examples below.
-        # Sizes are given in device-independent pixels, so if you took these
-        # screenshots on a Retina-style high DPI screen, divide each dimension by two.
-
-        (width = 1290, height = 800, png = embed "screenshots/screenshot-1.png"),
-        (width = 1290, height = 800, png = embed "screenshots/screenshot-2.png"),
-        (width = 1290, height = 800, png = embed "screenshots/screenshot-3.png"),
-
-      ],
-      changeLog = (defaultText = embed "changelog.md"),
-    ),
-  ),
-
-  sourceMap = (
-    # Here we defined where to look for files to copy into your package. The
-    # `spk dev` command actually figures out what files your app needs
-    # automatically by running it on a FUSE filesystem. So, the mappings
-    # here are only to tell it where to find files that the app wants.
-    searchPath = [
-      ( sourcePath = "." ),  # Search this directory first.
-      ( sourcePath = "/",    # Then search the system root directory.
-        hidePaths = [ "home", "proc", "sys",
-                      "etc/passwd", "etc/hosts", "etc/host.conf",
-                      "etc/nsswitch.conf", "etc/resolv.conf" ]
-        # You probably don't want the app pulling files from these places,
-        # so we hide them. Note that /dev, /var, and /tmp are implicitly
-        # hidden because Sandstorm itself provides them.
-      )
-    ]
-  ),
-
-  fileList = "sandstorm-files.list",
-  # `spk dev` will write a list of all the files your app uses to this file.
-  # You should review it later, before shipping your app.
-
-  alwaysInclude = ["opt/app/app","opt/app/bootstrap","opt/app/config","opt/app/database","opt/app/public","opt/app/resources","opt/app/routes","opt/app/vendor"],
-  # Fill this list with more names of files or directories that should be
-  # included in your package, even if not listed in sandstorm-files.list.
-  # Use this to force-include stuff that you know you need but which may
-  # not have been detected as a dependency during `spk dev`. If you list
-  # a directory here, its entire contents will be included recursively.
-
-  #bridgeConfig = (
-  #  # Used for integrating permissions and roles into the Sandstorm shell
-  #  # and for sandstorm-http-bridge to pass to your app.
-  #  # Uncomment this block and adjust the permissions and roles to make
-  #  # sense for your app.
-  #  # For more information, see high-level documentation at
-  #  # https://docs.sandstorm.io/en/latest/developing/auth/
-  #  # and advanced details in the "BridgeConfig" section of
-  #  # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp
-  #  viewInfo = (
-  #    # For details on the viewInfo field, consult "ViewInfo" in
-  #    # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
-  #
-  #    permissions = [
-  #    # Permissions which a user may or may not possess.  A user's current
-  #    # permissions are passed to the app as a comma-separated list of `name`
-  #    # fields in the X-Sandstorm-Permissions header with each request.
-  #    #
-  #    # IMPORTANT: only ever append to this list!  Reordering or removing fields
-  #    # will change behavior and permissions for existing grains!  To deprecate a
-  #    # permission, or for more information, see "PermissionDef" in
-  #    # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
-  #      (
-  #        name = "editor",
-  #        # Name of the permission, used as an identifier for the permission in cases where string
-  #        # names are preferred.  Used in sandstorm-http-bridge's X-Sandstorm-Permissions HTTP header.
-  #
-  #        title = (defaultText = "editor"),
-  #        # Display name of the permission, e.g. to display in a checklist of permissions
-  #        # that may be assigned when sharing.
-  #
-  #        description = (defaultText = "grants ability to modify data"),
-  #        # Prose describing what this role means, suitable for a tool tip or similar help text.
-  #      ),
-  #    ],
-  #    roles = [
-  #      # Roles are logical collections of permissions.  For instance, your app may have
-  #      # a "viewer" role and an "editor" role
-  #      (
-  #        title = (defaultText = "editor"),
-  #        # Name of the role.  Shown in the Sandstorm UI to indicate which users have which roles.
-  #
-  #        permissions  = [true],
-  #        # An array indicating which permissions this role carries.
-  #        # It should be the same length as the permissions array in
-  #        # viewInfo, and the order of the lists must match.
-  #
-  #        verbPhrase = (defaultText = "can make changes to the document"),
-  #        # Brief explanatory text to show in the sharing UI indicating
-  #        # what a user assigned this role will be able to do with the grain.
-  #
-  #        description = (defaultText = "editors may view all site data and change settings."),
-  #        # Prose describing what this role means, suitable for a tool tip or similar help text.
-  #      ),
-  #      (
-  #        title = (defaultText = "viewer"),
-  #        permissions  = [false],
-  #        verbPhrase = (defaultText = "can view the document"),
-  #        description = (defaultText = "viewers may view what other users have written."),
-  #      ),
-  #    ],
-  #  ),
-  #  #apiPath = "/api",
-  #  # Apps can export an API to the world.  The API is to be used primarily by Javascript
-  #  # code and native apps, so it can't serve out regular HTML to browsers.  If a request
-  #  # comes in to your app's API, sandstorm-http-bridge will prefix the request's path with
-  #  # this string, if specified.
-  #),
-);
-
-const myCommand :Spk.Manifest.Command = (
-  # Here we define the command used to start up your server.
-  argv = ["/sandstorm-http-bridge", "8000", "--", "/bin/bash", "/opt/app/.sandstorm/launcher.sh"],
-  environ = [
-    # Note that this defines the *entire* environment seen by your app.
-    (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
-    (key = "SANDSTORM", value = "1"),
-    # Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
-    # can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
-    # the app's Sandstorm-specific integration code.
-  ]
-);

.sandstorm/service-config/mime.types

@@ -1,89 +0,0 @@
-
-types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/javascript                js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
-
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
-
-    image/png                             png;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg svgz;
-    image/webp                            webp;
-
-    application/font-woff                 woff;
-    application/java-archive              jar war ear;
-    application/json                      json;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.apple.mpegurl         m3u8;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-fontobject         eot;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.wap.wmlc              wmlc;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/x-7z-compressed           7z;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/xhtml+xml                 xhtml;
-    application/xspf+xml                  xspf;
-    application/zip                       zip;
-
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
-
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
-
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/ogg                             ogg;
-    audio/x-m4a                           m4a;
-    audio/x-realaudio                     ra;
-
-    video/3gpp                            3gpp 3gp;
-    video/mp2t                            ts;
-    video/mp4                             mp4;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/webm                            webm;
-    video/x-flv                           flv;
-    video/x-m4v                           m4v;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
-}

.sandstorm/service-config/nginx.conf

@@ -1,88 +0,0 @@
-worker_processes 4;
-pid /var/run/nginx.pid;
-
-events {
-	worker_connections 768;
-	# multi_accept on;
-}
-
-http {
-	# Basic Settings
-	sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 65;
-	types_hash_max_size 2048;
-	# server_names_hash_bucket_size 64;
-	server_tokens off;
-	server_name_in_redirect off;
-
-	include mime.types;
-	default_type application/octet-stream;
-
-	# Logging
-	access_log off;
-	error_log stderr;
-
-	# Prevent nginx from adding compression; this interacts badly with Sandstorm
-	# WebSession due to https://github.com/sandstorm-io/sandstorm/issues/289
-	gzip off;
-
-	# Trust the sandstorm-http-bridge's X-Forwarded-Proto.
-	map $http_x_forwarded_proto $fe_https {
-		default "";
-		https on;
-	}
-
-	server {
-		listen 8000 default_server;
-		listen [::]:8000 default_server ipv6only=on;
-
-		# Allow arbitrarily large bodies - Sandstorm can handle them, and requests
-		# are authenticated already, so there's no reason for apps to add additional
-		# limits by default.
-		client_max_body_size 0;
-
-		server_name localhost;
-		root /opt/app/public;
-		location / {
-			index index.php;
-			try_files $uri $uri/ /index.php?$query_string;
-			autoindex on;
-        	sendfile off;
-		}
-		location ~ \.php$ {
-			try_files $uri =404;
-            fastcgi_pass unix:/var/run/php7.1-fpm.sock;
-            fastcgi_index index.php;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-			fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-			fastcgi_read_timeout 900;
-
-
-			fastcgi_param  QUERY_STRING       $query_string;
-			fastcgi_param  REQUEST_METHOD     $request_method;
-			fastcgi_param  CONTENT_TYPE       $content_type;
-			fastcgi_param  CONTENT_LENGTH     $content_length;
-			
-			fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-			fastcgi_param  REQUEST_URI        $request_uri;
-			fastcgi_param  DOCUMENT_URI       $document_uri;
-			fastcgi_param  DOCUMENT_ROOT      $document_root;
-			fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-			fastcgi_param  HTTPS              $fe_https if_not_empty;
-			
-			fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-			fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-			
-			fastcgi_param  REMOTE_ADDR        $remote_addr;
-			fastcgi_param  REMOTE_PORT        $remote_port;
-			fastcgi_param  SERVER_ADDR        $server_addr;
-			fastcgi_param  SERVER_PORT        $server_port;
-			fastcgi_param  SERVER_NAME        $server_name;
-			
-			# PHP only, required if PHP was built with --enable-force-cgi-redirect
-			#fastcgi_param  REDIRECT_STATUS    200;
-		}
-	}
-}

.sandstorm/setup.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-# When you change this file, you must take manual action. Read this doc:
-# - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh
-echo "Now in setup.sh"
-
-set -euo pipefail
-
-export DEBIAN_FRONTEND=noninteractive
-
-# install packages so we can install apt-add-repository.
-apt-get update
-apt-get install -y python-software-properties software-properties-common
-
-# install all languages
-sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# tr_TR.UTF-8 UTF-8/tr_TR.UTF-8 UTF-8/g' /etc/locale.gen
-
-dpkg-reconfigure --frontend=noninteractive locales
-
-
-
-
-# actually add repository
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
-add-apt-repository "deb http://packages.dotdeb.org jessie all"
-
-# add another repos
-apt-get install -y apt-transport-https lsb-release ca-certificates
-wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
-
-# install packages.
-apt-get update
-apt-get install -y nginx php7.1-fpm php7.1-mysql php7.1-gd php7.1-cli php7.1-curl git php7.1-dev php7.1-zip php7.1-intl php7.1-dom php7.1-mbstring php7.1-bcmath mysql-server
-service nginx stop
-service php7.1-fpm stop
-service mysql stop
-systemctl disable nginx
-systemctl disable php7.1-fpm
-systemctl disable mysql
-
-# make php.ini display errors:
-sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.1/fpm/php.ini
-
-# patch /etc/php/7.1/fpm/pool.d/www.conf to not change uid/gid to www-data
-sed --in-place='' \
-       --expression='s/^listen.owner = www-data/;listen.owner = www-data/' \
-       --expression='s/^listen.group = www-data/;listen.group = www-data/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
-# patch /etc/php/7.1/fpm/php-fpm.conf to not have a pidfile
-sed --in-place='' \
-       --expression='s/^pid =/;pid =/' \
-       /etc/php/7.1/fpm/php-fpm.conf
-
-# move sock file to better dir:
-sed --in-place='' \
-       --expression='s/^listen = \/run\/php\/php7.1-fpm.sock/listen = \/var\/run\/php7.1-fpm.sock/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
-
-# patch /etc/php/7.1/fpm/pool.d/www.conf to no clear environment variables
-# so we can pass in SANDSTORM=1 to apps
-sed --in-place='' \
-       --expression='s/^;clear_env = no/clear_env=no/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
-# patch mysql conf to not change uid, and to use /var/tmp over /tmp
-# for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195
-sed --in-place='' \
-        --expression='s/^user\t\t= mysql/#user\t\t= mysql/' \
-        --expression='s,^tmpdir\t\t= /tmp,tmpdir\t\t= /var/tmp,' \
-        --expression='/\[mysqld]/ a\ secure-file-priv = ""\' \
-        /etc/mysql/my.cnf
-# patch mysql conf to use smaller transaction logs to save disk space
-cat <<EOF > /etc/mysql/conf.d/sandstorm.cnf
-[mysqld]
-# Set the transaction log file to the minimum allowed size to save disk space.
-# innodb_log_file_size = 1048576
-# Set the main data file to grow by 1MB at a time, rather than 8MB at a time.
-innodb_autoextend_increment = 1
-EOF
-
-

.sandstorm/stack

@@ -1 +0,0 @@
-lemp

.travis.yml

@@ -1,29 +0,0 @@
-language: php
-php:
-  - 7.1.18
-
-cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
-
-install:
-  - rm composer.lock
-  - composer update --no-scripts
-  - cp .env.testing .env
-  - php artisan clear-compiled
-  - php artisan env
-  - wget -q https://github.com/firefly-iii/test-data/raw/master/storage/database.sqlite -O storage/database/database.sqlite
-  - mkdir -p build/logs
-
-script:
-  - ./vendor/bin/phpunit -c phpunit.coverage.xml
-
-after_success:
-  - travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
-
-# safelist
-branches:
-  only:
-  - develop
-  - master

COPYING

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Dockerfile

@@ -1,116 +0,0 @@
-FROM php:7.1-apache
-
-# If building on a RPi, use --build-arg cores=3 to use all cores when compiling
-# to speed up the image build
-ARG CORES
-ENV CORES ${CORES:-1}
-
-ENV FIREFLY_PATH /var/www/firefly-iii/
-ENV CURL_VERSION 7.60.0
-ENV OPENSSL_VERSION 1.1.1-pre6
-
-LABEL version="1.0" maintainer="thegrumpydictator@gmail.com"
-
-
-# install packages
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev \
-                                               zlib1g-dev \
-                                               libjpeg62-turbo-dev \
-                                               wget \
-                                               libpng-dev \
-                                               libicu-dev \
-                                               libedit-dev \
-                                               libtidy-dev \
-                                               libxml2-dev \
-                                               unzip \
-                                               libsqlite3-dev \
-                                               nano \
-                                               libpq-dev \
-                                               libbz2-dev \
-                                               gettext-base \
-                                               cron \
-                                               rsyslog \
-                                               supervisor \
-                                               locales && \
-                                               apt-get clean && \
-                                               rm -rf /var/lib/apt/lists/*
-
-# Install latest curl
-RUN cd /tmp && \
-    wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
-    tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
-    cd openssl-${OPENSSL_VERSION} && \
-    ./config && \
-    make -j${CORES} && \
-    make install
-
-RUN cd /tmp && \
-    wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
-    tar -xvf curl-${CURL_VERSION}.tar.gz && \
-    cd curl-${CURL_VERSION} && \
-    ./configure --with-ssl --host=$(gcc -dumpmachine) && \
-    make -j${CORES} && \
-    make install
-
-# Make sure that libcurl is using the newer curl libaries
-RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/00-curl.conf && ldconfig
-
-# Mimic the Debian/Ubuntu config file structure for supervisor
-COPY .deploy/docker/supervisord.conf /etc/supervisor/supervisord.conf
-RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor
-
-# Fix the link to curl:
-RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4
-
-
-# copy Firefly III supervisor conf file.
-COPY ./.deploy/docker/firefly-iii.conf /etc/supervisor/conf.d/firefly-iii.conf
-
-# copy cron job supervisor conf file.
-COPY ./.deploy/docker/cronjob.conf /etc/supervisor/conf.d/cronjob.conf
-
-# test crons added via crontab
-RUN echo "0 3 * * * /usr/local/bin/php /var/www/firefly-iii/artisan firefly:cron" | crontab -
-#RUN (crontab -l ; echo "*/1 * * * * free >> /var/www/firefly-iii/public/cron.html") 2>&1 | crontab -
-# Install PHP exentions.
-RUN docker-php-ext-install -j$(nproc) gd intl tidy zip bcmath pdo_mysql bz2 pdo_pgsql
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Generate locales supported by Firefly III
-RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
-
-
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
-
-# Enable apache mod rewrite..
-RUN a2enmod rewrite
-
-# Enable apache mod ssl..
-RUN a2enmod ssl
-
-# Create volumes
-VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
-
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
-# Make sure we own Firefly III directory
-RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
-
-# Copy in Firefly Source
-WORKDIR $FIREFLY_PATH
-ADD . $FIREFLY_PATH
-
-# Run composer
-ENV COMPOSER_ALLOW_SUPERUSER 1
-RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
-
-# Expose port 80
-EXPOSE 80
-
-# Run entrypoint thing
-ENTRYPOINT [".deploy/docker/entrypoint.sh"]

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    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 General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    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/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

app.json

@@ -51,6 +51,9 @@
   "buildpacks": [
     {
       "url": "heroku/php"
+    },
+    {
+      "url": "https://github.com/heroku/heroku-buildpack-locale"
     }
   ],
   "env": {

app/Api/V1/Controllers/AboutController.php

@@ -2,22 +2,22 @@
 
 /**
  * AboutController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -27,14 +27,12 @@ namespace FireflyIII\Api\V1\Controllers;
 use DB;
 use FireflyIII\Transformers\UserTransformer;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Returns basic information about this installation.
  *
+ * @codeCoverageIgnore
  * Class AboutController.
  */
 class AboutController extends Controller
@@ -51,8 +49,10 @@ class AboutController extends Controller
         $phpVersion    = str_replace($search, $replace, PHP_VERSION);
         $phpOs         = str_replace($search, $replace, PHP_OS);
         $currentDriver = DB::getDriverName();
+
+
         $data
-                       = [
+            = [
             'version'     => config('firefly.version'),
             'api_version' => config('firefly.api_version'),
             'php_version' => $phpVersion,
@@ -60,22 +60,23 @@ class AboutController extends Controller
             'driver'      => $currentDriver,
         ];
 
-        return response()->json(['data' => $data], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $data])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
      * Returns information about the user.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      */
-    public function user(Request $request): JsonResponse
+    public function user(): JsonResponse
     {
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item(auth()->user(), new UserTransformer($this->parameters), 'users');
+        $manager = $this->getManager();
+
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item(auth()->user(), $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }

app/Api/V1/Controllers/AccountController.php

@@ -1,58 +1,62 @@
 <?php
 /**
  * AccountController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\AccountRequest;
+use FireflyIII\Api\V1\Requests\AccountStoreRequest;
+use FireflyIII\Api\V1\Requests\AccountUpdateRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+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;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class AccountController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountController extends Controller
 {
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $currencyRepository;
+    use AccountFilter, TransactionFilter;
     /** @var AccountRepositoryInterface The account repository */
     private $repository;
 
     /**
      * AccountController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -65,19 +69,46 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 return $next($request);
             }
         );
     }
 
+    /**
+     * @param Account $account
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(Account $account): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($account);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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 \FireflyIII\Models\Account $account
+     * @param Account $account
      *
+     * @codeCoverageIgnore
      * @return JsonResponse
      */
     public function delete(Account $account): JsonResponse
@@ -92,21 +123,18 @@ class AccountController extends Controller
      *
      * @param Request $request
      *
+     * @codeCoverageIgnore
      * @return JsonResponse
      */
     public function index(Request $request): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
-        // read type from URI
-        $type = $request->get('type') ?? 'all';
+        $manager = $this->getManager();
+        $type    = $request->get('type') ?? 'all';
         $this->parameters->set('type', $type);
 
         // types to get, page size:
-        $types    = $this->mapTypes($this->parameters->get('type'));
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $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);
@@ -117,33 +145,70 @@ class AccountController extends Controller
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($accounts, new AccountTransformer($this->parameters), 'accounts');
+
+        /** @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.
+     *
+     * @param Account $account
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     *
+     */
+    public function piggyBanks(Account $account): 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 budgets. Count it and split it.
+        $collection = $this->repository->getPiggyBanks($account);
+        $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.accounts.piggy_banks', [$account->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', 'application/vnd.api+json');
+
+    }
+
     /**
      * Show single instance.
      *
-     * @param Request $request
      * @param Account $account
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function show(Request $request, Account $account): JsonResponse
+    public function show(Account $account): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+        /** @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');
     }
@@ -151,24 +216,72 @@ class AccountController extends Controller
     /**
      * Store a new instance.
      *
-     * @param AccountRequest $request
+     * @param AccountStoreRequest $request
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function store(AccountRequest $request): JsonResponse
+    public function store(AccountStoreRequest $request): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
+        $data    = $request->getAllAccountData();
         $account = $this->repository->store($data);
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+        /** @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.
+     *
+     * @codeCoverageIgnore
+     *
+     * @param Request $request
+     * @param Account $account
+     *
+     * @return JsonResponse
+     *
+     */
+    public function transactions(Request $request, Account $account): JsonResponse
+    {
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        // user can overrule page size with limit parameter.
+        $limit = $this->parameters->get('limit');
+        if (null !== $limit && $limit > 0) {
+            $pageSize = $limit;
+        }
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = $this->getManager();
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setUser($admin)->setAccounts(new Collection([$account]))
+                  ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types);
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
+        $groups = $paginator->getCollection();
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
     }
@@ -176,76 +289,23 @@ class AccountController extends Controller
     /**
      * Update account.
      *
-     * @param AccountRequest $request
-     * @param Account        $account
+     * @param AccountUpdateRequest $request
+     * @param Account              $account
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function update(AccountRequest $request, Account $account): JsonResponse
+    public function update(AccountUpdateRequest $request, Account $account): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
-        // set correct type:
+        $data         = $request->getUpdateData();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $this->repository->update($account, $data);
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+        /** @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');
     }
-
-    /**
-     * All the available types.
-     *
-     * @param string $type
-     *
-     * @return array
-     */
-    private function mapTypes(string $type): array
-    {
-        $types  = [
-            'all'                        => [AccountType::DEFAULT, AccountType::CASH, AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE,
-                                             AccountType::INITIAL_BALANCE, AccountType::BENEFICIARY, AccountType::IMPORT, AccountType::RECONCILIATION,
-                                             AccountType::LOAN,],
-            'asset'                      => [AccountType::DEFAULT, AccountType::ASSET,],
-            'cash'                       => [AccountType::CASH,],
-            'expense'                    => [AccountType::EXPENSE, AccountType::BENEFICIARY,],
-            'revenue'                    => [AccountType::REVENUE,],
-            'special'                    => [AccountType::CASH, AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION,
-                                             AccountType::LOAN,],
-            'hidden'                     => [AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION, AccountType::LOAN,],
-            'liability'                  => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
-            'liabilities'                => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
-            'cc'                         => [AccountType::CREDITCARD],
-            'creditcard'                 => [AccountType::CREDITCARD],
-            'credit_card'                => [AccountType::CREDITCARD],
-            AccountType::DEFAULT         => [AccountType::DEFAULT],
-            AccountType::CASH            => [AccountType::CASH],
-            AccountType::ASSET           => [AccountType::ASSET],
-            AccountType::EXPENSE         => [AccountType::EXPENSE],
-            AccountType::REVENUE         => [AccountType::REVENUE],
-            AccountType::INITIAL_BALANCE => [AccountType::INITIAL_BALANCE],
-            AccountType::BENEFICIARY     => [AccountType::BENEFICIARY],
-            AccountType::IMPORT          => [AccountType::IMPORT],
-            AccountType::RECONCILIATION  => [AccountType::RECONCILIATION],
-            AccountType::LOAN            => [AccountType::LOAN],
-            AccountType::MORTGAGE        => [AccountType::MORTGAGE],
-            AccountType::DEBT            => [AccountType::DEBT],
-            AccountType::CREDITCARD      => [AccountType::CREDITCARD],
-
-        ];
-        $return = $types['all'];
-        if (isset($types[$type])) {
-            $return = $types[$type];
-        }
-
-        return $return; // @codeCoverageIgnore
-    }
 }

app/Api/V1/Controllers/AttachmentController.php

@@ -1,31 +1,34 @@
 <?php
 /**
  * AttachmentController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\AttachmentRequest;
+use FireflyIII\Api\V1\Middleware\ApiDemoUser;
+use FireflyIII\Api\V1\Requests\AttachmentStoreRequest;
+use FireflyIII\Api\V1\Requests\AttachmentUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
+use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Transformers\AttachmentTransformer;
@@ -34,16 +37,15 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
+use function strlen;
 
 /**
  * Class AttachmentController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AttachmentController extends Controller
 {
@@ -52,10 +54,13 @@ class AttachmentController extends Controller
 
     /**
      * AccountController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
         parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
@@ -63,6 +68,7 @@ class AttachmentController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
+
                 return $next($request);
             }
         );
@@ -71,6 +77,8 @@ class AttachmentController extends Controller
     /**
      * Remove the specified resource from storage.
      *
+     * @codeCoverageIgnore
+     *
      * @param Attachment $attachment
      *
      * @return JsonResponse
@@ -87,20 +95,27 @@ class AttachmentController extends Controller
      *
      * @param Attachment $attachment
      *
+     * @codeCoverageIgnore
+     * @throws   FireflyException
      * @return LaravelResponse
-     * @throws FireflyException
      */
     public function download(Attachment $attachment): LaravelResponse
     {
         if (false === $attachment->uploaded) {
-            throw new FireflyException('No file has been uploaded for this attachment (yet).');
+            throw new FireflyException('200000: File has not been uploaded (yet).');
+        }
+        if (0 === $attachment->size) {
+            throw new FireflyException('200000: File has not been uploaded (yet).');
         }
         if ($this->repository->exists($attachment)) {
             $content = $this->repository->getContent($attachment);
-            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+            if ('' === $content) {
+                throw new FireflyException('200002: File is empty (zero bytes).');
+            }
+            $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
 
             /** @var LaravelResponse $response */
-            $response = response($content, 200);
+            $response = response($content);
             $response
                 ->header('Content-Description', 'File Transfer')
                 ->header('Content-Type', 'application/octet-stream')
@@ -110,28 +125,25 @@ 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', strlen($content));
 
             return $response;
         }
-        throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');
+        throw new FireflyException('200003: File does not exist.');
     }
 
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
         $collection  = $this->repository->get();
@@ -142,9 +154,11 @@ class AttachmentController extends Controller
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($attachments, new AttachmentTransformer($this->parameters), 'attachments');
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
@@ -153,22 +167,18 @@ class AttachmentController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request    $request
      * @param Attachment $attachment
      *
      * @return JsonResponse
      */
-    public function show(Request $request, Attachment $attachment): JsonResponse
+    public function show(Attachment $attachment): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+        $resource = new Item($attachment, $transformer, 'attachments');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -176,19 +186,22 @@ class AttachmentController extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param AttachmentRequest $request
+     * @param AttachmentStoreRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
-    public function store(AttachmentRequest $request): JsonResponse
+    public function store(AttachmentStoreRequest $request): JsonResponse
     {
         $data       = $request->getAll();
         $attachment = $this->repository->store($data);
-        $manager    = new Manager;
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+        $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');
     }
@@ -196,20 +209,22 @@ class AttachmentController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param AttachmentRequest $request
-     * @param Attachment        $attachment
+     * @param AttachmentUpdateRequest $request
+     * @param Attachment              $attachment
      *
      * @return JsonResponse
      */
-    public function update(AttachmentRequest $request, Attachment $attachment): JsonResponse
+    public function update(AttachmentUpdateRequest $request, Attachment $attachment): JsonResponse
     {
         $data = $request->getAll();
         $this->repository->update($attachment, $data);
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+        /** @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');
     }
@@ -217,6 +232,8 @@ class AttachmentController extends Controller
     /**
      * Upload an attachment.
      *
+     * @codeCoverageIgnore
+     *
      * @param Request    $request
      * @param Attachment $attachment
      *
@@ -227,6 +244,11 @@ class AttachmentController extends Controller
         /** @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/AvailableBudgetController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AvailableBudgetController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -24,35 +24,31 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Factory\TransactionCurrencyFactory;
 use FireflyIII\Models\AvailableBudget;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class AvailableBudgetController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AvailableBudgetController extends Controller
 {
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $currencyRepository;
-    /** @var BudgetRepositoryInterface The budget repository */
-    private $repository;
+    /** @var AvailableBudgetRepositoryInterface */
+    private $abRepository;
 
     /**
-     * AccountController constructor.
+     * AvailableBudgetController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -60,10 +56,9 @@ class AvailableBudgetController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user                     = auth()->user();
-                $this->repository         = app(BudgetRepositoryInterface::class);
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $user               = auth()->user();
+                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
+                $this->abRepository->setUser($user);
 
                 return $next($request);
             }
@@ -75,11 +70,13 @@ class AvailableBudgetController extends Controller
      *
      * @param AvailableBudget $availableBudget
      *
+     * @codeCoverageIgnore
+     *
      * @return JsonResponse
      */
     public function delete(AvailableBudget $availableBudget): JsonResponse
     {
-        $this->repository->destroyAvailableBudget($availableBudget);
+        $this->abRepository->destroyAvailableBudget($availableBudget);
 
         return response()->json([], 204);
     }
@@ -87,21 +84,21 @@ class AvailableBudgetController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        $start = $this->parameters->get('start');
+        $end   = $this->parameters->get('end');
 
         // get list of available budgets. Count it and split it.
-        $collection       = $this->repository->getAvailableBudgets();
+        $collection       = $this->abRepository->getAvailableBudgetsByDate($start, $end);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
@@ -109,9 +106,11 @@ class AvailableBudgetController extends Controller
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($availableBudgets, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
@@ -120,23 +119,20 @@ class AvailableBudgetController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request          $request
-     * @param  AvailableBudget $availableBudget
+     * @param AvailableBudget $availableBudget
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, AvailableBudget $availableBudget): JsonResponse
+    public function show(AvailableBudget $availableBudget): JsonResponse
     {
+        $manager = $this->getManager();
 
-        $manager = new Manager;
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -147,30 +143,31 @@ class AvailableBudgetController extends Controller
      * @param AvailableBudgetRequest $request
      *
      * @return JsonResponse
-     * @throws FireflyException
      */
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
-        $data     = $request->getAll();
-        $currency = $this->currencyRepository->findNull($data['currency_id']);
-        if (null === $currency) {
-            $currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
-        }
-        if (null === $currency) {
-            throw new FireflyException('Could not find the indicated currency.');
-        }
-        $availableBudget = $this->repository->setAvailableBudget($currency, $data['start_date'], $data['end_date'], $data['amount']);
-        $manager         = new Manager;
-        $baseUrl         = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $data = $request->getAll();
+        /** @var TransactionCurrencyFactory $factory */
+        $factory  = app(TransactionCurrencyFactory::class);
+        $currency = $factory->find($data['currency_id'], $data['currency_code']);
 
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        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.
      *
@@ -182,12 +179,30 @@ class AvailableBudgetController extends Controller
     public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
     {
         $data = $request->getAll();
-        $this->repository->updateAvailableBudget($availableBudget, $data);
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        /** @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/BillController.php

@@ -2,22 +2,22 @@
 
 /**
  * BillController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -26,29 +26,36 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\BillRequest;
 use FireflyIII\Exceptions\FireflyException;
+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;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-use League\Fractal\Manager;
+use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class BillController.
+ *
  */
 class BillController extends Controller
 {
+    use TransactionFilter;
     /** @var BillRepositoryInterface The bill repository */
     private $repository;
 
     /**
      * BillController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -68,11 +75,43 @@ class BillController extends Controller
     }
 
     /**
-     * Remove the specified resource from storage.
+     * Display a listing of the resource.
      *
-     * @param  Bill $bill
+     * @param Bill $bill
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(Bill $bill): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($bill);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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
     {
@@ -84,47 +123,80 @@ class BillController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $paginator = $this->repository->getPaginator($pageSize);
-        /** @var Collection $bills */
-        $bills = $paginator->getCollection();
+        $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'));
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($bills, new BillTransformer($this->parameters), 'bills');
+        $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');
     }
 
+    /**
+     * List all of them.
+     *
+     * @param Bill $bill
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function rules(Bill $bill): 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->getRulesForBill($bill);
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams());
+
+        /** @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');
+
+    }
 
     /**
      * Show the specified bill.
      *
-     * @param Request $request
-     * @param Bill    $bill
+     * @param Bill $bill
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Bill $bill): JsonResponse
+    public function show(Bill $bill): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $manager = $this->getManager();
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+        $resource = new Item($bill, $transformer, 'bills');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -134,25 +206,80 @@ class BillController extends Controller
      *
      * @param BillRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function store(BillRequest $request): JsonResponse
     {
-        $bill = $this->repository->store($request->getAll());
-        if (null !== $bill) {
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $bill    = $this->repository->store($request->getAll());
+        $manager = $this->getManager();
 
-            $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-        }
-        throw new FireflyException('Could not store new bill.'); // @codeCoverageIgnore
+        $resource = new Item($bill, $transformer, 'bills');
 
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     *
+     * @param Bill    $bill
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Bill $bill): 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)
+            // include source + destination account name and type.
+            ->setBill($bill)
+            // 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);
+
+        // do parameter stuff on new group collector.
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+
+        // get paginator.
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.bills.transactions', [$bill->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 a bill.
@@ -166,11 +293,13 @@ class BillController extends Controller
     {
         $data    = $request->getAll();
         $bill    = $this->repository->update($bill, $data);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
-        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+        /** @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/BudgetController.php

@@ -1,55 +1,66 @@
 <?php
 /**
  * BudgetController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\BudgetRequest;
+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\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 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;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class BudgetController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BudgetController extends Controller
 {
+    use TransactionFilter;
+    /** @var BudgetLimitRepositoryInterface */
+    private $blRepository;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
     /**
      * BudgetController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -59,21 +70,82 @@ class BudgetController extends Controller
                 /** @var User $admin */
                 $admin = auth()->user();
 
-                /** @var BudgetRepositoryInterface repository */
-                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
                 $this->repository->setUser($admin);
+                $this->blRepository->setUser($admin);
 
                 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
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(Budget $budget): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($budget);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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
     {
@@ -85,18 +157,15 @@ class BudgetController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getBudgets();
@@ -107,34 +176,33 @@ class BudgetController extends Controller
         $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($budgets, new BudgetTransformer($this->parameters), 'budgets');
+        /** @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 Request $request
-     * @param Budget  $budget
+     * @param Budget $budget
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Budget $budget): JsonResponse
+    public function show(Budget $budget): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $manager = $this->getManager();
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+        $resource = new Item($budget, $transformer, 'budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -142,44 +210,134 @@ class BudgetController extends Controller
     /**
      * Store a budget.
      *
-     * @param BudgetRequest $request
+     * @param BudgetStoreRequest $request
+     *
+     * @throws FireflyException
      *
      * @return JsonResponse
-     * @throws FireflyException
      */
-    public function store(BudgetRequest $request): JsonResponse
+    public function store(BudgetStoreRequest $request): JsonResponse
     {
-        $budget = $this->repository->store($request->getAll());
-        if (null !== $budget) {
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $budget  = $this->repository->store($request->getAll());
+        $manager = $this->getManager();
 
-            $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-        }
-        throw new FireflyException('Could not store new budget.'); // @codeCoverageIgnore
+        $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();
+
+        /** @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 Budget  $budget
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Budget $budget): JsonResponse
+    {
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // user can overrule page size with limit parameter.
+        $limit = $this->parameters->get('limit');
+        if (null !== $limit && $limit > 0) {
+            $pageSize = $limit;
+        }
+
+        $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);
+
+        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.budgets.transactions', [$budget->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 a budget.
      *
-     * @param BudgetRequest $request
-     * @param Budget        $budget
+     * @param BudgetUpdateRequest $request
+     * @param Budget              $budget
      *
      * @return JsonResponse
      */
-    public function update(BudgetRequest $request, Budget $budget): JsonResponse
+    public function update(BudgetUpdateRequest $request, Budget $budget): JsonResponse
     {
         $data    = $request->getAll();
         $budget  = $this->repository->update($budget, $data);
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
-        $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+        /** @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');
 

app/Api/V1/Controllers/BudgetLimitController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * BudgetLimitController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -26,33 +26,38 @@ 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\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
-
 
 /**
  * Class BudgetLimitController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BudgetLimitController extends Controller
 {
+    use TransactionFilter;
+    /** @var BudgetLimitRepositoryInterface */
+    private $blRepository;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
     /**
-     * AccountController constructor.
+     * BudgetLimitController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -60,9 +65,11 @@ class BudgetLimitController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user             = auth()->user();
-                $this->repository = app(BudgetRepositoryInterface::class);
+                $user               = auth()->user();
+                $this->repository   = app(BudgetRepositoryInterface::class);
+                $this->blRepository = app(BudgetLimitRepositoryInterface::class);
                 $this->repository->setUser($user);
+                $this->blRepository->setUser($user);
 
                 return $next($request);
             }
@@ -75,10 +82,11 @@ class BudgetLimitController extends Controller
      * @param BudgetLimit $budgetLimit
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(BudgetLimit $budgetLimit): JsonResponse
     {
-        $this->repository->destroyBudgetLimit($budgetLimit);
+        $this->blRepository->destroyBudgetLimit($budgetLimit);
 
         return response()->json([], 204);
     }
@@ -89,22 +97,22 @@ class BudgetLimitController extends Controller
      * @param Request $request
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function index(Request $request): JsonResponse
     {
-        $manager  = new Manager;
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $budgetId = (int)($request->get('budget_id') ?? 0);
+        $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;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $this->parameters->set('budget_id', $budgetId);
 
         $collection = new Collection;
         if (null === $budget) {
-            $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+            $collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         }
         if (null !== $budget) {
-            $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+            $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
         $count        = $collection->count();
@@ -112,8 +120,11 @@ class BudgetLimitController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
 
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($budgetLimits, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        /** @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');
@@ -122,22 +133,20 @@ class BudgetLimitController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param Request     $request
      * @param BudgetLimit $budgetLimit
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, BudgetLimit $budgetLimit): JsonResponse
+    public function show(BudgetLimit $budgetLimit): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -147,23 +156,79 @@ class BudgetLimitController extends Controller
      *
      * @param BudgetLimitRequest $request
      *
-     * @return JsonResponse
      * @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('Unknown budget.');
+            throw new FireflyException('200004: Budget does not exist.'); // @codeCoverageIgnore
         }
         $data['budget'] = $budget;
-        $budgetLimit    = $this->repository->storeBudgetLimit($data);
-        $manager        = new Manager;
-        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $budgetLimit    = $this->blRepository->storeBudgetLimit($data);
+        $manager        = $this->getManager();
 
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        /** @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');
     }
@@ -178,18 +243,16 @@ class BudgetLimitController extends Controller
      */
     public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
     {
-        $data   = $request->getAll();
-        $budget = $this->repository->findNull($data['budget_id']);
-        if (null === $budget) {
-            $budget = $budgetLimit->budget;
-        }
-        $data['budget'] = $budget;
-        $budgetLimit    = $this->repository->updateBudgetLimit($budgetLimit, $data);
-        $manager        = new Manager;
-        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $data           = $request->getAll();
+        $data['budget'] = $budgetLimit->budget;
+        $budgetLimit    = $this->blRepository->updateBudgetLimit($budgetLimit, $data);
+        $manager        = $this->getManager();
 
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        /** @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/CategoryController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CategoryController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -25,31 +25,35 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\CategoryRequest;
 use FireflyIII\Exceptions\FireflyException;
+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;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CategoryController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryController extends Controller
 {
+    use TransactionFilter;
     /** @var CategoryRepositoryInterface The category repository */
     private $repository;
 
     /**
      * CategoryController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -68,12 +72,42 @@ class CategoryController extends Controller
         );
     }
 
+    /**
+     * @param Category $category
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(Category $category): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($category);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.categories.attachments', [$category->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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
     {
@@ -85,18 +119,15 @@ class CategoryController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getCategories();
@@ -107,9 +138,12 @@ class CategoryController extends Controller
         $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($categories, new CategoryTransformer($this->parameters), 'categories');
+        /** @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');
@@ -119,22 +153,20 @@ class CategoryController extends Controller
     /**
      * Show the category.
      *
-     * @param Request  $request
      * @param Category $category
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Category $category): JsonResponse
+    public function show(Category $category): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $manager = $this->getManager();
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+        $resource = new Item($category, $transformer, 'categories');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -144,24 +176,78 @@ class CategoryController extends Controller
      *
      * @param CategoryRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function store(CategoryRequest $request): JsonResponse
     {
         $category = $this->repository->store($request->getAll());
-        if (null !== $category) {
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager  = $this->getManager();
 
-            $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-        }
-        throw new FireflyException('Could not store new category.'); // @codeCoverageIgnore
+        $resource = new Item($category, $transformer, 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request  $request
+     *
+     * @param Category $category
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Category $category): 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 category.
+            ->setCategory($category)
+            // 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.categories.transactions', [$category->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 category.
@@ -175,11 +261,13 @@ class CategoryController extends Controller
     {
         $data     = $request->getAll();
         $category = $this->repository->update($category, $data);
-        $manager  = new Manager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager  = $this->getManager();
 
-        $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+        /** @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');
 

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

@@ -0,0 +1,307 @@
+<?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\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\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;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use ApiSupport;
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepository;
+    /** @var AccountRepositoryInterface */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @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
+     *
+     * @return JsonResponse
+     */
+    public function overview(DateRequest $request): JsonResponse
+    {
+        // parameters for chart:
+        $dates = $request->getAll();
+        /** @var Carbon $start */
+        $start = $dates['start'];
+        /** @var Carbon $end */
+        $end = $dates['end'];
+
+        // user's preferences
+        $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);
+        $chartData = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $currency = $this->repository->getAccountCurrency($account);
+            if (null === $currency) {
+                $currency = $default; // @codeCoverageIgnore
+            }
+            $currentSet = [
+                'label'                   => $account->name,
+                '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'                 => [],
+            ];
+            /** @var Carbon $currentStart */
+            $currentStart = clone $start;
+            $range        = app('steam')->balanceInRange($account, $start, clone $end);
+            $previous     = round(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;
+                $previous = $balance;
+                $currentStart->addDay();
+                $currentSet['entries'][$label] = $balance;
+            }
+            $chartData[] = $currentSet;
+        }
+
+        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

@@ -0,0 +1,118 @@
+<?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

@@ -0,0 +1,202 @@
+<?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,37 +1,39 @@
 <?php
 /**
  * ConfigurationController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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;
-use Illuminate\Http\Request;
 
 /**
  * Class ConfigurationController.
+ *
+ * @codeCoverageIgnore
  */
 class ConfigurationController extends Controller
 {
@@ -41,21 +43,20 @@ class ConfigurationController extends Controller
     private $repository;
 
     /**
-     * BudgetController constructor.
+     * ConfigurationController constructor.
+     *
      */
     public function __construct()
     {
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @noinspection UnusedConstructorDependenciesInspection */
                 $this->repository = app(UserRepositoryInterface::class);
                 /** @var User $admin */
                 $admin = auth()->user();
 
                 if (!$this->repository->hasRole($admin, 'owner')) {
-                    /** @noinspection ExceptionsAnnotatingAndHandlingInspection */
-                    throw new FireflyException('No access to method.'); // @codeCoverageIgnore
+                    throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
                 }
 
                 return $next($request);
@@ -72,47 +73,30 @@ class ConfigurationController extends Controller
     {
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
      * Update the configuration.
      *
-     * @param Request $request
+     * @param ConfigurationRequest $request
+     * @param string               $name
      *
      * @return JsonResponse
-     * @throws FireflyException
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function update(Request $request): JsonResponse
+    public function update(ConfigurationRequest $request, string $name): JsonResponse
     {
-        $name  = $request->get('name');
-        $value = $request->get('value');
-        $valid = ['is_demo_site', 'permission_update_check', 'single_user_mode'];
-        if (!\in_array($name, $valid, true)) {
-            throw new FireflyException('You cannot edit this configuration value.');
-        }
-        $configValue = '';
-        switch ($name) {
-            case 'is_demo_site':
-            case 'single_user_mode':
-                $configValue = 'true' === $value;
-                break;
-            case 'permission_update_check':
-                $configValue = (int)$value >= -1 && (int)$value <= 1 ? (int)$value : -1;
-                break;
-        }
-        app('fireflyconfig')->set($name, $configValue);
+        $data = $request->getAll();
+        app('fireflyconfig')->set($name, $data['value']);
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
      * Get all config values.
      *
      * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getConfigData(): array
     {
@@ -124,13 +108,12 @@ class ConfigurationController extends Controller
         $lastCheck = app('fireflyconfig')->get('last_update_check');
         /** @var Configuration $singleUser */
         $singleUser = app('fireflyconfig')->get('single_user_mode');
-        $data       = [
+
+        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,
+            '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,
         ];
-
-        return $data;
     }
 }

app/Api/V1/Controllers/Controller.php

@@ -2,22 +2,22 @@
 
 /**
  * Controller.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -30,6 +30,8 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use League\Fractal\Manager;
+use League\Fractal\Serializer\JsonApiSerializer;
 use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
@@ -37,7 +39,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  * Class Controller.
  *
  * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ *
  */
 class Controller extends BaseController
 {
@@ -61,7 +63,6 @@ class Controller extends BaseController
      *
      * @return string
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function buildParams(): string
     {
@@ -82,16 +83,28 @@ class Controller extends BaseController
         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;
+    }
+
     /**
      * Method to grab all parameters from the URI.
      *
      * @return ParameterBag
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getParameters(): ParameterBag
     {
         $bag  = new ParameterBag;
-        $page = (int)request()->get('page');
+        $page = (int) request()->get('page');
         if (0 === $page) {
             $page = 1;
         }
@@ -100,11 +113,11 @@ class Controller extends BaseController
         // some date fields:
         $dates = ['start', 'end', 'date'];
         foreach ($dates as $field) {
-            $date = request()->get($field);
+            $date = request()->query->get($field);
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = new Carbon($date);
+                    $obj = Carbon::parse($date);
                 } catch (InvalidDateException $e) {
                     // don't care
                     Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
@@ -113,6 +126,15 @@ class Controller extends BaseController
             $bag->set($field, $obj);
         }
 
+        // integer fields:
+        $integers = ['limit'];
+        foreach ($integers as $integer) {
+            $value = request()->query->get($integer);
+            if (null !== $value) {
+                $bag->set($integer, (int) $value);
+            }
+        }
+
         return $bag;
 
     }

app/Api/V1/Controllers/CurrencyController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CurrencyController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -26,27 +26,49 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\CurrencyRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Models\RecurrenceTransaction;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\Transformers\AvailableBudgetTransformer;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\Transformers\RecurrenceTransformer;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CurrencyController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CurrencyController extends Controller
 {
+    use AccountFilter, TransactionFilter;
     /** @var CurrencyRepositoryInterface The currency repository */
     private $repository;
     /** @var UserRepositoryInterface The user repository */
@@ -54,6 +76,8 @@ class CurrencyController extends Controller
 
     /**
      * CurrencyRepository constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -74,12 +98,213 @@ class CurrencyController extends Controller
     }
 
     /**
-     * Remove the specified resource from storage.
+     * Display a list of accounts.
      *
-     * @param  TransactionCurrency $currency
+     * @param Request             $request
+     * @param TransactionCurrency $currency
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        // read type from URI
+        $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.
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $unfiltered        = $accountRepository->getAccountsByType($types);
+
+        // filter list on currency preference:
+        $collection = $unfiltered->filter(
+            static function (Account $account) use ($currency, $accountRepository) {
+                $currencyId = (int) $accountRepository->getMetaValue($account, 'currency_id');
+
+                return $currencyId === $currency->id;
+            }
+        );
+
+        $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.currencies.accounts', [$currency->code]) . $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');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function availableBudgets(TransactionCurrency $currency): JsonResponse
+    {
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        $manager = $this->getManager();
+        // types to get, page size:
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of available budgets. Count it and split it.
+
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+
+        $repository->setUser($admin);
+        $collection       = $abRepository->getAvailableBudgetsByCurrency($currency);
+        $count            = $collection->count();
+        $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.available_budgets', [$currency->code]) . $this->buildParams());
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
+    }
+
+    /**
+     * List all bills
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function bills(TransactionCurrency $currency): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $unfiltered = $repository->getBills();
+
+        // filter and paginate list:
+        $collection = $unfiltered->filter(
+            static function (Bill $bill) use ($currency) {
+                return $bill->transaction_currency_id === $currency->id;
+            }
+        );
+        $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', [$currency->code]) . $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', 'application/vnd.api+json');
+    }
+
+    /**
+     * List all budget limits
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function budgetLimits(TransactionCurrency $currency): JsonResponse
+    {
+        /** @var BudgetLimitRepositoryInterface $blRepository */
+        $blRepository = app(BudgetLimitRepositoryInterface::class);
+
+        $manager      = $this->getManager();
+        $pageSize     = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection   = $blRepository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.budget_limits', [$currency->code]) . $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');
+    }
+
+    /**
+     * Show a list of known exchange rates
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function cer(TransactionCurrency $currency): JsonResponse
+    {
+        // create some objects:
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getExchangeRates($currency);
+
+
+        $count         = $collection->count();
+        $exchangeRates = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator     = new LengthAwarePaginator($exchangeRates, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.cer', [$currency->code]) . $this->buildParams());
+
+        /** @var CurrencyExchangeRateTransformer $transformer */
+        $transformer = app(CurrencyExchangeRateTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($exchangeRates, $transformer, 'currency_exchange_rates');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param TransactionCurrency $currency
+     *
      * @throws FireflyException
+     * @codeCoverageIgnore
+     * @return JsonResponse
      */
     public function delete(TransactionCurrency $currency): JsonResponse
     {
@@ -88,27 +313,86 @@ class CurrencyController extends Controller
 
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
-            throw new FireflyException('No access to method, user is not owner.'); // @codeCoverageIgnore
+            throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
         }
-        if (!$this->repository->canDeleteCurrency($currency)) {
-            throw new FireflyException('No access to method, currency is in use.'); // @codeCoverageIgnore
+        if ($this->repository->currencyInUse($currency)) {
+            throw new FireflyException('200006: Currency in use.'); // @codeCoverageIgnore
         }
+        if ($this->repository->isFallbackCurrency($currency)) {
+            throw new FireflyException('200026: Currency is fallback.'); // @codeCoverageIgnore
+        }
+
         $this->repository->destroy($currency);
 
         return response()->json([], 204);
     }
 
     /**
-     * Display a listing of the resource.
+     * Disable a currency.
      *
-     * @param Request $request
+     * @param TransactionCurrency $currency
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function disable(TransactionCurrency $currency): JsonResponse
     {
-        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $collection = $this->repository->get();
+        // must be unused.
+        if ($this->repository->currencyInUse($currency)) {
+            return response()->json([], 409);
+        }
+        $this->repository->disable($currency);
+        $manager = $this->getManager();
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Enable a currency.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function enable(TransactionCurrency $currency): JsonResponse
+    {
+        $this->repository->enable($currency);
+        $manager = $this->getManager();
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function index(): JsonResponse
+    {
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAll();
         $count      = $collection->count();
         // slice them:
         $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -116,40 +400,189 @@ class CurrencyController extends Controller
         $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
 
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager         = $this->getManager();
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new FractalCollection($currencies, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($currencies, $transformer, 'currencies');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Make the currency a default currency.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function makeDefault(TransactionCurrency $currency): JsonResponse
+    {
+        $this->repository->enable($currency);
+
+        app('preferences')->set('currencyPreference', $currency->code);
+        app('preferences')->mark();
+
+        $manager = $this->getManager();
+
+        $this->parameters->set('defaultCurrency', $currency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List all recurring transactions.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function recurrences(TransactionCurrency $currency): 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.
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $unfiltered = $repository->getAll();
+
+        // filter selection
+        $collection = $unfiltered->filter(
+            static function (Recurrence $recurrence) use ($currency) {
+                /** @var RecurrenceTransaction $transaction */
+                foreach ($recurrence->recurrenceTransactions as $transaction) {
+                    if ($transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id) {
+                        return $recurrence;
+                    }
+                }
+
+                return null;
+            }
+        );
+
+
+        $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.currencies.recurrences', [$currency->code]) . $this->buildParams());
+
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function rules(TransactionCurrency $currency): JsonResponse
+    {
+        $manager  = $this->getManager();
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        /** @var RuleRepositoryInterface $repository */
+        $repository = app(RuleRepositoryInterface::class);
+        $unfiltered = $repository->getAll();
+
+        $collection = $unfiltered->filter(
+            static function (Rule $rule) use ($currency) {
+                /** @var RuleTrigger $trigger */
+                foreach ($rule->ruleTriggers as $trigger) {
+                    if ('currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value) {
+                        return $rule;
+                    }
+                }
+
+                return null;
+            }
+        );
+
+        $count = $collection->count();
+        $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
+
+        /** @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');
+
+    }
 
     /**
      * Show a currency.
      *
-     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionCurrency $currency): JsonResponse
+    public function show(TransactionCurrency $currency): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager         = $this->getManager();
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show a currency.
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function showDefault(): JsonResponse
+    {
+        $manager  = $this->getManager();
+        $currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -159,32 +592,84 @@ class CurrencyController extends Controller
      *
      * @param CurrencyRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function store(CurrencyRequest $request): JsonResponse
     {
         $currency = $this->repository->store($request->getAll());
-
-        if (null !== $currency) {
-            if (true === $request->boolean('default')) {
-                app('preferences')->set('currencyPreference', $currency->code);
-                app('preferences')->mark();
-            }
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
-            $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-            $this->parameters->set('defaultCurrency', $defaultCurrency);
-
-            $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
-
-            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        if (true === $request->boolean('default')) {
+            app('preferences')->set('currencyPreference', $currency->code);
+            app('preferences')->mark();
         }
-        throw new FireflyException('Could not store new currency.'); // @codeCoverageIgnore
+        $manager         = $this->getManager();
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
 
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request             $request
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, TransactionCurrency $currency): 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 currency.
+            ->setCurrency($currency)
+            // 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.currencies.transactions', [$currency->code]) . $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 a currency.
@@ -204,14 +689,16 @@ class CurrencyController extends Controller
             app('preferences')->mark();
         }
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
 
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * CurrencyExchangeRateController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -31,12 +31,12 @@ use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class CurrencyExchangeRateController
+ *
+ * @codeCoverageIgnore
  */
 class CurrencyExchangeRateController extends Controller
 {
@@ -45,6 +45,7 @@ class CurrencyExchangeRateController extends Controller
 
     /**
      * CurrencyExchangeRateController constructor.
+     *
      */
     public function __construct()
     {
@@ -68,30 +69,28 @@ class CurrencyExchangeRateController extends Controller
      *
      * @param Request $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function index(Request $request): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
+        $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('Unknown source currency.');
+            throw new FireflyException('200007: Unknown source currency');
         }
         if (null === $toCurrency) {
-            throw new FireflyException('Unknown destination currency.');
+            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) {
@@ -103,8 +102,10 @@ class CurrencyExchangeRateController extends Controller
             $service->setUser($admin);
             $rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
         }
-
-        $resource = new Item($rate, new CurrencyExchangeRateTransformer($this->parameters), 'currency_exchange_rates');
+        /** @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/ImportController.php

@@ -0,0 +1,181 @@
+<?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/LinkTypeController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * LinkTypeController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -25,27 +25,28 @@ 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\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class LinkTypeController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinkTypeController extends Controller
 {
+    use TransactionFilter;
     /** @var LinkTypeRepositoryInterface The link type repository */
     private $repository;
 
@@ -54,6 +55,8 @@ class LinkTypeController extends Controller
 
     /**
      * LinkTypeController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -76,15 +79,16 @@ class LinkTypeController extends Controller
      *
      * @param LinkType $linkType
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @codeCoverageIgnore
+     * @return JsonResponse
      */
     public function delete(LinkType $linkType): JsonResponse
     {
         if (false === $linkType->editable) {
-            throw new FireflyException(sprintf('You cannot delete this link type (#%d, "%s")', $linkType->id, $linkType->name));
+            throw new FireflyException('200020: Link type cannot be changed.');
         }
-        $this->repository->destroy($linkType, null);
+        $this->repository->destroy($linkType);
 
         return response()->json([], 204);
     }
@@ -92,16 +96,14 @@ class LinkTypeController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         // create some objects:
-        $manager  = new Manager;
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $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();
@@ -112,9 +114,11 @@ class LinkTypeController extends Controller
         $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.link_types.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($linkTypes, new LinkTypeTransformer($this->parameters), 'link_types');
+        /** @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');
@@ -124,22 +128,19 @@ class LinkTypeController extends Controller
     /**
      * List single resource.
      *
-     * @param Request  $request
      * @param LinkType $linkType
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, LinkType $linkType): JsonResponse
+    public function show(LinkType $linkType): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        $resource = new Item($linkType, $transformer, 'link_types');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -150,8 +151,8 @@ class LinkTypeController extends Controller
      *
      * @param LinkTypeRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function store(LinkTypeRequest $request): JsonResponse
     {
@@ -159,50 +160,111 @@ class LinkTypeController extends Controller
         $admin = auth()->user();
 
         if (!$this->userRepository->hasRole($admin, 'owner')) {
-            throw new FireflyException('You need the "owner"-role to do this.');
+            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  = new Manager;
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager  = $this->getManager();
 
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        /** @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
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
     {
         if (false === $linkType->editable) {
-            throw new FireflyException(sprintf('You cannot edit this link type (#%d, "%s")', $linkType->id, $linkType->name));
+            throw new FireflyException('200020: Link type cannot be changed.');
         }
 
         /** @var User $admin */
         $admin = auth()->user();
 
         if (!$this->userRepository->hasRole($admin, 'owner')) {
-            throw new FireflyException('You need the "owner"-role to do this.');
+            throw new FireflyException('200005: You need the "owner" role to do this.'); // @codeCoverageIgnore
         }
 
         $data = $request->getAll();
         $this->repository->update($linkType, $data);
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        $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/PiggyBankController.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * PiggyBankController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -27,21 +27,19 @@ use FireflyIII\Api\V1\Requests\PiggyBankRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  * Class PiggyBankController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PiggyBankController extends Controller
 {
@@ -51,6 +49,8 @@ class PiggyBankController extends Controller
 
     /**
      * PiggyBankController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -75,6 +75,7 @@ class PiggyBankController extends Controller
      * @param PiggyBank $piggyBank
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(PiggyBank $piggyBank): JsonResponse
     {
@@ -83,21 +84,47 @@ class PiggyBankController extends Controller
         return response()->json([], 204);
     }
 
+
+    /**
+     * @param PiggyBank $piggyBank
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(PiggyBank $piggyBank): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($piggyBank);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
+    }
+
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks();
@@ -108,9 +135,11 @@ class PiggyBankController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($piggyBanks, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        /** @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', 'application/vnd.api+json');
@@ -120,22 +149,53 @@ class PiggyBankController extends Controller
     /**
      * List single resource.
      *
-     * @param Request   $request
      * @param PiggyBank $piggyBank
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, PiggyBank $piggyBank): JsonResponse
+    public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        // types to get, page size:
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $manager  = $this->getManager();
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $collection = $this->repository->getEvents($piggyBank);
+        $count      = $collection->count();
+        $events     = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
-        $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        // make paginator:
+        $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]) . $this->buildParams());
+
+        /** @var PiggyBankEventTransformer $transformer */
+        $transformer = app(PiggyBankEventTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(PiggyBank $piggyBank): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -146,23 +206,21 @@ class PiggyBankController extends Controller
      *
      * @param PiggyBankRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
     public function store(PiggyBankRequest $request): JsonResponse
     {
         $piggyBank = $this->repository->store($request->getAll());
-        if (null !== $piggyBank) {
-            $manager = new Manager();
-            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager   = $this->getManager();
 
-            $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-        }
-        throw new FireflyException('Could not store new piggy bank.');
+        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
@@ -175,12 +233,20 @@ class PiggyBankController extends Controller
      */
     public function update(PiggyBankRequest $request, PiggyBank $piggyBank): JsonResponse
     {
-        $piggyBank = $this->repository->update($piggyBank, $request->getAll());
-        $manager   = new Manager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $data      = $request->getAll();
+        $piggyBank = $this->repository->update($piggyBank, $data);
 
-        $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        if ('' !== $data['current_amount']) {
+            $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
+        }
+
+
+        $manager = $this->getManager();
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/PreferenceController.php

@@ -1,22 +1,22 @@
 <?php
 /**
- * PreferencesController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * PreferenceController.php
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -24,16 +24,15 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\PreferenceRequest;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\PreferenceTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
  *
@@ -41,22 +40,52 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class PreferenceController extends Controller
 {
+    /**
+     * LinkTypeController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            static function ($request, $next) {
+                /** @var User $user */
+                $user       = auth()->user();
+                $repository = app(AccountRepositoryInterface::class);
+                $repository->setUser($user);
+
+                // an important fallback is that the frontPageAccount array gets refilled automatically
+                // when it turns up empty.
+                $frontPageAccounts = app('preferences')->getForUser($user, 'frontPageAccounts', [])->data;
+                if (0 === count($frontPageAccounts)) {
+                    /** @var Collection $accounts */
+                    $accounts   = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+                    $accountIds = $accounts->pluck('id')->toArray();
+                    app('preferences')->setForUser($user, 'frontPageAccounts', $accountIds);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         /** @var User $user */
-        $user        = auth()->user();
-        $available   = [
+        $user      = auth()->user();
+        $available = [
             'language', 'customFiscalYear', 'fiscalYearStart', 'currencyPreference',
             'transaction_journal_optional_fields', 'frontPageAccounts', 'viewRange',
-            'listPageSize, twoFactorAuthEnabled',
+            'listPageSize',
         ];
+
         $preferences = new Collection;
         foreach ($available as $name) {
             $pref = app('preferences')->getForUser($user, $name);
@@ -65,39 +94,36 @@ class PreferenceController extends Controller
             }
         }
 
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($preferences, new PreferenceTransformer($this->parameters), 'preferences');
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($preferences, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
-
     }
 
     /**
-     * List single resource.
+     * Return a single preference by name.
      *
-     * @param Request    $request
      * @param Preference $preference
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Preference $preference): JsonResponse
+    public function show(Preference $preference): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($preference, new PreferenceTransformer($this->parameters), 'preferences');
+        $resource = new Item($preference, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 
     /**
@@ -107,7 +133,6 @@ class PreferenceController extends Controller
      * @param Preference        $preference
      *
      * @return JsonResponse
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function update(PreferenceRequest $request, Preference $preference): JsonResponse
     {
@@ -122,22 +147,20 @@ class PreferenceController extends Controller
                 $newValue = explode(',', $data['data']);
                 break;
             case 'listPageSize':
-                $newValue = (int)$data['data'];
+                $newValue = (int) $data['data'];
                 break;
             case 'customFiscalYear':
-            case 'twoFactorAuthEnabled':
-                $newValue = 1 === (int)$data['data'];
+                $newValue = 1 === (int) $data['data'];
                 break;
         }
         $result = app('preferences')->set($preference->name, $newValue);
 
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($result, new PreferenceTransformer($this->parameters), 'preferences');
+        $resource = new Item($result, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/RecurrenceController.php

@@ -1,52 +1,60 @@
 <?php
 /**
  * RecurrenceController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\RecurrenceRequest;
+use FireflyIII\Api\V1\Requests\RecurrenceStoreRequest;
+use FireflyIII\Api\V1\Requests\RecurrenceUpdateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Support\Cronjobs\RecurringCronjob;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\RecurrenceTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
 
 /**
  * Class RecurrenceController
  */
 class RecurrenceController extends Controller
 {
+    use TransactionFilter;
     /** @var RecurringRepositoryInterface The recurring transaction repository */
     private $repository;
 
     /**
      * RecurrenceController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -71,6 +79,7 @@ class RecurrenceController extends Controller
      * @param Recurrence $recurrence
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(Recurrence $recurrence): JsonResponse
     {
@@ -82,18 +91,15 @@ class RecurrenceController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getAll();
@@ -104,9 +110,11 @@ class RecurrenceController extends Controller
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($piggyBanks, new RecurrenceTransformer($this->parameters), 'recurrences');
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -116,22 +124,20 @@ class RecurrenceController extends Controller
     /**
      * List single resource.
      *
-     * @param Request    $request
      * @param Recurrence $recurrence
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Recurrence $recurrence): JsonResponse
+    public function show(Recurrence $recurrence): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $manager = $this->getManager();
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+        $resource = new Item($recurrence, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -141,38 +147,126 @@ class RecurrenceController extends Controller
     /**
      * Store new object.
      *
-     * @param RecurrenceRequest $request
+     * @param RecurrenceStoreRequest $request
      *
+     * @throws FireflyException
      * @return JsonResponse
      */
-    public function store(RecurrenceRequest $request): JsonResponse
+    public function store(RecurrenceStoreRequest $request): JsonResponse
     {
-        $recurrence = $this->repository->store($request->getAll());
-        $manager    = new Manager();
-        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+        $data       = $request->getAll();
+        $recurrence = $this->repository->store($data);
+        $manager    = $this->getManager();
+
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($recurrence, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show transactions for this recurrence.
+     *
+     * @param Request    $request
+     * @param Recurrence $recurrence
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Recurrence $recurrence): 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($recurrence);
+
+        /** @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');
+    }
+
+    /**
+     * @throws FireflyException
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function trigger(): JsonResponse
+    {
+        /** @var RecurringCronjob $recurring */
+        $recurring = app(RecurringCronjob::class);
+        try {
+            $result = $recurring->fire();
+        } catch (FireflyException $e) {
+            Log::error($e->getMessage());
+            throw new FireflyException('200022: Error in cron job.');
+        }
+        if (false === $result) {
+            return response()->json([], 204);
+        }
+        if (true === $result) {
+            return response()->json();
+        }
+
+        return response()->json([], 418); // @codeCoverageIgnore
+    }
+
     /**
      * Update single recurrence.
      *
-     * @param RecurrenceRequest $request
-     * @param Recurrence        $recurrence
+     * @param RecurrenceUpdateRequest $request
+     * @param Recurrence              $recurrence
      *
      * @return JsonResponse
      */
-    public function update(RecurrenceRequest $request, Recurrence $recurrence): JsonResponse
+    public function update(RecurrenceUpdateRequest $request, Recurrence $recurrence): JsonResponse
     {
         $data     = $request->getAll();
         $category = $this->repository->update($recurrence, $data);
-        $manager  = new Manager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager  = $this->getManager();
 
-        $resource = new Item($category, new RecurrenceTransformer($this->parameters), 'recurrences');
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/RuleController.php

@@ -1,52 +1,64 @@
 <?php
 /**
  * RuleController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\RuleRequest;
+use FireflyIII\Api\V1\Requests\RuleStoreRequest;
+use FireflyIII\Api\V1\Requests\RuleTestRequest;
+use FireflyIII\Api\V1\Requests\RuleTriggerRequest;
+use FireflyIII\Api\V1\Requests\RuleUpdateRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Rule;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use FireflyIII\TransactionRules\Engine\RuleEngine;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
 
 /**
  * Class RuleController
+ *
  */
 class RuleController extends Controller
 {
+    /** @var AccountRepositoryInterface Account repository */
+    private $accountRepository;
     /** @var RuleRepositoryInterface The rule repository */
     private $ruleRepository;
 
     /**
      * RuleController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -59,6 +71,9 @@ class RuleController extends Controller
                 $this->ruleRepository = app(RuleRepositoryInterface::class);
                 $this->ruleRepository->setUser($user);
 
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->accountRepository->setUser($user);
+
                 return $next($request);
             }
         );
@@ -70,6 +85,7 @@ class RuleController extends Controller
      * @param Rule $rule
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(Rule $rule): JsonResponse
     {
@@ -81,18 +97,15 @@ class RuleController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleRepository->getAll();
@@ -103,34 +116,75 @@ class RuleController extends Controller
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($rules, new RuleTransformer($this->parameters), 'rules');
+        /** @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');
 
     }
 
+    /**
+     * @param Rule $rule
+     *
+     * @return JsonResponse
+     */
+    public function moveDown(Rule $rule): JsonResponse
+    {
+        $this->ruleRepository->moveDown($rule);
+        $rule    = $this->ruleRepository->find($rule->id);
+        $manager = $this->getManager();
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * @param Rule $rule
+     *
+     * @return JsonResponse
+     */
+    public function moveUp(Rule $rule): JsonResponse
+    {
+        $this->ruleRepository->moveUp($rule);
+        $rule    = $this->ruleRepository->find($rule->id);
+        $manager = $this->getManager();
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * List single resource.
      *
-     * @param Request $request
-     * @param Rule    $rule
+     * @param Rule $rule
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Rule $rule): JsonResponse
+    public function show(Rule $rule): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $manager = $this->getManager();
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -139,40 +193,122 @@ class RuleController extends Controller
     /**
      * Store new object.
      *
-     * @param RuleRequest $request
+     * @param RuleStoreRequest $request
      *
      * @return JsonResponse
      */
-    public function store(RuleRequest $request): JsonResponse
+    public function store(RuleStoreRequest $request): JsonResponse
     {
         $rule    = $this->ruleRepository->store($request->getAll());
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager = $this->getManager();
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
-     * Update a rule.
+     * @param RuleTestRequest $request
+     * @param Rule            $rule
      *
-     * @param RuleRequest $request
-     * @param Rule        $rule
+     * @throws FireflyException
+     * @return JsonResponse
+     */
+    public function testRule(RuleTestRequest $request, Rule $rule): JsonResponse
+    {
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $parameters = $request->getTestParameters();
+        /** @var Rule $rule */
+        Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
+        /** @var TransactionMatcher $matcher */
+        $matcher = app(TransactionMatcher::class);
+        // set all parameters:
+        $matcher->setRule($rule);
+        $matcher->setStartDate($parameters['start_date']);
+        $matcher->setEndDate($parameters['end_date']);
+        $matcher->setSearchLimit($parameters['search_limit']);
+        $matcher->setTriggeredLimit($parameters['trigger_limit']);
+        $matcher->setAccounts($parameters['accounts']);
+
+        $matchingTransactions = $matcher->findTransactionsByRule();
+        $count                = count($matchingTransactions);
+        $transactions         = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
+        $paginator            = new LengthAwarePaginator($transactions, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
+
+        // resulting list is presented as JSON thing.
+        $manager = $this->getManager();
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Execute the given rule group on a set of existing transactions.
+     *
+     * @param RuleTriggerRequest $request
+     * @param Rule               $rule
      *
      * @return JsonResponse
      */
-    public function update(RuleRequest $request, Rule $rule): JsonResponse
+    public function triggerRule(RuleTriggerRequest $request, Rule $rule): JsonResponse
     {
-        $rule    = $this->ruleRepository->update($rule, $request->getAll());
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        // Get parameters specified by the user
+        $parameters = $request->getTriggerParameters();
 
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        /** @var RuleEngine $ruleEngine */
+        $ruleEngine = app(RuleEngine::class);
+        $ruleEngine->setUser(auth()->user());
+
+        $rules = [$rule->id];
+
+        $ruleEngine->setRulesToApply($rules);
+        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
+
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setAccounts($parameters['accounts']);
+        $collector->setRange($parameters['start_date'], $parameters['end_date']);
+        $journals = $collector->getExtractedJournals();
+
+        /** @var array $journal */
+        foreach ($journals as $journal) {
+            Log::debug('Start of new journal.');
+            $ruleEngine->processJournalArray($journal);
+            Log::debug('Done with all rules for this group + done with journal.');
+        }
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Update a rule.
+     *
+     * @param RuleUpdateRequest $request
+     * @param Rule              $rule
+     *
+     * @return JsonResponse
+     */
+    public function update(RuleUpdateRequest $request, Rule $rule): JsonResponse
+    {
+        $data    = $request->getAll();
+        $rule    = $this->ruleRepository->update($rule, $data);
+        $manager = $this->getManager();
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 }

app/Api/V1/Controllers/RuleGroupController.php

@@ -1,53 +1,66 @@
 <?php
 /**
  * RuleGroupController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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 Exception;
 use FireflyIII\Api\V1\Requests\RuleGroupRequest;
+use FireflyIII\Api\V1\Requests\RuleGroupTestRequest;
+use FireflyIII\Api\V1\Requests\RuleGroupTriggerRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\TransactionRules\Engine\RuleEngine;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleGroupTransformer;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
-
+use Log;
 
 /**
  * Class RuleGroupController
  */
 class RuleGroupController extends Controller
 {
+    /** @var AccountRepositoryInterface Account repository */
+    private $accountRepository;
     /** @var RuleGroupRepositoryInterface The rule group repository */
     private $ruleGroupRepository;
 
     /**
      * RuleGroupController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -60,6 +73,9 @@ class RuleGroupController extends Controller
                 $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
                 $this->ruleGroupRepository->setUser($user);
 
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->accountRepository->setUser($user);
+
                 return $next($request);
             }
         );
@@ -71,6 +87,7 @@ class RuleGroupController extends Controller
      * @param RuleGroup $ruleGroup
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(RuleGroup $ruleGroup): JsonResponse
     {
@@ -82,18 +99,14 @@ class RuleGroupController extends Controller
     /**
      * List all of them.
      *
-     * @param Request $request
-     *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
-        // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of rule groups. Count it and split it.
         $collection = $this->ruleGroupRepository->get();
@@ -104,33 +117,104 @@ class RuleGroupController extends Controller
         $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rule_groups.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($ruleGroups, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
-     * List single resource.
-     *
-     * @param Request   $request
      * @param RuleGroup $ruleGroup
      *
      * @return JsonResponse
      */
-    public function show(Request $request, RuleGroup $ruleGroup): JsonResponse
+    public function moveDown(RuleGroup $ruleGroup): JsonResponse
     {
-        $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $this->ruleGroupRepository->moveDown($ruleGroup);
+        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
+        $manager   = $this->getManager();
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function moveUp(RuleGroup $ruleGroup): JsonResponse
+    {
+        $this->ruleGroupRepository->moveUp($ruleGroup);
+        $ruleGroup = $this->ruleGroupRepository->find($ruleGroup->id);
+        $manager   = $this->getManager();
+
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param RuleGroup $group
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function rules(RuleGroup $group): 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->ruleGroupRepository->getRules($group);
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]) . $this->buildParams());
+
+        /** @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');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(RuleGroup $ruleGroup): JsonResponse
+    {
+        $manager = $this->getManager();
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -146,16 +230,119 @@ class RuleGroupController extends Controller
     public function store(RuleGroupRequest $request): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->store($request->getAll());
-        $manager   = new Manager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager   = $this->getManager();
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
 
+    /**
+     * @param RuleGroupTestRequest $request
+     * @param RuleGroup            $group
+     *
+     * @throws FireflyException
+     *
+     * @return JsonResponse
+     */
+    public function testGroup(RuleGroupTestRequest $request, RuleGroup $group): JsonResponse
+    {
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        Log::debug('Now in testGroup()');
+        /** @var Collection $rules */
+        $rules = $this->ruleGroupRepository->getActiveRules($group);
+        if (0 === $rules->count()) {
+            throw new FireflyException('200023: No rules in this rule group.');
+        }
+        $parameters           = $request->getTestParameters();
+        $matchingTransactions = [];
+
+        Log::debug(sprintf('Going to test %d rules', $rules->count()));
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
+            /** @var TransactionMatcher $matcher */
+            $matcher = app(TransactionMatcher::class);
+            // set all parameters:
+            $matcher->setRule($rule);
+            $matcher->setStartDate($parameters['start_date']);
+            $matcher->setEndDate($parameters['end_date']);
+            $matcher->setSearchLimit($parameters['search_limit']);
+            $matcher->setTriggeredLimit($parameters['trigger_limit']);
+            $matcher->setAccounts($parameters['accounts']);
+
+            $result = $matcher->findTransactionsByRule();
+            /** @noinspection AdditionOperationOnArraysInspection */
+            $matchingTransactions = $result + $matchingTransactions;
+        }
+
+        // make paginator out of results.
+        $count        = count($matchingTransactions);
+        $transactions = array_slice($matchingTransactions, ($parameters['page'] - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $parameters['page']);
+        $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams());
+
+        $manager     = $this->getManager();
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Execute the given rule group on a set of existing transactions.
+     *
+     * @param RuleGroupTriggerRequest $request
+     * @param RuleGroup               $group
+     *
+     * @throws Exception
+     * @return JsonResponse
+     */
+    public function triggerGroup(RuleGroupTriggerRequest $request, RuleGroup $group): JsonResponse
+    {
+        $parameters = $request->getTriggerParameters();
+
+        /** @var Collection $collection */
+        $collection = $this->ruleGroupRepository->getActiveRules($group);
+        $rules      = [];
+        /** @var Rule $item */
+        foreach ($collection as $item) {
+            $rules[] = $item->id;
+        }
+
+        // start looping.
+        /** @var RuleEngine $ruleEngine */
+        $ruleEngine = app(RuleEngine::class);
+        $ruleEngine->setUser(auth()->user());
+        $ruleEngine->setRulesToApply($rules);
+        $ruleEngine->setTriggerMode(RuleEngine::TRIGGER_STORE);
+
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setAccounts($parameters['accounts']);
+        $collector->setRange($parameters['start_date'], $parameters['end_date']);
+        $journals = $collector->getExtractedJournals();
+
+        /** @var array $journal */
+        foreach ($journals as $journal) {
+            Log::debug('Start of new journal.');
+            $ruleEngine->processJournalArray($journal);
+            Log::debug('Done with all rules for this group + done with journal.');
+        }
+
+        return response()->json([], 204);
+    }
+
     /**
      * Update a rule group.
      *
@@ -167,13 +354,14 @@ class RuleGroupController extends Controller
     public function update(RuleGroupRequest $request, RuleGroup $ruleGroup): JsonResponse
     {
         $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll());
-        $manager   = new Manager();
-        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $manager   = $this->getManager();
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 }

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

@@ -0,0 +1,100 @@
+<?php
+declare(strict_types=1);
+/**
+ * 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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Search;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Search\AccountSearch;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use Log;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    use AccountFilter;
+
+    /** @var array */
+    private $validFields;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->validFields = [
+            AccountSearch::SEARCH_ALL,
+            AccountSearch::SEARCH_ID,
+            AccountSearch::SEARCH_NAME,
+            AccountSearch::SEARCH_IBAN,
+            AccountSearch::SEARCH_NUMBER,
+        ];
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse|Response
+     */
+    public function search(Request $request)
+    {
+        Log::debug('Now in account search()');
+        $manager = $this->getManager();
+        $query   = $request->get('query');
+        $field   = $request->get('field');
+        $type    = $request->get('type') ?? 'all';
+        if ('' === $query || !in_array($field, $this->validFields, true)) {
+            return response(null, 422);
+        }
+        $types = $this->mapAccountTypes($type);
+        Log::debug(sprintf('Going to search for "%s" in types', $query), $types);
+
+        /** @var AccountSearch $search */
+        $search = app(AccountSearch::class);
+        $search->setUser(auth()->user());
+        $search->setTypes($types);
+        $search->setField($field);
+        $search->setQuery($query);
+
+        $accounts = $search->search();
+
+        Log::debug(sprintf('Found %d accounts', $accounts->count()));
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $count     = $accounts->count();
+        $perPage   = 0 === $count ? 1 : $count;
+        $paginator = new LengthAwarePaginator($accounts, $count, $perPage, 1);
+
+        $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');
+    }
+}

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

@@ -0,0 +1,64 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionController.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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Search;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use Illuminate\Http\Request;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+    /** @var string */
+    public const SEARCH_ALL = 'all';
+    /** @var string */
+    public const SEARCH_DESCRIPTION = 'description';
+    /** @var string */
+    public const SEARCH_NOTES = 'notes';
+    /** @var string */
+    public const SEARCH_ACCOUNTS = 'accounts';
+    /** @var array */
+    private $validFields;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->validFields = [
+            self::SEARCH_ALL,
+            self::SEARCH_DESCRIPTION,
+            self::SEARCH_NOTES,
+            self::SEARCH_ACCOUNTS,
+        ];
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return void
+     */
+    public function search(Request $request): void
+    {
+        die('the route is present but nobody\'s home.');
+    }
+}

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

@@ -0,0 +1,113 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransferController.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/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Search;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Search\TransferRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Support\Search\TransferSearch;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+/**
+ * Class TransferController
+ */
+class TransferController extends Controller
+{
+    /**
+     * @param TransferRequest $request
+     *
+     * @return JsonResponse|Response
+     */
+    public function search(TransferRequest $request)
+    {
+        // configure transfer search to search for a > b
+        $search = app(TransferSearch::class);
+        $search->setSource($request->get('source'));
+        $search->setDestination($request->get('destination'));
+        $search->setAmount($request->get('amount'));
+        $search->setDescription($request->get('description'));
+        $search->setDate($request->get('date'));
+
+        $left = $search->search();
+
+        // configure transfer search to search for b > a
+        $search->setSource($request->get('destination'));
+        $search->setDestination($request->get('source'));
+        $search->setAmount($request->get('amount'));
+        $search->setDescription($request->get('description'));
+        $search->setDate($request->get('date'));
+
+        $right = $search->search();
+
+        // add parameters to URL:
+        $this->parameters->set('source', $request->get('source'));
+        $this->parameters->set('destination', $request->get('destination'));
+        $this->parameters->set('amount', $request->get('amount'));
+        $this->parameters->set('description', $request->get('description'));
+        $this->parameters->set('date', $request->get('date'));
+
+        // get all journal ID's.
+        $total = $left->merge($right)->unique('id')->pluck('id')->toArray();
+        if (0 === count($total)) {
+            // forces search to be empty.
+            $total = [-1];
+        }
+
+        // collector to return results.
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $manager  = $this->getManager();
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // all info needed for the API:
+            ->withAPIInformation()
+            // set page size:
+            ->setLimit($pageSize)
+            // set page to retrieve
+            ->setPage(1)
+            ->setJournalIds($total);
+
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.search.transfers') . $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/SummaryController.php

@@ -0,0 +1,427 @@
+<?php
+
+/**
+ * SummaryController.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 Exception;
+use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Helpers\Report\NetWorthInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class SummaryController
+ */
+class SummaryController extends Controller
+{
+    /** @var AvailableBudgetRepositoryInterface */
+    private $abRepository;
+    /** @var AccountRepositoryInterface */
+    private $accountRepository;
+    /** @var BillRepositoryInterface */
+    private $billRepository;
+    /** @var BudgetRepositoryInterface */
+    private $budgetRepository;
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepos;
+
+    /** @var OperationsRepositoryInterface */
+    private $opsRepository;
+
+    /**
+     * SummaryController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                    = auth()->user();
+                $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
+                $this->billRepository    = app(BillRepositoryInterface::class);
+                $this->budgetRepository  = app(BudgetRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->abRepository      = app(AvailableBudgetRepositoryInterface::class);
+                $this->opsRepository     = app(OperationsRepositoryInterface::class);
+
+                $this->billRepository->setUser($user);
+                $this->currencyRepos->setUser($user);
+                $this->budgetRepository->setUser($user);
+                $this->accountRepository->setUser($user);
+                $this->abRepository->setUser($user);
+                $this->opsRepository->setUser($user);
+
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param DateRequest $request
+     *
+     * @throws Exception
+     * @return JsonResponse
+     */
+    public function basic(DateRequest $request): JsonResponse
+    {
+        // parameters for boxes:
+        $dates = $request->getAll();
+        $start = $dates['start'];
+        $end   = $dates['end'];
+        $code  = $request->get('currency_code');
+
+        // balance information:
+        $balanceData  = $this->getBalanceInformation($start, $end);
+        $billData     = $this->getBillInformation($start, $end);
+        $spentData    = $this->getLeftToSpendInfo($start, $end);
+        $networthData = $this->getNetWorthInfo($start, $end);
+        $total        = array_merge($balanceData, $billData, $spentData, $networthData);
+
+        // give new keys
+        $return = [];
+        foreach ($total as $entry) {
+            if (null === $code || (null !== $code && $code === $entry['currency_code'])) {
+                $return[$entry['key']] = $entry;
+            }
+        }
+
+        return response()->json($return);
+    }
+
+    /**
+     * Check if date is outside session range.
+     *
+     * @param Carbon $date
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return bool
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getBalanceInformation(Carbon $start, Carbon $end): array
+    {
+        // prep some arrays:
+        $incomes  = [];
+        $expenses = [];
+        $sums     = [];
+        $return   = [];
+
+        // collect income of user using the new group collector.
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setRange($start, $end)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes([TransactionType::DEPOSIT]);
+
+        $set = $collector->getExtractedJournals();
+        /** @var array $transactionJournal */
+        foreach ($set as $transactionJournal) {
+            $currencyId           = (int) $transactionJournal['currency_id'];
+            $incomes[$currencyId] = $incomes[$currencyId] ?? '0';
+            $incomes[$currencyId] = bcadd($incomes[$currencyId], bcmul($transactionJournal['amount'], '-1'));
+            $sums[$currencyId]    = $sums[$currencyId] ?? '0';
+            $sums[$currencyId]    = bcadd($sums[$currencyId], bcmul($transactionJournal['amount'], '-1'));
+        }
+
+        // collect expenses of user using the new group collector.
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setRange($start, $end)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes([TransactionType::WITHDRAWAL]);
+
+
+        $set = $collector->getExtractedJournals();
+
+        /** @var array $transactionJournal */
+        foreach ($set as $transactionJournal) {
+            $currencyId            = (int) $transactionJournal['currency_id'];
+            $expenses[$currencyId] = $expenses[$currencyId] ?? '0';
+            $expenses[$currencyId] = bcadd($expenses[$currencyId], $transactionJournal['amount']);
+            $sums[$currencyId]     = $sums[$currencyId] ?? '0';
+            $sums[$currencyId]     = bcadd($sums[$currencyId], $transactionJournal['amount']);
+        }
+
+        // format amounts:
+        $keys = array_keys($sums);
+        foreach ($keys as $currencyId) {
+            $currency = $this->currencyRepos->findNull($currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            // create objects for big array.
+            $return[] = [
+                'key'                     => sprintf('balance-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($sums[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false) .
+                                             ' + ' . app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+            ];
+            $return[] = [
+                'key'                     => sprintf('spent-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($expenses[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+            $return[] = [
+                'key'                     => sprintf('earned-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($incomes[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getBillInformation(Carbon $start, Carbon $end): array
+    {
+        /*
+         * Since both this method and the chart use the exact same data, we can suffice
+         * with calling the one method in the bill repository that will get this amount.
+         */
+        $paidAmount   = $this->billRepository->getBillsPaidInRangePerCurrency($start, $end);
+        $unpaidAmount = $this->billRepository->getBillsUnpaidInRangePerCurrency($start, $end);
+        $return       = [];
+        foreach ($paidAmount as $currencyId => $amount) {
+            $amount   = bcmul($amount, '-1');
+            $currency = $this->currencyRepos->findNull((int) $currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            $return[] = [
+                'key'                     => sprintf('bills-paid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($amount, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'local_icon'              => 'check',
+                'sub_title'               => '',
+            ];
+        }
+
+        foreach ($unpaidAmount as $currencyId => $amount) {
+            $amount   = bcmul($amount, '-1');
+            $currency = $this->currencyRepos->findNull((int) $currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            $return[] = [
+                'key'                     => sprintf('bills-unpaid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($amount, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'local_icon'              => 'calendar-o',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @throws Exception
+     * @return array
+     */
+    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
+    {
+        $return    = [];
+        $today     = new Carbon;
+        $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
+        $budgets   = $this->budgetRepository->getActiveBudgets();
+        $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
+
+        foreach ($spent as $row) {
+            // either an amount was budgeted or 0 is available.
+            $amount          = $available[$row['currency_id']] ?? '0';
+            $spentInCurrency = $row['sum'];
+            $leftToSpend     = bcadd($amount, $spentInCurrency);
+
+            $days   = $today->diffInDays($end) + 1;
+            $perDay = '0';
+            if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
+                $perDay = bcdiv($leftToSpend, (string) $days);
+            }
+
+            $return[] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
+                'monetary_value'          => round($leftToSpend, $row['currency_decimal_places']),
+                'currency_id'             => $row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_symbol'         => $row['currency_symbol'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+                'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),
+                'local_icon'              => 'money',
+                'sub_title'               => (string) trans(
+                    'firefly.box_spend_per_day',
+                    ['amount' => app('amount')->formatFlat(
+                        $row['currency_symbol'],
+                        $row['currency_decimal_places'],
+                        $perDay,
+                        false
+                    )]
+                ),
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getNetWorthInfo(Carbon $start, Carbon $end): array
+    {
+        /** @var User $user */
+        $user = auth()->user();
+        $date = Carbon::now()->startOfDay();
+
+
+        // start and end in the future? use $end
+        if ($this->notInDateRange($date, $start, $end)) {
+            /** @var Carbon $date */
+            $date = session('end', Carbon::now()->endOfMonth());
+        }
+
+        /** @var NetWorthInterface $netWorthHelper */
+        $netWorthHelper = app(NetWorthInterface::class);
+        $netWorthHelper->setUser($user);
+        $allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE]);
+
+        // filter list on preference of being included.
+        $filtered = $allAccounts->filter(
+            function (Account $account) {
+                $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth');
+
+                return null === $includeNetWorth ? true : '1' === $includeNetWorth;
+            }
+        );
+
+        $netWorthSet = $netWorthHelper->getNetWorthByCurrency($filtered, $date);
+        $return      = [];
+        foreach ($netWorthSet as $data) {
+            /** @var TransactionCurrency $currency */
+            $currency = $data['currency'];
+            $amount   = round($data['balance'], $currency->decimal_places);
+            if (0.0 === $amount) {
+                continue;
+            }
+            // return stuff
+            $return[] = [
+                'key'                     => sprintf('net-worth-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => $amount,
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $data['balance'], false),
+                'local_icon'              => 'line-chart',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Controllers/TagController.php

@@ -0,0 +1,339 @@
+<?php
+/**
+ * TagController.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\Api\V1\Requests\DateRequest;
+use FireflyIII\Api\V1\Requests\TagStoreRequest;
+use FireflyIII\Api\V1\Requests\TagUpdateRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\Transformers\TagTransformer;
+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 TagController
+ */
+class TagController extends Controller
+{
+    use TransactionFilter;
+
+    /** @var TagRepositoryInterface The tag repository */
+    private $repository;
+
+    /**
+     * TagController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    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 DateRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function cloud(DateRequest $request): JsonResponse
+    {
+        // parameters for boxes:
+        $dates = $request->getAll();
+        $start = $dates['start'];
+        $end   = $dates['end'];
+
+        // get all tags:
+        $tags  = $this->repository->get();
+        $cloud = $this->getTagCloud($tags, $start, $end);
+
+        return response()->json($cloud);
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param Tag $tag
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function delete(Tag $tag): JsonResponse
+    {
+        $this->repository->destroy($tag);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @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->get();
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.tags.index') . $this->buildParams());
+
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($rules, $transformer, 'tags');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * @param Tag $tag
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function attachments(Tag $tag): JsonResponse
+    {
+        $manager    = $this->getManager();
+        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($tag);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.tags.attachments', [$tag->id]) . $this->buildParams());
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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');
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Tag $tag
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(Tag $tag): JsonResponse
+    {
+        $manager = $this->getManager();
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($tag, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param TagStoreRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(TagStoreRequest $request): JsonResponse
+    {
+        $rule    = $this->repository->store($request->getAll());
+        $manager = $this->getManager();
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     * @param Tag     $tag
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function transactions(Request $request, Tag $tag): 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 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');
+    }
+
+    /**
+     * Update a rule.
+     *
+     * @param TagUpdateRequest $request
+     * @param Tag              $tag
+     *
+     * @return JsonResponse
+     */
+    public function update(TagUpdateRequest $request, Tag $tag): JsonResponse
+    {
+        $rule    = $this->repository->update($tag, $request->getAll());
+        $manager = $this->getManager();
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * @param array $cloud
+     * @param float $min
+     * @param float $max
+     *
+     * @return array
+     */
+    private function analyseTagCloud(array $cloud, float $min, float $max): array
+    {
+        foreach (array_keys($cloud['tags']) as $index) {
+            $cloud['tags'][$index]['relative'] = round($cloud['tags'][$index]['size'] / $max, 4);
+        }
+        $cloud['min'] = $min;
+        $cloud['max'] = $max;
+
+        return $cloud;
+    }
+
+    /**
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    private function getTagCloud(Collection $tags, Carbon $start, Carbon $end): array
+    {
+        $min   = null;
+        $max   = 0;
+        $cloud = [
+            'tags' => [],
+        ];
+        /** @var Tag $tag */
+        foreach ($tags as $tag) {
+            $earned = (float) $this->repository->earnedInPeriod($tag, $start, $end);
+            $spent  = (float) $this->repository->spentInPeriod($tag, $start, $end);
+            $size   = ($spent * -1) + $earned;
+            $min    = $min ?? $size;
+            if ($size > 0) {
+                $max             = $size > $max ? $size : $max;
+                $cloud['tags'][] = [
+                    'tag'  => $tag->tag,
+                    'id'   => $tag->id,
+                    'size' => $size,
+                ];
+            }
+        }
+        $cloud = $this->analyseTagCloud($cloud, $min, $max);
+
+        return $cloud;
+    }
+}

app/Api/V1/Controllers/TransactionController.php

@@ -2,59 +2,72 @@
 
 /**
  * TransactionController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\TransactionRequest;
+use FireflyIII\Api\V1\Requests\TransactionStoreRequest;
+use FireflyIII\Api\V1\Requests\TransactionUpdateRequest;
+use FireflyIII\Events\StoredTransactionGroup;
+use FireflyIII\Events\UpdatedTransactionGroup;
+use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
-use FireflyIII\Helpers\Filter\NegativeAmountFilter;
-use FireflyIII\Helpers\Filter\PositiveAmountFilter;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionType;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalAPIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Transformers\TransactionTransformer;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\Transformers\PiggyBankEventTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
-use League\Fractal\Serializer\JsonApiSerializer;
+use League\Fractal\Resource\Item;
+use Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class TransactionController
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TransactionController extends Controller
 {
+    use TransactionFilter;
 
+    /** @var TransactionGroupRepositoryInterface Group repository. */
+    private $groupRepository;
+    /** @var JournalAPIRepositoryInterface Journal API repos */
+    private $journalAPIRepository;
     /** @var JournalRepositoryInterface The journal repository */
     private $repository;
 
     /**
      * TransactionController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -64,9 +77,12 @@ class TransactionController extends Controller
                 /** @var User $admin */
                 $admin = auth()->user();
 
-                /** @var JournalRepositoryInterface repository */
-                $this->repository = app(JournalRepositoryInterface::class);
+                $this->repository           = app(JournalRepositoryInterface::class);
+                $this->groupRepository      = app(TransactionGroupRepositoryInterface::class);
+                $this->journalAPIRepository = app(JournalAPIRepositoryInterface::class);
                 $this->repository->setUser($admin);
+                $this->groupRepository->setUser($admin);
+                $this->journalAPIRepository->setUser($admin);
 
                 return $next($request);
             }
@@ -74,16 +90,54 @@ class TransactionController extends Controller
     }
 
     /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \FireflyIII\Models\Transaction $transaction
+     * @param TransactionGroup $transactionGroup
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function delete(Transaction $transaction): JsonResponse
+    public function attachments(TransactionGroup $transactionGroup): JsonResponse
     {
-        $journal = $transaction->transactionJournal;
-        $this->repository->destroy($journal);
+        $manager     = $this->getManager();
+        $attachments = new Collection;
+        foreach ($transactionGroup->transactionJournals as $transactionJournal) {
+            $attachments = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($attachments);
+        }
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($attachments, $transformer, 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param TransactionGroup $transactionGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function delete(TransactionGroup $transactionGroup): JsonResponse
+    {
+        $this->repository->destroyGroup($transactionGroup);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param TransactionJournal $transactionJournal
+     *
+     * @codeCoverageIgnore
+     * @return JsonResponse
+     */
+    public function deleteJournal(TransactionJournal $transactionJournal): JsonResponse
+    {
+        $this->repository->destroyJournal($transactionJournal);
 
         return response()->json([], 204);
     }
@@ -94,130 +148,191 @@ class TransactionController extends Controller
      * @param Request $request
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function index(Request $request): JsonResponse
     {
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
-        $types   = $this->mapTypes($this->parameters->get('type'));
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = $this->getManager();
         /** @var User $admin */
         $admin = auth()->user();
-        /** @var TransactionCollectorInterface $collector */
-        $collector = app(TransactionCollectorInterface::class);
-        $collector->setUser($admin);
-        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
-        $collector->setAllAssetAccounts();
 
-        if (\in_array(TransactionType::TRANSFER, $types, true)) {
-            $collector->removeFilter(InternalTransferFilter::class);
-        }
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // 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'));
         }
-        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
-        $collector->setTypes($types);
-        $paginator = $collector->getPaginatedTransactions();
+        $paginator = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
         $transactions = $paginator->getCollection();
 
-        $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        /** @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');
     }
 
-
     /**
-     * Show a single transaction.
-     *
-     * @param Request     $request
-     * @param Transaction $transaction
-     * @param string      $include
+     * @param TransactionGroup $transactionGroup
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, Transaction $transaction, string $include = null): JsonResponse
+    public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
     {
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        // add include parameter:
-        $include = $include ?? '';
-        $include = $request->get('include') ?? $include;
-        $manager->parseIncludes($include);
-
-        // collect transactions using the journal collector
-        $collector = app(TransactionCollectorInterface::class);
-        $collector->setUser(auth()->user());
-        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
-        // filter on specific journals.
-        $collector->setJournals(new Collection([$transaction->transactionJournal]));
-
-        // add filter to remove transactions:
-        $transactionType = $transaction->transactionJournal->transactionType->type;
-        if ($transactionType === TransactionType::WITHDRAWAL) {
-            $collector->addFilter(PositiveAmountFilter::class);
-        }
-        if (!($transactionType === TransactionType::WITHDRAWAL)) {
-            $collector->addFilter(NegativeAmountFilter::class);
+        $manager = $this->getManager();
+        $events  = new Collection;
+        foreach ($transactionGroup->transactionJournals as $transactionJournal) {
+            $events = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($events);
         }
 
-        $transactions = $collector->getTransactions();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        /** @var PiggyBankEventTransformer $transformer */
+        $transformer = app(PiggyBankEventTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show a single transaction.
+     *
+     * @param TransactionGroup $transactionGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function show(TransactionGroup $transactionGroup): JsonResponse
+    {
+        $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 transaction group.
+            ->setTransactionGroup($transactionGroup)
+            // all info needed for the API:
+            ->withAPIInformation();
+
+        $selectedGroup = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new NotFoundHttpException();
+        }
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($selectedGroup, $transformer, 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show a single transaction, by transaction journal.
+     *
+     * @param TransactionJournal $transactionJournal
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function showByJournal(TransactionJournal $transactionJournal): JsonResponse
+    {
+        return $this->show($transactionJournal->transactionGroup);
+    }
+
     /**
      * Store a new transaction.
      *
-     * @param TransactionRequest         $request
-     *
-     * @param JournalRepositoryInterface $repository
+     * @param TransactionStoreRequest $request
      *
      * @throws FireflyException
      * @return JsonResponse
      */
-    public function store(TransactionRequest $request, JournalRepositoryInterface $repository): JsonResponse
+    public function store(TransactionStoreRequest $request): JsonResponse
     {
+        Log::debug('Now in API TransactionController::store()');
         $data         = $request->getAll();
         $data['user'] = auth()->user()->id;
-        $journal      = $repository->store($data);
 
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        Log::channel('audit')
+           ->info('Store new transaction over API.', $data);
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        try {
+            $transactionGroup = $this->groupRepository->store($data);
+        } catch (DuplicateTransactionException $e) {
+            Log::warning('Caught a duplicate transaction. Return error message.');
+            // return bad validation message.
+            // TODO use Laravel's internal validation thing to do this.
+            $response = [
+                'message' => 'The given data was invalid.',
+                'errors'  => [
+                    'transactions.0.description' => [$e->getMessage()],
+                ],
+            ];
 
-        // collect transactions using the journal collector
-        $collector = app(TransactionCollectorInterface::class);
-        $collector->setUser(auth()->user());
-        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
-        // filter on specific journals.
-        $collector->setJournals(new Collection([$journal]));
+            return response()->json($response, 422);
+        } catch (FireflyException $e) {
+            Log::warning('Caught an exception. Return error message.');
+            Log::error($e->getMessage());
+            // return bad validation message.
+            // TODO use Laravel's internal validation thing to do this.
+            $response = [
+                'message' => 'The given data was invalid.',
+                'errors'  => [
+                    'transactions.0.description' => [sprintf('Internal exception: %s', $e->getMessage())],
+                ],
+            ];
 
-        // add filter to remove transactions:
-        $transactionType = $journal->transactionType->type;
-        if ($transactionType === TransactionType::WITHDRAWAL) {
-            $collector->addFilter(PositiveAmountFilter::class);
-        }
-        if (!($transactionType === TransactionType::WITHDRAWAL)) {
-            $collector->addFilter(NegativeAmountFilter::class);
+            return response()->json($response, 422);
         }
+        app('preferences')->mark();
+        event(new StoredTransactionGroup($transactionGroup, $data['apply_rules'] ?? true));
 
-        $transactions = $collector->getTransactions();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        $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 transaction group.
+            ->setTransactionGroup($transactionGroup)
+            // all info needed for the API:
+            ->withAPIInformation();
+
+        $selectedGroup = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new FireflyException('Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
+        }
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($selectedGroup, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -226,82 +341,42 @@ class TransactionController extends Controller
     /**
      * Update a transaction.
      *
-     * @param TransactionRequest         $request
-     * @param JournalRepositoryInterface $repository
-     * @param Transaction                $transaction
+     * @param TransactionUpdateRequest $request
+     * @param TransactionGroup         $transactionGroup
      *
      * @return JsonResponse
      */
-    public function update(TransactionRequest $request, JournalRepositoryInterface $repository, Transaction $transaction): JsonResponse
+    public function update(TransactionUpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse
     {
-        $data         = $request->getAll();
-        $data['user'] = auth()->user()->id;
-        $journal      = $repository->update($transaction->transactionJournal, $data);
-        $manager      = new Manager();
-        $baseUrl      = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        Log::debug('Now in update routine.');
+        $data             = $request->getAll();
+        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
+        $manager          = $this->getManager();
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        app('preferences')->mark();
+        event(new UpdatedTransactionGroup($transactionGroup, $data['apply_rules'] ?? true));
 
-        // needs a lot of extra data to match the journal collector. Or just expand that one.
-        // collect transactions using the journal collector
-        $collector = app(TransactionCollectorInterface::class);
-        $collector->setUser(auth()->user());
-        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
-        // filter on specific journals.
-        $collector->setJournals(new Collection([$journal]));
+        /** @var User $admin */
+        $admin = auth()->user();
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // filter on transaction group.
+            ->setTransactionGroup($transactionGroup)
+            // all info needed for the API:
+            ->withAPIInformation();
 
-        // add filter to remove transactions:
-        $transactionType = $journal->transactionType->type;
-        if ($transactionType === TransactionType::WITHDRAWAL) {
-            $collector->addFilter(PositiveAmountFilter::class);
+        $selectedGroup = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new NotFoundHttpException(); // @codeCoverageIgnore
         }
-        if (!($transactionType === TransactionType::WITHDRAWAL)) {
-            $collector->addFilter(NegativeAmountFilter::class);
-        }
-
-        $transactions = $collector->getTransactions();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($selectedGroup, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
-    }
-
-    /**
-     * All the types you can request.
-     *
-     * @param string $type
-     *
-     * @return array
-     */
-    private function mapTypes(string $type): array
-    {
-        $types  = [
-            'all'             => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE,
-                                  TransactionType::RECONCILIATION,],
-            'withdrawal'      => [TransactionType::WITHDRAWAL,],
-            'withdrawals'     => [TransactionType::WITHDRAWAL,],
-            'expense'         => [TransactionType::WITHDRAWAL,],
-            'income'          => [TransactionType::DEPOSIT,],
-            'deposit'         => [TransactionType::DEPOSIT,],
-            'deposits'        => [TransactionType::DEPOSIT,],
-            'transfer'        => [TransactionType::TRANSFER,],
-            'transfers'       => [TransactionType::TRANSFER,],
-            'opening_balance' => [TransactionType::OPENING_BALANCE,],
-            'reconciliation'  => [TransactionType::RECONCILIATION,],
-            'reconciliations' => [TransactionType::RECONCILIATION,],
-            'special'         => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,],
-            'specials'        => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,],
-            'default'         => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER,],
-        ];
-        $return = $types['default'];
-        if (isset($types[$type])) {
-            $return = $types[$type];
-        }
-
-        return $return;
-
     }
 }

app/Api/V1/Controllers/TransactionLinkController.php

@@ -1,58 +1,59 @@
 <?php
 /**
- * JournalLinkController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * TransactionLinkController.php
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\JournalLinkRequest;
+use FireflyIII\Api\V1\Requests\TransactionLinkRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Transformers\JournalLinkTransformer;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\TransactionLinkTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
- * Class JournalLinkController.
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Class TransactionLinkController
  */
-class JournalLinkController extends Controller
+class TransactionLinkController extends Controller
 {
+    use TransactionFilter;
+
     /** @var JournalRepositoryInterface The journal repository */
     private $journalRepository;
     /** @var LinkTypeRepositoryInterface The link type repository */
     private $repository;
 
     /**
-     * JournalLinkController constructor.
+     * TransactionLinkController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -79,6 +80,7 @@ class JournalLinkController extends Controller
      * @param TransactionJournalLink $link
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function delete(TransactionJournalLink $link): JsonResponse
     {
@@ -92,34 +94,34 @@ class JournalLinkController extends Controller
      *
      * @param Request $request
      *
-     * @return JsonResponse]
+     * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function index(Request $request): JsonResponse
     {
         // create some objects:
-        $manager = new Manager;
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $manager = $this->getManager();
         // read type from URI
-        $name = $request->get('name') ?? null;
+        $name = $request->get('name');
 
         // types to get, page size:
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $linkType = $this->repository->findByName($name);
 
-        // get list of accounts. Count it and split it.
+        // get list of transaction links. Count it and split it.
         $collection   = $this->repository->getJournalLinks($linkType);
         $count        = $collection->count();
         $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:
         $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.journal_links.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.transaction_links.index') . $this->buildParams());
 
-        // present to user.
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($journalLinks, new JournalLinkTransformer($this->parameters), 'journal_links');
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -129,22 +131,20 @@ class JournalLinkController extends Controller
     /**
      * List single resource.
      *
-     * @param Request                $request
      * @param TransactionJournalLink $journalLink
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, TransactionJournalLink $journalLink): JsonResponse
+    public function show(TransactionJournalLink $journalLink): JsonResponse
     {
-        $manager = new Manager;
+        $manager = $this->getManager();
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -153,62 +153,59 @@ class JournalLinkController extends Controller
     /**
      * Store new object.
      *
-     * @param JournalLinkRequest $request
+     * @param TransactionLinkRequest $request
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
-    public function store(JournalLinkRequest $request): JsonResponse
+    public function store(TransactionLinkRequest $request): JsonResponse
     {
-        $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
+        $manager = $this->getManager();
         $data    = $request->getAll();
         $inward  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $outward = $this->journalRepository->findNull($data['outward_id'] ?? 0);
         if (null === $inward || null === $outward) {
-            throw new FireflyException('Source or destination is NULL.');
+            throw new FireflyException('200024: Source or destination does not exist.');
         }
         $data['direction'] = 'inward';
 
         $journalLink = $this->repository->storeLink($data, $inward, $outward);
-        $resource    = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 
     /**
      * Update object.
      *
-     * @param JournalLinkRequest     $request
+     * @param TransactionLinkRequest $request
      * @param TransactionJournalLink $journalLink
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @return JsonResponse
      */
-    public function update(JournalLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
+    public function update(TransactionLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
     {
-        $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-
+        $manager         = $this->getManager();
         $data            = $request->getAll();
         $data['inward']  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $data['outward'] = $this->journalRepository->findNull($data['outward_id'] ?? 0);
         if (null === $data['inward'] || null === $data['outward']) {
-            throw new FireflyException('Source or destination is NULL.');
+            throw new FireflyException('200024: Source or destination does not exist.');
         }
         $data['direction'] = 'inward';
         $journalLink       = $this->repository->updateLink($journalLink, $data);
 
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/UserController.php

@@ -2,47 +2,44 @@
 
 /**
  * UserController.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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\UserRequest;
+use FireflyIII\Api\V1\Requests\UserStoreRequest;
+use FireflyIII\Api\V1\Requests\UserUpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Transformers\UserTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
-use League\Fractal\Serializer\JsonApiSerializer;
 
 
 /**
  * Class UserController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UserController extends Controller
 {
@@ -52,6 +49,8 @@ class UserController extends Controller
 
     /**
      * UserController constructor.
+     *
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -69,39 +68,35 @@ class UserController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \FireflyIII\User $user
+     * @param User $user
      *
-     * @return JsonResponse
      * @throws FireflyException
+     * @codeCoverageIgnore
+     * @return JsonResponse
      */
     public function delete(User $user): JsonResponse
     {
         /** @var User $admin */
         $admin = auth()->user();
-        if ($this->repository->hasRole($admin, 'owner')) {
+        if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) {
             $this->repository->destroy($user);
 
             return response()->json([], 204);
         }
-        throw new FireflyException('No access to method.'); // @codeCoverageIgnore
+        throw new FireflyException('200025: No access to function.'); // @codeCoverageIgnore
     }
 
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         // user preferences
-        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $manager  = $this->getManager();
 
         // build collection
         $collection = $this->repository->all();
@@ -113,7 +108,11 @@ class UserController extends Controller
         $paginator->setPath(route('api.v1.users.index') . $this->buildParams());
 
         // make resource
-        $resource = new FractalCollection($users, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($users, $transformer, 'users');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -122,24 +121,21 @@ class UserController extends Controller
     /**
      * Show a single user.
      *
-     * @param Request $request
-     * @param User    $user
+     * @param User $user
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function show(Request $request, User $user): JsonResponse
+    public function show(User $user): JsonResponse
     {
         // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
+        $manager = $this->getManager();
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -147,26 +143,23 @@ class UserController extends Controller
     /**
      * Store a new user.
      *
-     * @param UserRequest $request
+     * @param UserStoreRequest $request
      *
      * @return JsonResponse
      */
-    public function store(UserRequest $request): JsonResponse
+    public function store(UserStoreRequest $request): JsonResponse
     {
-        $data = $request->getAll();
-        $user = $this->repository->store($data);
-
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        $data    = $request->getAll();
+        $user    = $this->repository->store($data);
+        $manager = $this->getManager();
 
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -174,27 +167,22 @@ class UserController extends Controller
     /**
      * Update a user.
      *
-     * @param UserRequest $request
-     * @param User        $user
+     * @param UserUpdateRequest $request
+     * @param User              $user
      *
      * @return JsonResponse
      */
-    public function update(UserRequest $request, User $user): JsonResponse
+    public function update(UserUpdateRequest $request, User $user): JsonResponse
     {
-        $data = $request->getAll();
-        $user = $this->repository->update($user, $data);
-
-        // make manager
-        $manager = new Manager();
-        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
-        $manager->setSerializer(new JsonApiSerializer($baseUrl));
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
+        $data    = $request->getAll();
+        $user    = $this->repository->update($user, $data);
+        $manager = $this->getManager();
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Middleware/ApiDemoUser.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * ApiDemoUser.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\Middleware;
+
+use Closure;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\Request;
+
+/**
+ * Class ApiDemoUser.
+ */
+class ApiDemoUser
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        if (null === $user) {
+            return $next($request);
+        }
+
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+
+        if ($repository->hasRole($user, 'demo')) {
+            return response('', 403);
+        }
+
+        return $next($request);
+    }
+}

app/Api/V1/Requests/AccountRequest.php

@@ -1,136 +0,0 @@
-<?php
-
-/**
- * AccountRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Requests;
-/**
- * Class AccountRequest
- */
-class AccountRequest extends Request
-{
-
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
-
-    /**
-     * Get all data from the request.
-     *
-     * @return array
-     */
-    public function getAll(): array
-    {
-        $data = [
-            'name'                 => $this->string('name'),
-            'active'               => $this->boolean('active'),
-            'include_net_worth'    => $this->boolean('include_net_worth'),
-            'accountType'          => $this->string('type'),
-            'account_type_id'      => null,
-            'currency_id'          => $this->integer('currency_id'),
-            'currency_code'        => $this->string('currency_code'),
-            'virtualBalance'       => $this->string('virtual_balance'),
-            'iban'                 => $this->string('iban'),
-            'BIC'                  => $this->string('bic'),
-            'accountNumber'        => $this->string('account_number'),
-            'accountRole'          => $this->string('account_role'),
-            'openingBalance'       => $this->string('opening_balance'),
-            'openingBalanceDate'   => $this->date('opening_balance_date'),
-            'ccType'               => $this->string('cc_type'),
-            'ccMonthlyPaymentDate' => $this->string('cc_monthly_payment_date'),
-            'notes'                => $this->string('notes'),
-            'interest'             => $this->string('interest'),
-            'interest_period'      => $this->string('interest_period'),
-        ];
-        // new fields for liabilities
-        //            'liability_type'       => $this->string('liability_type'),
-        //            'liability_start_date' => $this->date('liability_start_date'),
-
-
-        //];
-        if ('liability' === $data['accountType']) {
-            $data['openingBalance']     = bcmul($this->string('liability_amount'), '-1');
-            $data['openingBalanceDate'] = $this->date('liability_start_date');
-            $data['accountType']        = $this->string('liability_type');
-            $data['account_type_id']    = null;
-        }
-
-        return $data;
-    }
-
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $accountRoles   = implode(',', config('firefly.accountRoles'));
-        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
-        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
-        $rules          = [
-            'name'                    => 'required|min:1|uniqueAccountForUser',
-            'opening_balance'         => 'numeric|required_with:opening_balance_date|nullable',
-            'opening_balance_date'    => 'date|required_with:opening_balance|nullable',
-            'iban'                    => 'iban|nullable',
-            'bic'                     => 'bic|nullable',
-            'virtual_balance'         => 'numeric|nullable',
-            'currency_id'             => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
-            'currency_code'           => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
-            'account_number'          => 'between:1,255|nullable|uniqueAccountNumberForUser',
-            'account_role'            => 'in:' . $accountRoles . '|required_if:type,asset',
-            'active'                  => 'required|boolean',
-            'include_net_worth'       => 'required|boolean',
-            'cc_type'                 => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
-            'cc_monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:cc_type,monthlyFull',
-            'type'                    => 'required|in:' . $types,
-            'notes'                   => 'min:0|max:65536',
-            // required fields for liabilities:
-            'liability_type'          => 'required_if:type,liability|in:loan,debt,mortgage,credit card',
-            'liability_amount'        => 'required_if:type,liability|min:0|numeric',
-            'liability_start_date'    => 'required_if:type,liability|date',
-            'interest'                => 'required_if:type,liability|between:0,100|numeric',
-            'interest_period'         => 'required_if:type,liability|in:daily,monthly,yearly',
-
-        ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                $account                 = $this->route()->parameter('account');
-                $rules['name']           .= ':' . $account->id;
-                $rules['account_number'] .= ':' . $account->id;
-                $rules['type']           = 'in:' . $types;
-                break;
-        }
-
-        return $rules;
-    }
-}

app/Api/V1/Requests/AccountStoreRequest.php

@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * AccountStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Location;
+use FireflyIII\Rules\IsBoolean;
+
+/**
+ * Class AccountStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class AccountStoreRequest extends Request
+{
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllAccountData(): array
+    {
+        $active          = true;
+        $includeNetWorth = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('include_net_worth')) {
+            $includeNetWorth = $this->boolean('include_net_worth');
+        }
+        $data = [
+            'name'                    => $this->string('name'),
+            'active'                  => $active,
+            'include_net_worth'       => $includeNetWorth,
+            'account_type'            => $this->string('type'),
+            'account_type_id'         => null,
+            'currency_id'             => $this->integer('currency_id'),
+            'currency_code'           => $this->string('currency_code'),
+            'virtual_balance'         => $this->string('virtual_balance'),
+            'iban'                    => $this->string('iban'),
+            'BIC'                     => $this->string('bic'),
+            'account_number'          => $this->string('account_number'),
+            'account_role'            => $this->string('account_role'),
+            'opening_balance'         => $this->string('opening_balance'),
+            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'cc_type'                 => $this->string('credit_card_type'),
+            'cc_Monthly_payment_date' => $this->string('monthly_payment_date'),
+            'notes'                   => $this->nlString('notes'),
+            'interest'                => $this->string('interest'),
+            'interest_period'         => $this->string('interest_period'),
+        ];
+        // append Location information.
+        $data = $this->appendLocationData($data, null);
+
+        if ('liability' === $data['account_type']) {
+            $data['opening_balance']      = bcmul($this->string('liability_amount'), '-1');
+            $data['opening_balance_date'] = $this->date('liability_start_date');
+            $data['account_type']         = $this->string('liability_type');
+            $data['account_type_id']      = null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+        $rules          = [
+            'name'                 => 'required|min:1|uniqueAccountForUser',
+            'type'                 => 'required|' . sprintf('in:%s', $types),
+            'iban'                 => 'iban|nullable',
+            'bic'                  => 'bic|nullable',
+            'account_number'       => 'between:1,255|nullable|uniqueAccountNumberForUser',
+            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            'virtual_balance'      => 'numeric|nullable',
+            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
+            'active'               => [new IsBoolean],
+            'include_net_worth'    => [new IsBoolean],
+            'account_role'         => sprintf('in:%s|required_if:type,asset', $accountRoles),
+            'credit_card_type'     => sprintf('in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
+            'monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
+            'liability_amount'     => 'required_if:type,liability|min:0|numeric',
+            'liability_start_date' => 'required_if:type,liability|date',
+            'interest'             => 'required_if:type,liability|between:0,100|numeric',
+            'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
+            'notes'                => 'min:0|max:65536',
+        ];
+        $rules          = Location::requestRules($rules);
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * AccountUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Location;
+use FireflyIII\Rules\IsBoolean;
+
+/**
+ * Class AccountUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class AccountUpdateRequest extends Request
+{
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getUpdateData(): array
+    {
+        $active          = null;
+        $includeNetWorth = null;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('include_net_worth')) {
+            $includeNetWorth = $this->boolean('include_net_worth');
+        }
+        $data = [
+            'name'                    => $this->nullableString('name'),
+            'active'                  => $active,
+            'include_net_worth'       => $includeNetWorth,
+            'account_type'            => $this->nullableString('type'),
+            'account_type_id'         => null,
+            'currency_id'             => $this->nullableInteger('currency_id'),
+            'currency_code'           => $this->nullableString('currency_code'),
+            'virtual_balance'         => $this->nullableString('virtual_balance'),
+            'iban'                    => $this->nullableString('iban'),
+            'BIC'                     => $this->nullableString('bic'),
+            'account_number'          => $this->nullableString('account_number'),
+            'account_role'            => $this->nullableString('account_role'),
+            'opening_balance'         => $this->nullableString('opening_balance'),
+            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'cc_type'                 => $this->nullableString('credit_card_type'),
+            'cc_Monthly_payment_date' => $this->nullableString('monthly_payment_date'),
+            'notes'                   => $this->nullableNlString('notes'),
+            'interest'                => $this->nullableString('interest'),
+            'interest_period'         => $this->nullableString('interest_period'),
+        ];
+
+        $data = $this->appendLocationData($data, null);
+
+        if ('liability' === $data['account_type']) {
+            $data['opening_balance']      = bcmul($this->nullableString('liability_amount'), '-1');
+            $data['opening_balance_date'] = $this->date('liability_start_date');
+            $data['account_type']         = $this->nullableString('liability_type');
+            $data['account_type_id']      = null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $account        = $this->route()->parameter('account');
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+
+        $rules = [
+            'name'                 => sprintf('min:1|uniqueAccountForUser:%d', $account->id),
+            'type'                 => sprintf('in:%s', $types),
+            'iban'                 => 'iban|nullable',
+            'bic'                  => 'bic|nullable',
+            'account_number'       => sprintf('between:1,255|nullable|uniqueAccountNumberForUser:%d', $account->id),
+            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            'virtual_balance'      => 'numeric|nullable',
+            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
+            'active'               => [new IsBoolean],
+            'include_net_worth'    => [new IsBoolean],
+            'account_role'         => sprintf('in:%s|required_if:type,asset', $accountRoles),
+            'credit_card_type'     => sprintf('in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
+            'monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
+            'liability_amount'     => 'required_if:type,liability|min:0|numeric',
+            'liability_start_date' => 'required_if:type,liability|date',
+            'interest'             => 'required_if:type,liability|between:0,100|numeric',
+            'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
+            'notes'                => 'min:0|max:65536',
+        ];
+        $rules = Location::requestRules($rules);
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/AttachmentRequest.php

@@ -1,97 +0,0 @@
-<?php
-/**
- * AttachmentRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Requests;
-
-use FireflyIII\Models\Bill;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Rules\IsValidAttachmentModel;
-
-/**
- * Class AttachmentRequest
- */
-class AttachmentRequest extends Request
-{
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
-
-    /**
-     * Get all data from the request.
-     *
-     * @return array
-     */
-    public function getAll(): array
-    {
-        return [
-            'filename' => $this->string('filename'),
-            'title'    => $this->string('title'),
-            'notes'    => $this->string('notes'),
-            'model'    => $this->string('model'),
-            'model_id' => $this->integer('model_id'),
-        ];
-    }
-
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $models = implode(
-            ',', [
-                   Bill::class,
-                   ImportJob::class,
-                   TransactionJournal::class,
-               ]
-        );
-        $model  = $this->string('model');
-        $rules  = [
-            'filename' => 'required|between:1,255',
-            'title'    => 'between:1,255',
-            'notes'    => 'between:1,65000',
-            'model'    => sprintf('required|in:%s', $models),
-            'model_id' => ['required', 'numeric', new IsValidAttachmentModel($model)],
-        ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                unset($rules['model'], $rules['model_id']);
-                $rules['filename'] = 'between:1,255';
-                break;
-        }
-
-        return $rules;
-    }
-}

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * AttachmentStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\IsValidAttachmentModel;
+
+/**
+ * Class AttachmentStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class AttachmentStoreRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'filename' => $this->string('filename'),
+            'title'    => $this->string('title'),
+            'notes'    => $this->nlString('notes'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $models = config('firefly.valid_attachment_models');
+        $models = array_map(
+
+            static function (string $className) {
+                return str_replace('FireflyIII\\Models\\', '', $className);
+            }, $models
+        );
+        $models = implode(',', $models);
+        $model  = $this->string('attachable_type');
+
+        return [
+            'filename'        => 'required|between:1,255',
+            'title'           => 'between:1,255',
+            'notes'           => 'between:1,65000',
+            'attachable_type' => sprintf('required|in:%s', $models),
+            'attachable_id'   => ['required', 'numeric', new IsValidAttachmentModel($model)],
+        ];
+    }
+}

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * AttachmentUpdateRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+/**
+ * ClassAttachmentUpdateRequest
+ *
+ * @codeCoverageIgnore
+ */
+class AttachmentUpdateRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'filename' => $this->string('filename'),
+            'title'    => $this->string('title'),
+            'notes'    => $this->nlString('notes'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'filename' => 'between:1,255',
+            'title'    => 'between:1,255',
+            'notes'    => 'between:1,65000',
+        ];
+    }
+}

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -1,22 +1,22 @@
 <?php
 /**
  * AvailableBudgetRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * 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);
@@ -25,6 +25,8 @@ namespace FireflyIII\Api\V1\Requests;
 
 /**
  * Class AvailableBudgetRequest
+ *
+ * @codeCoverageIgnore
  */
 class AvailableBudgetRequest extends Request
 {
@@ -50,8 +52,8 @@ class AvailableBudgetRequest extends Request
             'currency_id'   => $this->integer('currency_id'),
             'currency_code' => $this->string('currency_code'),
             'amount'        => $this->string('amount'),
-            'start_date'    => $this->date('start_date'),
-            'end_date'      => $this->date('end_date'),
+            'start'         => $this->date('start'),
+            'end'           => $this->date('end'),
         ];
     }
 
@@ -62,15 +64,13 @@ class AvailableBudgetRequest extends Request
      */
     public function rules(): array
     {
-        $rules = [
-            'currency_id'   => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
+        return [
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
             'amount'        => 'required|numeric|more:0',
-            'start_date'    => 'required|date|before:end_date',
-            'end_date'      => 'required|date|after:start_date',
+            'start'         => 'required|date|before:end',
+            'end'           => 'required|date|after:start',
         ];
-
-        return $rules;
     }
 
 

app/Api/V1/Requests/BillRequest.php

@@ -2,32 +2,37 @@
 
 /**
  * BillRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Rules\IsBoolean;
 use Illuminate\Validation\Validator;
 
 /**
  * Class BillRequest
+ *
+ * TODO AFTER 4.8,0: split this into two request classes.
+ *
+ * @codeCoverageIgnore
  */
 class BillRequest extends Request
 {
@@ -50,7 +55,12 @@ class BillRequest extends Request
      */
     public function getAll(): array
     {
-        $data = [
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
+        return [
             'name'          => $this->string('name'),
             'amount_min'    => $this->string('amount_min'),
             'amount_max'    => $this->string('amount_max'),
@@ -59,18 +69,16 @@ class BillRequest extends Request
             'date'          => $this->date('date'),
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
-            'automatch'     => $this->boolean('automatch'),
-            'active'        => $this->boolean('active'),
-            'notes'         => $this->string('notes'),
+            'active'        => $active,
+            'notes'         => $this->nlString('notes'),
         ];
-
-        return $data;
     }
 
     /**
      * The rules that the incoming request must be matched against.
      *
      * @return array
+     *
      */
     public function rules(): array
     {
@@ -78,13 +86,12 @@ class BillRequest extends Request
             'name'          => 'required|between:1,255|uniqueObjectForUser:bills,name',
             'amount_min'    => 'required|numeric|more:0',
             'amount_max'    => 'required|numeric|more:0',
-            'currency_id'   => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
             'date'          => 'required|date',
             'repeat_freq'   => 'required|in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'          => 'required|between:0,31',
-            'automatch'     => 'required|boolean',
-            'active'        => 'required|boolean',
+            'skip'          => 'between:0,31',
+            'active'        => [new IsBoolean],
             'notes'         => 'between:1,65536',
         ];
         switch ($this->method()) {
@@ -103,19 +110,19 @@ class BillRequest extends Request
     /**
      * Configure the validator instance.
      *
-     * @param  Validator $validator
+     * @param Validator $validator
      *
      * @return void
      */
     public function withValidator(Validator $validator): void
     {
         $validator->after(
-            function (Validator $validator) {
+            static function (Validator $validator) {
                 $data = $validator->getData();
-                $min  = (float)($data['amount_min'] ?? 0);
-                $max  = (float)($data['amount_max'] ?? 0);
+                $min  = (float) ($data['amount_min'] ?? 0);
+                $max  = (float) ($data['amount_max'] ?? 0);
                 if ($min > $max) {
-                    $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max'));
+                    $validator->errors()->add('amount_min', (string) trans('validation.amount_min_over_max'));
                 }
             }
         );

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -1,31 +1,33 @@
 <?php
 /**
  * BudgetLimitRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
- * This file is part of Firefly III.
+ * This file is part of Firefly III (https://github.com/firefly-iii).
  *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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.
  *
- * Firefly III is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-
 /**
  * Class BudgetLimitRequest
+ *
+ * @codeCoverageIgnore
+ * TODO AFTER 4.8,0: split this into two request classes.
  */
 class BudgetLimitRequest extends Request
 {
@@ -48,10 +50,12 @@ class BudgetLimitRequest extends Request
     public function getAll(): array
     {
         return [
-            'budget_id'  => $this->integer('budget_id'),
-            'start_date' => $this->date('start_date'),
-            'end_date'   => $this->date('end_date'),
-            'amount'     => $this->string('amount'),
+            'budget_id'     => $this->integer('budget_id'),
+            'start'         => $this->date('start'),
+            'end'           => $this->date('end'),
+            'amount'        => $this->string('amount'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
         ];
     }
 
@@ -63,10 +67,12 @@ class BudgetLimitRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'budget_id'  => 'required|exists:budgets,id|belongsToUser:budgets,id',
-            'start_date' => 'required|before:end_date|date',
-            'end_date'   => 'required|after:start_date|date',
-            'amount'     => 'required|more:0',
+            'budget_id'     => 'required|exists:budgets,id|belongsToUser:budgets,id',
+            'start'         => 'required|before:end|date',
+            'end'           => 'required|after:start|date',
+            'amount'        => 'required|more:0',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
         ];
         switch ($this->method()) {
             default:
@@ -76,6 +82,12 @@ class BudgetLimitRequest extends Request
                 $rules['budget_id'] = 'required|exists:budgets,id|belongsToUser:budgets,id';
                 break;
         }
+        // if request has a budget already, drop the rule.
+        $budget = $this->route()->parameter('budget');
+        if (null !== $budget) {
+            unset($rules['budget_id']);
+        }
+
 
         return $rules;
     }

app/Api/V1/Requests/BudgetRequest.php

@@ -1,82 +0,0 @@
-<?php
-/**
- * BudgetRequest.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Requests;
-
-use FireflyIII\Models\Budget;
-
-/**
- * Class BudgetRequest
- */
-class BudgetRequest extends Request
-{
-    /**
-     * Authorize logged in users.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        // Only allow authenticated users
-        return auth()->check();
-    }
-
-    /**
-     * Get all data from the request.
-     *
-     * @return array
-     */
-    public function getAll(): array
-    {
-        return [
-            'name'   => $this->string('name'),
-            'active' => $this->boolean('active'),
-            'order'  => 0,
-        ];
-    }
-
-    /**
-     * The rules that the incoming request must be matched against.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $rules = [
-            'name'   => 'required|between:1,100|uniqueObjectForUser:budgets,name',
-            'active' => 'required|boolean',
-        ];
-        switch ($this->method()) {
-            default:
-                break;
-            case 'PUT':
-            case 'PATCH':
-                /** @var Budget $budget */
-                $budget        = $this->route()->parameter('budget');
-                $rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id);
-                break;
-        }
-
-        return $rules;
-    }
-}

app/Api/V1/Requests/BudgetStoreRequest.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * BudgetStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\IsBoolean;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class BudgetStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class BudgetStoreRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
+        return [
+            'name'                      => $this->string('name'),
+            'active'                    => $active,
+            'order'                     => 0,
+            'auto_budget_type'          => $this->string('auto_budget_type'),
+            'transaction_currency_id'   => $this->integer('auto_budget_currency_id'),
+            'transaction_currency_code' => $this->string('auto_budget_currency_code'),
+            'auto_budget_amount'        => $this->string('auto_budget_amount'),
+            'auto_budget_period'        => $this->string('auto_budget_period'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'name'                      => 'required|between:1,100|uniqueObjectForUser:budgets,name',
+            'active'                    => [new IsBoolean],
+            'auto_budget_type'          => 'in:reset,rollover,none',
+            'auto_budget_currency_id'   => 'exists:transaction_currencies,id',
+            'auto_budget_currency_code' => 'exists:transaction_currencies,code',
+            'auto_budget_amount'        => 'min:0|max:1000000000',
+            'auto_budget_period'        => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
+        ];
+    }
+
+
+    /**
+     * Configure the validator instance with special rules for after the basic validation rules.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                // validate all account info
+                $this->validateAutoBudgetAmount($validator);
+            }
+        );
+    }
+}