Merge branch 'release/5.3.2' into main

5.3.1

.env.example

@@ -10,14 +10,14 @@ APP_DEBUG=false
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
-# If you generate a new one existing data must be considered LOST.
+# If you generate a new one all existing attachments must be considered LOST.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
 
 #
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
 #
 # If text is still in English, remember that not everything may have been translated.
 DEFAULT_LANGUAGE=en_US
@@ -57,14 +57,27 @@ APP_LOG_LEVEL=notice
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-# Use "mysql" for MySQL and MariaDB. Use "sqlite" for SQLite.
-DB_CONNECTION=pgsql
+# Use "pgsql" for PostgreSQL
+# Use "mysql" for MySQL and MariaDB.
+# Use "sqlite" for SQLite.
+DB_CONNECTION=mysql
 DB_HOST=fireflyiiidb
-DB_PORT=5432
+DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
 
+# MySQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+MYSQL_USE_SSL=false
+MYSQL_SSL_VERIFY_SERVER_CERT=true
+# You need to set at least of these options
+MYSQL_SSL_CAPATH=/etc/ssl/certs/
+MYSQL_SSL_CA=
+MYSQL_SSL_CERT=
+MYSQL_SSL_KEY=
+MYSQL_SSL_CIPHER=
+
 # PostgreSQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 PGSQL_SSL_MODE=prefer
@@ -97,8 +110,8 @@ COOKIE_SECURE=false
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
+MAIL_MAILER=log
+MAIL_HOST=null
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -156,6 +169,23 @@ FIXER_API_KEY=
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
+#
+# It's also possible to change the way users are authenticated. You could use Authelia for example.
+# Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard".
+#
+# If you do this please read the documentation for instructions and warnings:
+# https://docs.firefly-iii.org/advanced-installation/authentication
+#
+# This function is available in Firefly III v5.3.0 and higher.
+AUTHENTICATION_GUARD=web
+
+#
+# Likewise, it's impossible to log out users who's authentication is handled by an external system.
+# Enter a custom URL here that will force a logout (your authentication provider can tell you).
+# Setting this variable only works when AUTHENTICATION_GUARD != web
+#
+CUSTOM_LOGOUT_URI=
+
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
 # # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
@@ -170,8 +200,16 @@ ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
 ADLDAP_BASEDN=""
 ADLDAP_FOLLOW_REFFERALS=false
+
+# SSL/TLS settings
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
+ADLDAP_SSL_CACERTDIR=
+ADLDAP_SSL_CACERTFILE=
+ADLDAP_SSL_CERTFILE=
+ADLDAP_SSL_KEYFILE=
+ADLDAP_SSL_CIPHER_SUITE=
+ADLDAP_SSL_REQUIRE_CERT=
 
 # You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
@@ -191,6 +229,7 @@ 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
 
@@ -218,8 +257,9 @@ TRACKER_SITE_ID=
 TRACKER_URL=
 
 #
-# Firefly III could (in the future) collect telemetry on how you use Firefly III.
-# In order to allow this, change the following variable to true:
+# Firefly III can collect telemetry on how you use Firefly III. This is opt-in.
+# In order to allow this, change the following variable to true.
+# To read more about this feature, go to this page: https://docs.firefly-iii.org/support/telemetry
 SEND_TELEMETRY=false
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
@@ -266,10 +306,8 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 USE_ENCRYPTION=false
-IS_SANDSTORM=false
-IS_DOCKER=false
 IS_HEROKU=false
-BUNQ_USE_SANDBOX=false
+FIREFLY_III_LAYOUT=v1
 
 #
 # If you have trouble configuring your Firefly III installation, DON'T BOTHER setting this variable.

.github/contributing.md

@@ -8,7 +8,7 @@ I am always interested in expanding Firefly III's many features. Just open a tic
 
 ## Pull requests
 
-When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch.
+When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `main` branch.
 
 ## Translations :us: :fr: :de:
 

.github/lock.yml

@@ -32,4 +32,4 @@ setLockReason: true
 #   daysUntilLock: 30
 
 # Repository to extend settings from
-# _extends: repo
+# _extends: repo

.github/pull_request_template.md

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

.github/security.md

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

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /frontend/node_modules
+/frontend/fonts
 /public/hot
 /public/storage
 /storage/*.key

app.json

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

app/Api/V1/Controllers/AccountController.php

@@ -50,8 +50,9 @@ use League\Fractal\Resource\Item;
 class AccountController extends Controller
 {
     use AccountFilter, TransactionFilter;
-    /** @var AccountRepositoryInterface The account repository */
-    private $repository;
+
+    private AccountRepositoryInterface $repository;
+    public const RESOURCE_KEY = 'accounts';
 
     /**
      * AccountController constructor.
@@ -150,7 +151,7 @@ class AccountController extends Controller
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new FractalCollection($accounts, $transformer, 'accounts');
+        $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -208,7 +209,7 @@ class AccountController extends Controller
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -230,7 +231,7 @@ class AccountController extends Controller
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -304,7 +305,7 @@ class AccountController extends Controller
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource = new Item($account, $transformer, 'accounts');
+        $resource = new Item($account, $transformer, self::RESOURCE_KEY);
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }

app/Api/V1/Controllers/AttachmentController.php

@@ -23,10 +23,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+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;
@@ -58,6 +60,7 @@ class AttachmentController extends Controller
     public function __construct()
     {
         parent::__construct();
+        $this->middleware(ApiDemoUser::class)->except(['delete', 'download', 'show', 'index']);
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
@@ -65,6 +68,7 @@ class AttachmentController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
+
                 return $next($request);
             }
         );

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

@@ -42,10 +42,8 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use ApiSupport;
-    /** @var CurrencyRepositoryInterface */
-    private $currencyRepository;
-    /** @var AccountRepositoryInterface */
-    private $repository;
+    private CurrencyRepositoryInterface $currencyRepository;
+    private AccountRepositoryInterface $repository;
 
     /**
      * AccountController constructor.
@@ -196,6 +194,8 @@ class AccountController extends Controller
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
+                'start_date'              => $start->format('Y-m-d'),
+                'end_date'                => $end->format('Y-m-d'),
                 'type'                    => 'line', // line, area or bar
                 'yAxisID'                 => 0, // 0, 1, 2
                 'entries'                 => [],

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

@@ -0,0 +1,298 @@
+<?php
+/**
+ * BudgetController.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\DateRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    private BudgetLimitRepositoryInterface $blRepository;
+    private OperationsRepositoryInterface  $opsRepository;
+    private BudgetRepositoryInterface      $repository;
+
+    /**
+     * BudgetController constructor.
+     *
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                //$this->generator     = app(GeneratorInterface::class);
+                $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
+
+                //$this->nbRepository  = app(NoBudgetRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * [
+     *   'label'                   => 'label for entire set'
+     *   'currency_id'             => 0,
+     *   'currency_code'           => 'EUR',
+     *   'currency_symbol'         => '$',
+     *   'currency_decimal_places' => 2,
+     *   'type'                    => 'bar', // line, area or bar
+     *   'yAxisID'                 => 0, // 0, 1, 2
+     *   'entries'                 => ['a' => 1, 'b' => 4],
+     * ],
+     *
+     * @param DateRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function overview(DateRequest $request): JsonResponse
+    {
+        $dates         = $request->getAll();
+        $budgets       = $this->repository->getActiveBudgets();
+        $budgetNames   = [];
+        $currencyNames = [];
+        $sets          = [];
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            $expenses = $this->getExpenses($budget, $dates['start'], $dates['end']);
+            $expenses = $this->filterNulls($expenses);
+            foreach ($expenses as $set) {
+                $budgetNames[]   = $set['budget_name'];
+                $currencyNames[] = $set['currency_name'];
+                $sets[]          = $set;
+            }
+        }
+        $budgetNames   = array_unique($budgetNames);
+        $currencyNames = array_unique($currencyNames);
+        $basic         = $this->createSets($budgetNames, $currencyNames);
+        $filled        = $this->fillSets($basic, $sets);
+        $keys          = array_values($filled);
+
+        return response()->json($keys);
+    }
+
+    /**
+     * @param Collection $limits
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    protected function getExpenses(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+        if (0 === $limits->count()) {
+            return $this->getExpenseInRange($budget, $start, $end);
+        }
+        $arr = [];
+        /** @var BudgetLimit $limit */
+        foreach ($limits as $limit) {
+            $arr[] = $this->getExpensesForLimit($limit);
+        }
+
+        return $arr;
+    }
+
+    /**
+     * @param array $budgetNames
+     * @param array $currencyNames
+     *
+     * @return array
+     */
+    private function createSets(array $budgetNames, array $currencyNames): array
+    {
+        $return = [];
+        foreach ($currencyNames as $currencyName) {
+            $entries = [];
+            foreach ($budgetNames as $budgetName) {
+                $label           = sprintf('%s (%s)', $budgetName, $currencyName);
+                $entries[$label] = '0';
+            }
+
+            // left
+            $return['left'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.left'), $currencyName),
+                'data_type'     => 'left',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // spent_capped
+            $return['spent_capped'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.spent'), $currencyName),
+                'data_type'     => 'spent_capped',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+            // overspent
+            $return['overspent'] = [
+                'label'         => sprintf('%s (%s)', trans('firefly.overspent'), $currencyName),
+                'data_type'     => 'overspent',
+                'currency_name' => $currencyName,
+                'type'          => 'bar',
+                'yAxisID'       => 0, // 0, 1, 2
+                'entries'       => $entries,
+            ];
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param array $basic
+     * @param array $sets
+     *
+     * @return array
+     */
+    private function fillSets(array $basic, array $sets): array
+    {
+        foreach ($sets as $set) {
+            $label                                    = $set['label'];
+            //$basic['spent']['entries'][$label]        = $set['entries']['spent'];
+            $basic['spent_capped']['entries'][$label] = $set['entries']['spent_capped'];
+            $basic['left']['entries'][$label]         = $set['entries']['left'];
+            $basic['overspent']['entries'][$label]    = $set['entries']['overspent'];
+        }
+
+        return $basic;
+    }
+
+    /**
+     * @param array $expenses
+     *
+     * @return array
+     */
+    private function filterNulls(array $expenses): array
+    {
+        $return = [];
+        /** @var array|null $arr */
+        foreach ($expenses as $arr) {
+            if (null !== $arr) {
+                $return[] = $arr;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getExpenseInRange(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $spent  = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget]), null);
+        $return = [];
+        /** @var array $set */
+        foreach ($spent as $set) {
+            $current                            = [
+                'label'                   => sprintf('%s (%s)', $budget->name, $set['currency_name']),
+                'budget_name'             => $budget->name,
+                'start_date'              => $start->format('Y-m-d'),
+                'end_date'                => $end->format('Y-m-d'),
+                'currency_id'             => (int) $set['currency_id'],
+                'currency_code'           => $set['currency_code'],
+                'currency_name'           => $set['currency_name'],
+                'currency_symbol'         => $set['currency_symbol'],
+                'currency_decimal_places' => (int) $set['currency_decimal_places'],
+                'type'                    => 'bar', // line, area or bar,
+                'entries'                 => [],
+            ];
+            $sumSpent                           = bcmul($set['sum'], '-1'); // spent
+            $current['entries']['spent']        = $sumSpent;
+            $current['entries']['amount']       = '0';
+            $current['entries']['spent_capped'] = $sumSpent;
+            $current['entries']['left']         = '0';
+            $current['entries']['overspent']    = '0';
+            $return[]                           = $current;
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param BudgetLimit $limit
+     *
+     * @return array|null
+     */
+    private function getExpensesForLimit(BudgetLimit $limit): ?array
+    {
+        $budget   = $limit->budget;
+        $spent    = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $limit->transactionCurrency);
+        $currency = $limit->transactionCurrency;
+        // when limited to a currency, the count is always one. Or it's empty.
+        $set = array_shift($spent);
+        if (null === $set) {
+            return null;
+        }
+        $return                            = [
+            'label'                   => sprintf('%s (%s)', $budget->name, $set['currency_name']),
+            'budget_name'             => $budget->name,
+            'start_date'              => $limit->start_date->format('Y-m-d'),
+            'end_date'                => $limit->end_date->format('Y-m-d'),
+            'currency_id'             => (int) $currency->id,
+            'currency_code'           => $currency->code,
+            'currency_name'           => $currency->name,
+            'currency_symbol'         => $currency->symbol,
+            'currency_decimal_places' => (int) $currency->decimal_places,
+            'type'                    => 'bar', // line, area or bar,
+            'entries'                 => [],
+        ];
+        $sumSpent                          = bcmul($set['sum'], '-1'); // spent
+        $return['entries']['spent']        = $sumSpent;
+        $return['entries']['amount']       = $limit->amount;
+        $return['entries']['spent_capped'] = 1 === bccomp($sumSpent, $limit->amount) ? $limit->amount : $sumSpent;
+        $return['entries']['left']         = 1 === bccomp($limit->amount, $sumSpent) ? bcadd($set['sum'], $limit->amount) : '0'; // left
+        $return['entries']['overspent']    = 1 === bccomp($limit->amount, $sumSpent) ? '0' : bcmul(bcadd($set['sum'], $limit->amount), '-1'); // overspent
+
+        return $return;
+    }
+
+}

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

@@ -74,8 +74,6 @@ class CategoryController extends Controller
      * @param DateRequest $request
      *
      * @return JsonResponse
-     *
-     * TODO after 4.8,0, simplify
      */
     public function overview(DateRequest $request): JsonResponse
     {
@@ -89,32 +87,15 @@ class CategoryController extends Controller
 
         $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 ([$spentWith, $spentWithout,] 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']]),
@@ -123,16 +104,12 @@ class CategoryController extends Controller
                             'currency_decimal_places' => $currency['currency_decimal_places'],
                             'type'                    => 'bar', // line, area or bar
                             'yAxisID'                 => 0, // 0, 1, 2
-                            'entries'                 => [
-                                // per category:
-                                // "category" => 5,
-                            ],
+                            'entries'                 => [],
                         ];
 
                     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);
+                        $currentKey                              = sprintf('%d-%s', $currency['currency_id'], 'e');
                         $name                                    = $category['name'];
                         $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
                         $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
@@ -141,49 +118,6 @@ class CategoryController extends Controller
             }
         }
 
-        //        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'];

app/Api/V1/Controllers/CurrencyController.php

@@ -577,7 +577,8 @@ class CurrencyController extends Controller
     {
         $manager  = $this->getManager();
         $currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
-
+        $this->parameters->set('defaultCurrency', $currency);
+        
         /** @var CurrencyTransformer $transformer */
         $transformer = app(CurrencyTransformer::class);
         $transformer->setParameters($this->parameters);

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

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

app/Api/V1/Controllers/ImportController.php

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

app/Api/V1/Controllers/ObjectGroupController.php

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

app/Api/V1/Controllers/PiggyBankController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\PiggyBankRequest;
+use FireflyIII\Api\V1\Requests\PiggyBankStoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
@@ -204,12 +205,12 @@ class PiggyBankController extends Controller
     /**
      * Store new object.
      *
-     * @param PiggyBankRequest $request
+     * @param PiggyBankStoreRequest $request
      *
      * @throws FireflyException
      * @return JsonResponse
      */
-    public function store(PiggyBankRequest $request): JsonResponse
+    public function store(PiggyBankStoreRequest $request): JsonResponse
     {
         $piggyBank = $this->repository->store($request->getAll());
         $manager   = $this->getManager();
@@ -240,7 +241,6 @@ class PiggyBankController extends Controller
             $this->repository->setCurrentAmount($piggyBank, $data['current_amount']);
         }
 
-
         $manager = $this->getManager();
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);

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

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * AccountController.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Controllers\Search;
 
 use FireflyIII\Api\V1\Controllers\Controller;
@@ -41,8 +43,7 @@ class AccountController extends Controller
 {
     use AccountFilter;
 
-    /** @var array */
-    private $validFields;
+    private array $validFields;
 
     public function __construct()
     {

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

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TransactionController.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,45 +20,51 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Controllers\Search;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Support\Search\SearchInterface;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection;
 
 /**
  * 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
+     * @param Request         $request
+     * @param SearchInterface $searcher
      *
-     * @return void
+     * @return JsonResponse
      */
-    public function search(Request $request): void
+    public function search(Request $request, SearchInterface $searcher): JsonResponse
     {
-        die('the route is present but nobody\'s home.');
+        $manager = $this->getManager();
+        $fullQuery = (string) $request->get('query');
+        $page      = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
+
+        $searcher->parseQuery($fullQuery);
+        $searcher->setPage($page);
+        $searcher->setLimit((int) config('firefly.search_result_limit'));
+        $groups     = $searcher->searchTransactions();
+        $parameters = ['search' => $fullQuery];
+        $url        = route('api.v1.search.transactions') . '?' . http_build_query($parameters);
+        $groups->setPath($url);
+        $transactions = $groups->getCollection();
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Collection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($groups));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 }

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

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

@@ -269,6 +269,7 @@ class TransactionController extends Controller
      *
      * @param TransactionStoreRequest $request
      *
+     * @throws FireflyException
      * @return JsonResponse
      */
     public function store(TransactionStoreRequest $request): JsonResponse
@@ -283,7 +284,7 @@ class TransactionController extends Controller
         try {
             $transactionGroup = $this->groupRepository->store($data);
         } catch (DuplicateTransactionException $e) {
-            Log::warning('Caught a duplicate. Return error message.');
+            Log::warning('Caught a duplicate transaction. Return error message.');
             // return bad validation message.
             // TODO use Laravel's internal validation thing to do this.
             $response = [
@@ -326,7 +327,7 @@ class TransactionController extends Controller
 
         $selectedGroup = $collector->getGroups()->first();
         if (null === $selectedGroup) {
-            throw new NotFoundHttpException(); // @codeCoverageIgnore
+            throw new FireflyException('Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);

app/Api/V1/Middleware/ApiDemoUser.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * IsSandStormUser.php
+ * ApiDemoUser.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -20,38 +20,40 @@
  */
 declare(strict_types=1);
 
-namespace FireflyIII\Http\Middleware;
+namespace FireflyIII\Api\V1\Middleware;
 
 use Closure;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
 
 /**
- * Class IsSandStormUser.
+ * Class ApiDemoUser.
  */
-class IsSandStormUser
+class ApiDemoUser
 {
     /**
-     * Handle an incoming request. May not be a limited user (ie. Sandstorm env. or demo user).
+     * Handle an incoming request.
      *
-     * @param Request     $request
-     * @param Closure     $next
-     * @param string|null $guard
+     * @param Request $request
+     * @param Closure $next
      *
      * @return mixed
      */
-    public function handle(Request $request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next)
     {
-        if (Auth::guard($guard)->guest()) {
-            // don't care when not logged in, usual stuff applies:
+        /** @var User $user */
+        $user = $request->user();
+
+        if (null === $user) {
             return $next($request);
         }
 
-        if (1 === (int) getenv('SANDSTORM')) {
-            app('session')->flash('warning', (string) trans('firefly.sandstorm_not_available'));
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
 
-            return response()->redirectTo(route('index'));
+        if ($repository->hasRole($user, 'demo')) {
+            return response('', 403);
         }
 
         return $next($request);

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -67,7 +67,7 @@ class AvailableBudgetRequest extends Request
         return [
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
-            'amount'        => 'required|numeric|more:0',
+            'amount'        => 'required|numeric|gt:0',
             'start'         => 'required|date|before:end',
             'end'           => 'required|date|after:start',
         ];

app/Api/V1/Requests/BillRequest.php

@@ -70,6 +70,7 @@ class BillRequest extends Request
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
             'active'        => $active,
+            'order'         => $this->integer('order'),
             'notes'         => $this->nlString('notes'),
         ];
     }
@@ -83,13 +84,13 @@ class BillRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'name'          => 'required|between:1,255|uniqueObjectForUser:bills,name',
-            'amount_min'    => 'required|numeric|more:0',
-            'amount_max'    => 'required|numeric|more:0',
+            'name'          => 'between:1,255|uniqueObjectForUser:bills,name',
+            'amount_min'    => 'numeric|gt:0',
+            'amount_max'    => 'numeric|gt:0',
             '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',
+            'date'          => 'date',
+            'repeat_freq'   => 'in:weekly,monthly,quarterly,half-year,yearly',
             'skip'          => 'between:0,31',
             'active'        => [new IsBoolean],
             'notes'         => 'between:1,65536',

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -70,7 +70,7 @@ class BudgetLimitRequest extends Request
             'budget_id'     => 'required|exists:budgets,id|belongsToUser:budgets,id',
             'start'         => 'required|before:end|date',
             'end'           => 'required|after:start|date',
-            'amount'        => 'required|more:0',
+            'amount'        => 'required|gt:0',
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
         ];

app/Api/V1/Requests/DataDestroyRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * SnsDescription.php
- * Copyright (c) 2019 hugovanduijn@gmail.com.
+ * DataDestroyRequest.php
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -18,56 +18,49 @@
  * 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\Import\Specifics;
+namespace FireflyIII\Api\V1\Requests;
 
 /**
- * Class SnsDescription.
- *
- * @codeCoverageIgnore
- * @deprecated
+ * Class DataDestroyRequest
  */
-class SnsDescription implements SpecificInterface
+class DataDestroyRequest extends Request
 {
     /**
-     * Get description of specific.
+     * Authorize logged in users.
      *
-     * @return string
-     * @codeCoverageIgnore
+     * @return bool
      */
-    public static function getDescription(): string
+    public function authorize(): bool
     {
-        return 'import.specific_sns_descr';
+        // Only allow authenticated users
+        return auth()->check() && !auth()->user()->hasRole('demo');
     }
 
     /**
-     * Get name of specific.
+     * Get all data from the request.
      *
      * @return string
-     * @codeCoverageIgnore
      */
-    public static function getName(): string
+    public function getObjects(): string
     {
-        return 'import.specific_sns_name';
+        return $this->get('objects') ?? '';
     }
 
     /**
-     * Run specific.
-     *
-     * @param array $row
+     * The rules that the incoming request must be matched against.
      *
      * @return array
      */
-    public function run(array $row): array
+    public function rules(): array
     {
-        $row = array_values($row);
-        if (!isset($row[17])) {
-            return $row;
-        }
-        $row[17] = ltrim($row[17], "'");
-        $row[17] = rtrim($row[17], "'");
+        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups' .
+                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers';
 
-        return $row;
+        return [
+            'objects' => sprintf('min:1|string|in:%s', $valid),
+        ];
     }
 }

app/Api/V1/Requests/ObjectGroupUpdateRequest.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * RabobankDescription.php
+ * ObjectGroupUpdateRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -18,52 +19,53 @@
  * 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\Import\Specifics;
+namespace FireflyIII\Api\V1\Requests;
 
 /**
- * Class RabobankDescription.
+ * Class AccountObjectGroupUpdateRequestUpdateRequest
  *
  * @codeCoverageIgnore
- * @deprecated
  */
-class RabobankDescription implements SpecificInterface
+class ObjectGroupUpdateRequest extends Request
 {
+
     /**
-     * Description of this specific.
+     * Authorize logged in users.
      *
-     * @return string
-     * @codeCoverageIgnore
+     * @return bool
      */
-    public static function getDescription(): string
+    public function authorize(): bool
     {
-        return 'import.specific_rabo_descr';
+        // Only allow authenticated users
+        return auth()->check();
     }
 
     /**
-     * Name of this specific.
-     *
-     * @return string
-     * @codeCoverageIgnore
+     * @return array
      */
-    public static function getName(): string
+    public function getUpdateData(): array
     {
-        return 'import.specific_rabo_name';
+        return [
+            'title' => $this->string('title'),
+            'order' => $this->integer('order'),
+        ];
     }
 
     /**
-     * Run the specific.
-     *
-     * @param array $row
+     * The rules that the incoming request must be matched against.
      *
      * @return array
-     *
      */
-    public function run(array $row): array
+    public function rules(): array
     {
-        $row = array_values($row);
+        $objectGroup = $this->route()->parameter('objectGroup');
 
-        return $row;
+        return [
+            'title' => sprintf('min:1|uniqueObjectGroup:%d', $objectGroup->id),
+            'order' => 'numeric',
+        ];
     }
 }

app/Api/V1/Requests/PiggyBankRequest.php

@@ -63,6 +63,7 @@ class PiggyBankRequest extends Request
             'startdate'      => $this->date('start_date'),
             'targetdate'     => $this->date('target_date'),
             'notes'          => $this->nlString('notes'),
+            'order'          => $this->integer('order'),
         ];
     }
 
@@ -90,7 +91,7 @@ class PiggyBankRequest extends Request
                 $piggyBank               = $this->route()->parameter('piggyBank');
                 $rules['name']           = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
                 $rules['account_id']     = ['belongsToUser:accounts', new IsAssetAccountId];
-                $rules['target_amount']  = 'numeric|more:0';
+                $rules['target_amount']  = 'numeric|gt:0';
                 $rules['current_amount'] = ['numeric', new ZeroOrMore, new LessThanPiggyTarget];
                 break;
         }

app/Api/V1/Requests/PiggyBankStoreRequest.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * PiggyBankStoreRequest.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\ZeroOrMore;
+
+/**
+ *
+ * Class PiggyBankStoreRequest
+ *
+ * @codeCoverageIgnore
+ */
+class PiggyBankStoreRequest 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'),
+            'account_id'      => $this->integer('account_id'),
+            'targetamount'    => $this->string('target_amount'),
+            'current_amount'  => $this->string('current_amount'),
+            'startdate'       => $this->date('start_date'),
+            'targetdate'      => $this->date('target_date'),
+            'notes'           => $this->nlString('notes'),
+            'object_group_id' => $this->integer('object_group_id'),
+            'object_group'    => $this->string('object_group_name'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'name'            => 'required|between:1,255|uniquePiggyBankForUser',
+            'current_amount'  => ['numeric', new ZeroOrMore, 'lte:target_amount'],
+            'account_id'      => 'required|numeric|belongsToUser:accounts,id',
+            'object_group_id' => 'numeric|belongsToUser:object_groups,id',
+            'target_amount'   => ['numeric', new ZeroOrMore, 'lte:target_amount', 'required'],
+            'start_date'      => 'date|nullable',
+            'target_date'     => 'date|nullable|after:start_date',
+            'notes'           => 'max:65000',
+        ];
+    }
+
+}

app/Api/V1/Requests/RecurrenceStoreRequest.php

@@ -104,8 +104,8 @@ class RecurrenceStoreRequest extends Request
             'repetitions.*.skip'                   => 'required|numeric|between:0,31',
             'repetitions.*.weekend'                => 'required|numeric|min:1|max:4',
             'transactions.*.description'           => 'required|between:1,255',
-            'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.amount'                => 'required|numeric|gt:0',
+            'transactions.*.foreign_amount'        => 'numeric|gt:0',
             'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
             'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -107,8 +107,8 @@ class RecurrenceUpdateRequest extends Request
             'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
 
             'transactions.*.description'           => 'required|between:1,255',
-            'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.amount'                => 'required|numeric|gt:0',
+            'transactions.*.foreign_amount'        => 'numeric|gt:0',
             'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
             'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',

app/Api/V1/Requests/Search/TransferRequest.php

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TransferRequest.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Requests\Search;
 
 use FireflyIII\Api\V1\Requests\Request;
@@ -49,7 +51,7 @@ class TransferRequest extends Request
         return [
             'source'      => ['required', new IsTransferAccount],
             'destination' => ['required', new IsTransferAccount],
-            'amount'      => 'required|numeric|more:0',
+            'amount'      => 'required|numeric|gt:0',
             'description' => 'required|min:1',
             'date'        => 'required|date',
         ];

app/Api/V1/Requests/TransactionStoreRequest.php

@@ -98,7 +98,7 @@ class TransactionStoreRequest extends Request
             'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable',
 
             // amount
-            'transactions.*.amount'                => 'required|numeric|more:0',
+            'transactions.*.amount'                => 'required|numeric|gt:0',
             'transactions.*.foreign_amount'        => 'numeric',
 
             // description
@@ -221,7 +221,7 @@ class TransactionStoreRequest extends Request
 
                 // foreign currency info:
                 'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
-                'foreign_currency_code' => $this->stringFromValue($object['foreign_currency_code']),
+                'foreign_currency_code' => $this->stringFromValue((string) $object['foreign_currency_code']),
 
                 // amount and foreign amount. Cannot be 0.
                 'amount'                => $this->stringFromValue((string) $object['amount']),
@@ -232,37 +232,37 @@ class TransactionStoreRequest extends Request
 
                 // source of transaction. If everything is null, assume cash account.
                 'source_id'             => $this->integerFromValue((string) $object['source_id']),
-                'source_name'           => $this->stringFromValue($object['source_name']),
-                'source_iban'           => $this->stringFromValue($object['source_iban']),
-                'source_number'         => $this->stringFromValue($object['source_number']),
-                'source_bic'            => $this->stringFromValue($object['source_bic']),
+                'source_name'           => $this->stringFromValue((string) $object['source_name']),
+                'source_iban'           => $this->stringFromValue((string) $object['source_iban']),
+                'source_number'         => $this->stringFromValue((string) $object['source_number']),
+                'source_bic'            => $this->stringFromValue((string) $object['source_bic']),
 
                 // destination of transaction. If everything is null, assume cash account.
                 'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
-                'destination_name'      => $this->stringFromValue($object['destination_name']),
-                'destination_iban'      => $this->stringFromValue($object['destination_iban']),
-                'destination_number'    => $this->stringFromValue($object['destination_number']),
-                'destination_bic'       => $this->stringFromValue($object['destination_bic']),
+                'destination_name'      => $this->stringFromValue((string) $object['destination_name']),
+                'destination_iban'      => $this->stringFromValue((string) $object['destination_iban']),
+                'destination_number'    => $this->stringFromValue((string) $object['destination_number']),
+                'destination_bic'       => $this->stringFromValue((string) $object['destination_bic']),
 
                 // budget info
                 'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
-                'budget_name'           => $this->stringFromValue($object['budget_name']),
+                'budget_name'           => $this->stringFromValue((string) $object['budget_name']),
 
                 // category info
                 'category_id'           => $this->integerFromValue((string) $object['category_id']),
-                'category_name'         => $this->stringFromValue($object['category_name']),
+                'category_name'         => $this->stringFromValue((string) $object['category_name']),
 
                 // journal bill reference. Optional. Will only work for withdrawals
                 'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
-                'bill_name'             => $this->stringFromValue($object['bill_name']),
+                'bill_name'             => $this->stringFromValue((string) $object['bill_name']),
 
                 // piggy bank reference. Optional. Will only work for transfers
                 'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->stringFromValue($object['piggy_bank_name']),
+                'piggy_bank_name'       => $this->stringFromValue((string) $object['piggy_bank_name']),
 
                 // some other interesting properties
                 'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
-                'notes'                 => $this->nlStringFromValue($object['notes']),
+                'notes'                 => $this->nlStringFromValue((string) $object['notes']),
                 'tags'                  => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:

app/Api/V1/Requests/TransactionUpdateRequest.php

@@ -172,7 +172,7 @@ class TransactionUpdateRequest extends Request
             'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
 
             // amount
-            'transactions.*.amount'                => 'numeric|more:0|max:100000000000',
+            'transactions.*.amount'                => 'numeric|gt:0|max:100000000000',
             'transactions.*.foreign_amount'        => 'numeric|gte:0',
 
             // description
@@ -263,17 +263,13 @@ class TransactionUpdateRequest extends Request
                 // TODO if the transaction_journal_id is empty, some fields are mandatory, like the amount!
 
                 // all journals must have a description
-                //$this->validateDescriptions($validator);
 
                 //                // validate foreign currency info
-                //                $this->validateForeignCurrencyInformation($validator);
                 //
 
                 //
                 //                // make sure all splits have valid source + dest info
-                //                $this->validateSplitAccounts($validator);
                 //                 the group must have a description if > 1 journal.
-                //                $this->validateGroupDescription($validator);
             }
         );
     }

app/Console/Commands/Correction/CorrectDatabase.php

@@ -83,8 +83,6 @@ class CorrectDatabase extends Command
             echo $result;
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * CorrectOpeningBalanceCurrencies.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\Account;
@@ -77,8 +79,6 @@ class CorrectOpeningBalanceCurrencies extends Command
             $this->info('There was nothing to fix in the opening balance transactions.');
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Correction/CreateAccessTokens.php

@@ -78,8 +78,6 @@ class CreateAccessTokens extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verify access tokens in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/CreateLinkTypes.php

@@ -79,8 +79,6 @@ class CreateLinkTypes extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified link types in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/DeleteEmptyGroups.php

@@ -76,8 +76,6 @@ class DeleteEmptyGroups extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified empty groups in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -58,8 +58,6 @@ class DeleteEmptyJournals extends Command
         $this->deleteUnevenJournals();
         $this->deleteEmptyJournals();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -62,7 +62,6 @@ class DeleteOrphanedTransactions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified orphans in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -78,8 +78,6 @@ class DeleteZeroAmount extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified zero-amount integrity in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/EnableCurrencies.php

@@ -101,8 +101,6 @@ class EnableCurrencies extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified currencies in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 }

app/Console/Commands/Correction/FixAccountTypes.php

@@ -106,7 +106,6 @@ class FixAccountTypes extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verifying account types took %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Correction/FixGroupAccounts.php

@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * FixGroupAccounts.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use DB;
+use FireflyIII\Events\UpdatedTransactionGroup;
+use FireflyIII\Handlers\Events\UpdatedGroupEventHandler;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixGroupAccounts
+ */
+class FixGroupAccounts extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Unify the source / destination accounts of split groups.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:unify-group-accounts';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        // select transaction_group_id, count(transaction_group_id) as the_count from transaction_journals group by transaction_group_id having the_count > 1
+        $groups = [];
+        $res    = TransactionJournal
+            ::groupBy('transaction_group_id')
+            ->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')]);
+        foreach ($res as $journal) {
+            if ((int) $journal->the_count > 1) {
+                $groups[] = (int) $journal->transaction_group_id;
+            }
+        }
+        $handler = new UpdatedGroupEventHandler;
+        foreach($groups as $groupId) {
+            $group = TransactionGroup::find($groupId);
+            $event = new UpdatedTransactionGroup($group);
+            $handler->unifyAccounts($event);
+        }
+
+        $this->line('Updated inconsistent transaction groups.');
+
+
+        return 0;
+    }
+}

app/Console/Commands/Correction/FixLongDescriptions.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * FixLongDescriptions.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\TransactionGroup;
@@ -75,7 +77,6 @@ class FixLongDescriptions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified all transaction group and journal title lengths in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 }

app/Console/Commands/Correction/FixPiggies.php

@@ -98,7 +98,6 @@ class FixPiggies extends Command
         $end = round(microtime(true) - $start, 2);
         $this->line(sprintf('Verified the content of %d piggy bank events in %s seconds.', $set->count(), $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 }

app/Console/Commands/Correction/FixRecurringTransactions.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * FixRecurringTransactions.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Models\Recurrence;
@@ -55,9 +57,9 @@ class FixRecurringTransactions extends Command
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         $start = microtime(true);
         $this->stupidLaravel();
@@ -67,7 +69,6 @@ class FixRecurringTransactions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Corrected recurring transactions %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -75,7 +75,6 @@ class FixUnevenAmount extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified amount integrity in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Correction/RemoveBills.php

@@ -71,7 +71,6 @@ class RemoveBills extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified bills / journals in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 }

app/Console/Commands/Correction/RenameMetaFields.php

@@ -83,7 +83,6 @@ class RenameMetaFields extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Renamed meta fields in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Correction/TransferBudgets.php

@@ -74,7 +74,6 @@ class TransferBudgets extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified budget/journals in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 }

app/Console/Commands/CreateDatabase.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 
 /**
  * CreateDatabase.php
@@ -22,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -50,9 +50,9 @@ class CreateDatabase extends Command
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         if ('mysql' !== env('DB_CONNECTION')) {
             $this->info(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));

app/Console/Commands/DecryptDatabase.php

@@ -123,7 +123,6 @@ class DecryptDatabase extends Command
         }
         $this->info('Done!');
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 
@@ -160,7 +159,6 @@ class DecryptDatabase extends Command
             if ('The MAC is invalid.' === $e->getMessage()) {
                 throw new FireflyException($e->getMessage()); // @codeCoverageIgnore
             }
-            Log::debug(sprintf('Could not decrypt. %s', $e->getMessage()));
         }
 
         return $value;

app/Console/Commands/Export/ExportData.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * ExportData.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Export;
 
 use Carbon\Carbon;
@@ -137,11 +139,11 @@ class ExportData extends Command
         } catch (FireflyException $e) {
             $this->error(sprintf('Could not store data: %s', $e->getMessage()));
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 

app/Console/Commands/Import/CreateCSVImport.php

@@ -1,341 +0,0 @@
-<?php
-/**
- * CreateCSVImport.php
- * Copyright (c) 2020 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/** @noinspection MultipleReturnStatementsInspection */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Console\Commands\Import;
-
-use Exception;
-use FireflyIII\Console\Commands\VerifiesAccessToken;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Import\Routine\RoutineInterface;
-use FireflyIII\Import\Storage\ImportArrayStorage;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\User;
-use Illuminate\Console\Command;
-use Log;
-
-/**
- * Class CreateCSVImport.
- *
- * @deprecated
- * @codeCoverageIgnore
- */
-class CreateCSVImport extends Command
-{
-    use VerifiesAccessToken;
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Use this command to create a new CSV file import.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature
-        = 'firefly-iii:csv-import
-                            {file? : The CSV file to import.}
-                            {configuration? : The configuration file to use for the import.}
-                            {--user=1 : The user ID that the import should import for.}
-                            {--token= : The user\'s access token.}';
-    /** @var ImportJob */
-    private $importJob;
-    /** @var ImportJobRepositoryInterface */
-    private $importRepository;
-    /** @var UserRepositoryInterface */
-    private $userRepository;
-
-    /**
-     * Run the command.
-     */
-    public function handle(): int
-    {
-        $this->stupidLaravel();
-        // @codeCoverageIgnoreStart
-        if (!$this->verifyAccessToken()) {
-            $this->errorLine('Invalid access token.');
-
-            return 1;
-        }
-
-        if (!$this->validArguments()) {
-            $this->errorLine('Invalid arguments.');
-
-            return 1;
-        }
-        // @codeCoverageIgnoreEnd
-        /** @var User $user */
-        $user          = $this->userRepository->findNull((int) $this->option('user'));
-        $file          = (string) $this->argument('file');
-        $configuration = (string) $this->argument('configuration');
-
-        $this->importRepository->setUser($user);
-
-        $configurationData = json_decode(file_get_contents($configuration), true, 512, JSON_THROW_ON_ERROR);
-        $this->importJob   = $this->importRepository->create('file');
-
-
-        // inform user (and log it)
-        $this->infoLine(sprintf('Import file        : %s', $file));
-        $this->infoLine(sprintf('Configuration file : %s', $configuration));
-        $this->infoLine(sprintf('User               : #%d (%s)', $user->id, $user->email));
-        $this->infoLine(sprintf('Job                : %s', $this->importJob->key));
-
-        try {
-            $this->storeFile($file);
-        } catch (FireflyException $e) {
-            $this->errorLine($e->getMessage());
-
-            return 1;
-        }
-
-        // job is ready to go
-        $this->importRepository->setConfiguration($this->importJob, $configurationData);
-        $this->importRepository->setStatus($this->importJob, 'ready_to_run');
-
-        $this->infoLine('The import routine has started. The process is not visible. Please wait.');
-        Log::debug('Go for import!');
-
-
-        // keep repeating this call until job lands on "provider_finished"
-        try {
-            $this->processFile();
-        } catch (FireflyException $e) {
-            $this->errorLine($e->getMessage());
-
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
-            return 1;
-        }
-
-        // then store data:
-        try {
-            $this->storeData();
-        } catch (FireflyException $e) {
-            $this->errorLine($e->getMessage());
-
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
-            return 1;
-        }
-
-        // give feedback:
-        $this->giveFeedback();
-
-        // clear cache for user:
-        app('preferences')->setForUser($user, 'lastActivity', microtime());
-
-        // app('telemetry')->feature('executed-command', $this->signature);
-        return 0;
-    }
-
-    /**
-     * @param string     $message
-     * @param array|null $data
-     *
-     * @codeCoverageIgnore
-     */
-    private function errorLine(string $message, array $data = null): void
-    {
-        Log::error($message, $data ?? []);
-        $this->error($message);
-
-    }
-
-    /**
-     *
-     */
-    private function giveFeedback(): void
-    {
-        $this->infoLine('Job has finished.');
-
-
-        if (null !== $this->importJob->tag) {
-            $this->infoLine(sprintf('%d transaction(s) have been imported.', $this->importJob->tag->transactionJournals->count()));
-            $this->infoLine(sprintf('You can find your transactions under tag "%s"', $this->importJob->tag->tag));
-        }
-
-        if (null === $this->importJob->tag) {
-            $this->errorLine('No transactions have been imported :(.');
-        }
-        if (count($this->importJob->errors) > 0) {
-            $this->infoLine(sprintf('%d error(s) occurred:', count($this->importJob->errors)));
-            foreach ($this->importJob->errors as $err) {
-                $this->errorLine('- ' . $err);
-            }
-        }
-    }
-
-    /**
-     * @param string $message
-     * @param array  $data
-     *
-     * @codeCoverageIgnore
-     */
-    private function infoLine(string $message, array $data = null): void
-    {
-        Log::info($message, $data ?? []);
-        $this->line($message);
-    }
-
-    /**
-     * Keep repeating import call until job lands on "provider_finished".
-     *
-     * @throws FireflyException
-     */
-    private function processFile(): void
-    {
-        $className = config('import.routine.file');
-        $valid     = ['provider_finished'];
-        $count     = 0;
-
-        while (!in_array($this->importJob->status, $valid, true) && $count < 6) {
-            Log::debug(sprintf('Now in loop #%d.', $count + 1));
-            /** @var RoutineInterface $routine */
-            $routine = app($className);
-            $routine->setImportJob($this->importJob);
-            try {
-                $routine->run();
-            } catch (FireflyException|Exception $e) {
-                $message = 'The import routine crashed: ' . $e->getMessage();
-                Log::error($message);
-                Log::error($e->getTraceAsString());
-
-                // set job errored out:
-                $this->importRepository->setStatus($this->importJob, 'error');
-                throw new FireflyException($message);
-            }
-            $count++;
-        }
-        $this->importRepository->setStatus($this->importJob, 'provider_finished');
-        $this->importJob->status = 'provider_finished';
-    }
-
-    /**
-     *
-     * @throws FireflyException
-     */
-    private function storeData(): void
-    {
-        if ('provider_finished' === $this->importJob->status) {
-            $this->infoLine('Import has finished. Please wait for storage of data.');
-            // set job to be storing data:
-            $this->importRepository->setStatus($this->importJob, 'storing_data');
-
-            /** @var ImportArrayStorage $storage */
-            $storage = app(ImportArrayStorage::class);
-            $storage->setImportJob($this->importJob);
-
-            try {
-                $storage->store();
-            } catch (FireflyException|Exception $e) {
-                $message = 'The import routine crashed: ' . $e->getMessage();
-                Log::error($message);
-                Log::error($e->getTraceAsString());
-
-                // set job errored out:
-                $this->importRepository->setStatus($this->importJob, 'error');
-                throw new FireflyException($message);
-
-            }
-            // set storage to be finished:
-            $this->importRepository->setStatus($this->importJob, 'storage_finished');
-        }
-    }
-
-    /**
-     * Store the supplied file as an attachment to this job.
-     *
-     * @param string $file
-     *
-     * @throws FireflyException
-     */
-    private function storeFile(string $file): void
-    {
-        // store file as attachment.
-        if ('' !== $file) {
-            $messages = $this->importRepository->storeCLIUpload($this->importJob, 'import_file', $file);
-            if ($messages->count() > 0) {
-                throw new FireflyException($messages->first());
-            }
-        }
-    }
-
-    /**
-     * Laravel will execute ALL __construct() methods for ALL commands whenever a SINGLE command is
-     * executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
-     * be called from the handle method instead of using the constructor to initialize the command.
-     *
-     * @codeCoverageIgnore
-     */
-    private function stupidLaravel(): void
-    {
-        $this->userRepository   = app(UserRepositoryInterface::class);
-        $this->importRepository = app(ImportJobRepositoryInterface::class);
-    }
-
-    /**
-     * Verify user inserts correct arguments.
-     *
-     * @noinspection MultipleReturnStatementsInspection
-     * @return bool
-     * @codeCoverageIgnore
-     */
-    private function validArguments(): bool
-    {
-        $file          = (string) $this->argument('file');
-        $configuration = (string) $this->argument('configuration');
-        $cwd           = getcwd();
-        $enabled       = (bool) config('import.enabled.file');
-
-        if (false === $enabled) {
-            $this->errorLine('CSV Provider is not enabled.');
-
-            return false;
-        }
-
-        if (!file_exists($file)) {
-            $this->errorLine(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
-
-            return false;
-        }
-
-        if (!file_exists($configuration)) {
-            $this->errorLine(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
-
-            return false;
-        }
-
-        $configurationData = json_decode(file_get_contents($configuration), true, 512, JSON_THROW_ON_ERROR);
-        if (null === $configurationData) {
-            $this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
-
-            return false;
-        }
-
-        return true;
-    }
-}

app/Console/Commands/Integrity/ReportEmptyObjects.php

@@ -64,7 +64,6 @@ class ReportEmptyObjects extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Report on empty objects finished in %s seconds', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Integrity/ReportIntegrity.php

@@ -69,7 +69,6 @@ class ReportIntegrity extends Command
             echo $result;
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 }

app/Console/Commands/Integrity/ReportSum.php

@@ -54,7 +54,6 @@ class ReportSum extends Command
     {
         $this->reportSum();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * RestoreOAuthKeys.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,10 +20,13 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Integrity;
 
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Console\Command;
+use Log;
 
 /**
  * Class RestoreOAuthKeys
@@ -52,7 +55,6 @@ class RestoreOAuthKeys extends Command
     {
         $this->restoreOAuthKeys();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 
@@ -93,7 +95,9 @@ class RestoreOAuthKeys extends Command
      */
     private function restoreOAuthKeys(): void
     {
+        Log::debug('Going to restoreOAuthKeys()');
         if (!$this->keysInDatabase() && !$this->keysOnDrive()) {
+            Log::debug('Keys are not in DB and keys are not on the drive.');
             $this->generateKeys();
             $this->storeKeysInDB();
             $this->line('Generated and stored new keys.');
@@ -101,12 +105,14 @@ class RestoreOAuthKeys extends Command
             return;
         }
         if ($this->keysInDatabase() && !$this->keysOnDrive()) {
+            Log::debug('Keys are in DB and keys are not on the drive. Restore.');
             $this->restoreKeysFromDB();
             $this->line('Restored OAuth keys from database.');
 
             return;
         }
         if (!$this->keysInDatabase() && $this->keysOnDrive()) {
+            Log::debug('Keys are not in DB and keys are on the drive. Save in DB.');
             $this->storeKeysInDB();
             $this->line('Stored OAuth keys in database.');
 

app/Console/Commands/ScanAttachments.php

@@ -86,7 +86,7 @@ class ScanAttachments extends Command
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }

app/Console/Commands/SetLatestVersion.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * SetLatestVersion.php
@@ -21,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -59,7 +60,7 @@ class SetLatestVersion extends Command
         app('fireflyconfig')->set('ff3_version', config('firefly.version'));
         $this->line('Updated version.');
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }

app/Console/Commands/Tools/ApplyRules.php

@@ -60,7 +60,7 @@ class ApplyRules extends Command
      */
     protected $signature
         = 'firefly-iii:apply-rules
-                            {--user=1 : The user ID that the import should import for.}
+                            {--user=1 : The user ID.}
                             {--token= : The user\'s access token.}
                             {--accounts= : A comma-separated list of asset accounts or liabilities to apply your rules to.}
                             {--rule_groups= : A comma-separated list of rule groups to apply. Take the ID\'s of these rule groups from the Firefly III interface.}
@@ -112,7 +112,7 @@ class ApplyRules extends Command
 
         $result = $this->verifyInput();
         if (false === $result) {
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -131,7 +131,7 @@ class ApplyRules extends Command
             $this->warn('    --rule_groups=1,2,...');
             $this->warn('    --all_rules');
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -167,7 +167,7 @@ class ApplyRules extends Command
         $this->line('');
         $this->line('Done!');
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 

app/Console/Commands/Tools/Cron.php

@@ -94,10 +94,10 @@ class Cron extends Command
         }
 
         /*
-         * Fire telemetry cron job (disabled):
+         * Fire telemetry cron job
          */
         try {
-            //$this->telemetryCronJob($force, $date);
+            $this->telemetryCronJob($force, $date);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
@@ -106,7 +106,7 @@ class Cron extends Command
 
         $this->info('More feedback on the cron jobs can be found in the log files.');
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 

app/Console/Commands/Upgrade/AccountCurrencies.php

@@ -87,7 +87,6 @@ class AccountCurrencies extends Command
         $this->info(sprintf('Verified and fixed account currencies in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
 
         return 0;
     }

app/Console/Commands/Upgrade/BackToJournals.php

@@ -78,8 +78,6 @@ class BackToJournals extends Command
         $this->info(sprintf('Updated category and budget info for all transaction journals in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/BudgetLimitCurrency.php

@@ -92,8 +92,6 @@ class BudgetLimitCurrency extends Command
 
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/CCLiabilities.php

@@ -91,8 +91,6 @@ class CCLiabilities extends Command
         $this->info(sprintf('Verified credit card liabilities in %s seconds', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateAttachments.php

@@ -101,8 +101,6 @@ class MigrateAttachments extends Command
         $this->info(sprintf('Migrated attachment notes in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateJournalNotes.php

@@ -100,8 +100,6 @@ class MigrateJournalNotes extends Command
         $this->info(sprintf('Migrated notes in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * MigrateRecurrenceMeta.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Models\RecurrenceMeta;
@@ -72,8 +74,6 @@ class MigrateRecurrenceMeta extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Migrated recurrence meta data in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateTagLocations.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * MigrateTagLocations.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Models\Location;
@@ -65,7 +67,6 @@ class MigrateTagLocations extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Migrated tag locations in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateToGroups.php

@@ -112,8 +112,6 @@ class MigrateToGroups extends Command
 
         $this->markAsMigrated();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
-
         return 0;
     }
 

app/Console/Commands/Upgrade/MigrateToRules.php

@@ -99,7 +99,6 @@ class MigrateToRules extends Command
         $this->info(sprintf('Verified and fixed bills in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 
@@ -212,7 +211,6 @@ class MigrateToRules extends Command
         $lang       = app('preferences')->getForUser($user, 'language', 'en_US');
         $groupTitle = (string) trans('firefly.rulegroup_for_bills_title', [], $lang->data);
         $ruleGroup  = $this->ruleGroupRepository->findByTitle($groupTitle);
-        //$currency   = $this->getCurrency($user);
 
         if (null === $ruleGroup) {
             $ruleGroup = $this->ruleGroupRepository->store(

app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php

@@ -90,7 +90,6 @@ class OtherCurrenciesCorrections extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified and fixed transaction currencies in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Upgrade/RenameAccountMeta.php

@@ -91,7 +91,6 @@ class RenameAccountMeta extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Fixed account meta data in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Upgrade/TransactionIdentifier.php

@@ -101,7 +101,6 @@ class TransactionIdentifier extends Command
         $this->info(sprintf('Verified and fixed transaction identifiers in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php

@@ -111,7 +111,6 @@ class TransferCurrenciesCorrections extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified and fixed currency information for transfers in %s seconds.', $end));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 
@@ -342,19 +341,17 @@ class TransferCurrenciesCorrections extends Command
         if (isset($this->accountCurrencies[$accountId]) && $this->accountCurrencies[$accountId] instanceof TransactionCurrency) {
             return $this->accountCurrencies[$accountId]; // @codeCoverageIgnore
         }
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int) $this->accountRepos->getMetaValue($account, 'currency_id');
-        $result     = $this->currencyRepos->findNull($currencyId);
-        if (null === $result) {
+        $currency = $this->accountRepos->getAccountCurrency($account);
+        if (null === $currency) {
             // @codeCoverageIgnoreStart
             $this->accountCurrencies[$accountId] = 0;
 
             return null;
             // @codeCoverageIgnoreEnd
         }
-        $this->accountCurrencies[$accountId] = $result;
+        $this->accountCurrencies[$accountId] = $currency;
 
-        return $result;
+        return $currency;
     }
 
     /**

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -76,7 +76,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:migrate-recurrence-meta',
             'firefly-iii:migrate-tag-locations',
 
-            // there are 16 verify commands.
+            // there are 15 verify commands.
             'firefly-iii:fix-piggies',
             'firefly-iii:create-link-types',
             'firefly-iii:create-access-tokens',
@@ -93,6 +93,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:fix-ob-currencies',
             'firefly-iii:fix-long-descriptions',
             'firefly-iii:fix-recurring-transactions',
+            'firefly-iii:unify-group-accounts',
 
             // two report commands
             'firefly-iii:report-empty-objects',
@@ -117,7 +118,6 @@ class UpgradeDatabase extends Command
         // index will set FF3 version.
         app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
 
-        // app('telemetry')->feature('executed-command', $this->signature);
         return 0;
     }
 

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
+use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Console\Command;
 
 /**
@@ -32,6 +33,8 @@ use Illuminate\Console\Command;
  */
 class UpgradeFireflyInstructions extends Command
 {
+    use GeneratesInstallationId;
+
     /**
      * The console command description.
      *
@@ -50,6 +53,7 @@ class UpgradeFireflyInstructions extends Command
      */
     public function handle(): int
     {
+        $this->generateInstallationId();
         if ('update' === (string) $this->argument('task')) {
             $this->updateInstructions();
         }
@@ -57,7 +61,14 @@ class UpgradeFireflyInstructions extends Command
             $this->installInstructions();
         }
 
-        // app('telemetry')->feature('executed-command', $this->signature);
+        // collect system telemetry
+        $isDocker = true === env('IS_DOCKER', false) ? 'true' : 'false';
+        app('telemetry')->feature('system.php.version', PHP_VERSION);
+        app('telemetry')->feature('system.os.version', PHP_OS);
+        app('telemetry')->feature('system.database.driver', env('DB_CONNECTION', '(unknown)'));
+        app('telemetry')->feature('system.os.is_docker', $isDocker);
+        app('telemetry')->feature('system.command.executed', $this->signature);
+
         return 0;
     }
 

app/Exceptions/DuplicateTransactionException.php

@@ -1,8 +1,8 @@
 <?php
-declare(strict_types=1);
+
 /**
  * DuplicateTransactionException.php
- * Copyright (c) 2019 james@firefly-iii.org
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 use Exception;

app/Exceptions/GracefulNotFoundHandler.php

@@ -38,6 +38,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Log;
 use Symfony\Component\HttpFoundation\Response;
+use Throwable;
 
 /**
  * Class GracefulNotFoundHandler
@@ -53,7 +54,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
      * @throws Exception
      * @return mixed
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         $route = $request->route();
         if (null === $route) {
@@ -136,12 +137,12 @@ class GracefulNotFoundHandler extends ExceptionHandler
 
     /**
      * @param Request   $request
-     * @param Exception $exception
+     * @param Throwable $exception
      *
      * @throws Exception
      * @return Redirector|Response
      */
-    private function handleAccount(Request $request, Exception $exception)
+    private function handleAccount(Request $request, Throwable $exception)
     {
         Log::debug('404 page is probably a deleted account. Redirect to overview of account types.');
         /** @var User $user */
@@ -164,12 +165,12 @@ class GracefulNotFoundHandler extends ExceptionHandler
 
     /**
      * @param Request   $request
-     * @param Exception $exception
+     * @param Throwable $exception
      *
      * @throws Exception
      * @return RedirectResponse|Redirector|Response
      */
-    private function handleAttachment(Request $request, Exception $exception)
+    private function handleAttachment(Request $request, Throwable $exception)
     {
         Log::debug('404 page is probably a deleted attachment. Redirect to parent object.');
         /** @var User $user */
@@ -208,13 +209,13 @@ class GracefulNotFoundHandler extends ExceptionHandler
     }
 
     /**
-     * @param Request   $request
+     * @param Throwable   $request
      * @param Exception $exception
      *
      * @throws Exception
      * @return RedirectResponse|\Illuminate\Http\Response|Redirector|Response
      */
-    private function handleGroup(Request $request, Exception $exception)
+    private function handleGroup(Request $request, Throwable $exception)
     {
         Log::debug('404 page is probably a deleted group. Redirect to overview of group types.');
         /** @var User $user */

app/Exceptions/Handler.php

@@ -33,9 +33,9 @@ use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
 use League\OAuth2\Server\Exception\OAuthServerException;
-use Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
+use Illuminate\Http\Request;
+use Throwable;
 /**
  * Class Handler
  *
@@ -51,7 +51,7 @@ class Handler extends ExceptionHandler
      *
      * @return mixed
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         if ($exception instanceof LaravelValidationException && $request->expectsJson()) {
             // ignore it: controller will handle it.
@@ -87,7 +87,7 @@ class Handler extends ExceptionHandler
                 );
             }
 
-            return response()->json(['message' => 'Internal Firefly III Exception. See log files.', 'exception' => get_class($exception)], 500);
+            return response()->json(['message' => sprintf('Internal Firefly III Exception: %s', $exception->getMessage()), 'exception' => get_class($exception)], 500);
         }
 
         if ($exception instanceof NotFoundHttpException) {
@@ -119,7 +119,7 @@ class Handler extends ExceptionHandler
      *
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         $doMailError = config('firefly.send_error_message');
         // if the user wants us to mail:
@@ -143,13 +143,13 @@ class Handler extends ExceptionHandler
                 'line'         => $exception->getLine(),
                 'code'         => $exception->getCode(),
                 'version'      => config('firefly.version'),
-                'url'          => Request::fullUrl(),
-                'userAgent'    => Request::userAgent(),
-                'json'         => Request::acceptsJson(),
+                'url'          => request()->fullUrl(),
+                'userAgent'    => request()->userAgent(),
+                'json'         => request()->acceptsJson(),
             ];
 
             // create job that will mail.
-            $ipAddress = Request::ip() ?? '0.0.0.0';
+            $ipAddress = request()->ip() ?? '0.0.0.0';
             $job       = new MailError($userData, (string) config('firefly.site_owner'), $ipAddress, $data);
             dispatch($job);
         }

app/Factory/BillFactory.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Factory;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use FireflyIII\Services\Internal\Support\BillServiceTrait;
 use FireflyIII\User;
 use Illuminate\Database\QueryException;
@@ -37,7 +38,7 @@ use Log;
  */
 class BillFactory
 {
-    use BillServiceTrait;
+    use BillServiceTrait, CreatesObjectGroups;
 
     /** @var User */
     private $user;
@@ -97,6 +98,24 @@ class BillFactory
             $this->updateNote($bill, $data['notes']);
         }
 
+        $objectGroupTitle = $data['object_group'] ?? '';
+        if ('' !== $objectGroupTitle) {
+            $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
+            if (null !== $objectGroup) {
+                $bill->objectGroups()->sync([$objectGroup->id]);
+                $bill->save();
+            }
+        }
+        // try also with ID:
+        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        if (0 !== $objectGroupId) {
+            $objectGroup = $this->findObjectGroupById($objectGroupId);
+            if (null !== $objectGroup) {
+                $bill->objectGroups()->sync([$objectGroup->id]);
+                $bill->save();
+            }
+        }
+
         return $bill;
     }
 

app/Factory/TransactionJournalFactory.php

@@ -367,19 +367,6 @@ class TransactionJournalFactory
 
         // verify that journal has two transactions. Otherwise, delete and cancel.
         // TODO this can't be faked so it can't be tested.
-        //        $count = $journal->transactions()->count();
-        //        if (2 !== $count) {
-        //            // @codeCoverageIgnoreStart
-        //            Log::error(sprintf('The journal unexpectedly has %d transaction(s). This is not OK. Cancel operation.', $count));
-        //            try {
-        //                $journal->delete();
-        //            } catch (Exception $e) {
-        //                Log::debug(sprintf('Dont care: %s.', $e->getMessage()));
-        //            }
-        //
-        //            return null;
-        //            // @codeCoverageIgnoreEnd
-        //        }
         $journal->completed = true;
         $journal->save();
 
@@ -428,7 +415,7 @@ class TransactionJournalFactory
                                             ->first();
         }
         if (null !== $result) {
-            Log::warning('Found a duplicate!');
+            Log::warning(sprintf('Found a duplicate in errorIfDuplicate because hash %s is not unique!', $hash));
             throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $result->transactionJournal->transaction_group_id));
         }
     }

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -23,14 +23,58 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\UpdatedTransactionGroup;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\TransactionRules\Engine\RuleEngine;
+use Log;
 
 /**
  * Class UpdatedGroupEventHandler
  */
 class UpdatedGroupEventHandler
 {
+    /**
+     * This method will make sure all source / destination accounts are the same.
+     *
+     * @param UpdatedTransactionGroup $updatedGroupEvent
+     */
+    public function unifyAccounts(UpdatedTransactionGroup $updatedGroupEvent): void
+    {
+        $group = $updatedGroupEvent->transactionGroup;
+        if (1 === $group->transactionJournals->count()) {
+            return;
+        }
+        Log::debug(sprintf('Correct inconsistent accounts in group #%d', $group->id));
+        // first journal:
+        /** @var TransactionJournal $first */
+        $first = $group->transactionJournals()
+                       ->orderBy('transaction_journals.date', 'DESC')
+                       ->orderBy('transaction_journals.order', 'ASC')
+                       ->orderBy('transaction_journals.id', 'DESC')
+                       ->orderBy('transaction_journals.description', 'DESC')
+                       ->first();
+        $all   = $group->transactionJournals()->get()->pluck('id')->toArray();
+        /** @var Account $sourceAccount */
+        $sourceAccount = $first->transactions()->where('amount', '<', '0')->first()->account;
+        /** @var Account $destAccount */
+        $destAccount = $first->transactions()->where('amount', '>', '0')->first()->account;
+
+        $type = $first->transactionType->type;
+        if (TransactionType::TRANSFER === $type || TransactionType::WITHDRAWAL === $type) {
+            // set all source transactions to source account:
+            Transaction::whereIn('transaction_journal_id', $all)
+                       ->where('amount', '<', 0)->update(['account_id' => $sourceAccount->id]);
+        }
+        if (TransactionType::TRANSFER === $type || TransactionType::DEPOSIT === $type) {
+            // set all destination transactions to destination account:
+            Transaction::whereIn('transaction_journal_id', $all)
+                       ->where('amount', '>', 0)->update(['account_id' => $destAccount->id]);
+        }
+
+    }
+
     /**
      * This method will check all the rules when a journal is updated.
      *

app/Handlers/Events/UserEventHandler.php

@@ -118,6 +118,7 @@ class UserEventHandler
         if ($repository->hasRole($user, 'demo')) {
             // set user back to English.
             app('preferences')->setForUser($user, 'language', 'en_US');
+            app('preferences')->setForUser($user, 'locale', 'equal');
             app('preferences')->mark();
         }
 

app/Handlers/Events/VersionCheckEventHandler.php

@@ -54,6 +54,7 @@ class VersionCheckEventHandler
         $value      = (int) $permission->data;
         if (1 !== $value) {
             Log::info('Update check is not enabled.');
+            $this->warnToCheckForUpdates($event);
 
             return;
         }
@@ -85,4 +86,36 @@ class VersionCheckEventHandler
         session()->flash($release['level'], $release['message']);
         app('fireflyconfig')->set('last_update_check', time());
     }
+
+    /**
+     * @param RequestedVersionCheckStatus $event
+     */
+    protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void
+    {
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+        /** @var User $user */
+        $user = $event->user;
+        if (!$repository->hasRole($user, 'owner')) {
+            Log::debug('User is not admin, done.');
+
+            return;
+        }
+
+        /** @var Configuration $lastCheckTime */
+        $lastCheckTime = app('fireflyconfig')->get('last_update_warning', time());
+        $now           = time();
+        $diff          = $now - $lastCheckTime->data;
+        Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
+        if ($diff < 604800 * 4) {
+            Log::debug(sprintf('Warned about updates less than four weeks ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
+
+            return;
+        }
+        // last check time was more than a week ago.
+        Log::debug('Have warned about a new version in four weeks!');
+
+        session()->flash('info', (string) trans('firefly.disabled_but_check'));
+        app('fireflyconfig')->set('last_update_warning', time());
+    }
 }

app/Helpers/Collector/Extensions/AccountCollection.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * AccountCollection.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collector\Extensions;
 
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -230,4 +232,4 @@ trait AccountCollection
 
         return $this;
     }
-}
+}

app/Helpers/Collector/Extensions/AmountCollection.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * AmountCollection.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collector\Extensions;
 
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -84,4 +86,4 @@ trait AmountCollection
 
         return $this;
     }
-}
+}

app/Helpers/Collector/Extensions/CollectorProperties.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * CollectorProperties.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collector\Extensions;
 
 use FireflyIII\User;
@@ -36,6 +38,8 @@ trait CollectorProperties
     private $hasAccountInfo;
     /** @var bool Will be true if query result includes bill information. */
     private $hasBillInformation;
+    /** @var bool */
+    private $hasNotesInformation;
     /** @var bool Will be true if query result contains budget info. */
     private $hasBudgetInformation;
     /** @var bool Will be true if query result contains category info. */
@@ -56,4 +60,6 @@ trait CollectorProperties
     private $total;
     /** @var User The user object. */
     private $user;
-}
+
+    private bool $hasJoinedMetaTables;
+}

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * MetaCollection.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collector\Extensions;
 
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -28,6 +30,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
 /**
@@ -36,6 +39,27 @@ use Illuminate\Support\Collection;
 trait MetaCollection
 {
 
+    /**
+     * @inheritDoc
+     */
+    public function withNotes(): GroupCollectorInterface
+    {
+        if (false === $this->hasNotesInformation) {
+            // join bill table
+            $this->query->leftJoin(
+                'notes',
+                static function (JoinClause $join) {
+                    $join->on('notes.noteable_id', '=', 'transaction_journals.id');
+                    $join->where('notes.noteable_type', '=', 'FireflyIII\Models\TransactionJournal');
+                }
+            );
+            // add fields
+            $this->fields[]            = 'notes.text as notes';
+            $this->hasNotesInformation = true;
+        }
+
+        return $this;
+    }
 
     /**
      * Limit the search to a specific bill.
@@ -288,4 +312,36 @@ trait MetaCollection
     }
 
 
-}
+    /**
+     * @inheritDoc
+     */
+    public function setExternalId(string $externalId): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+        $this->query->where('journal_meta.name', '=', 'external_id');
+        $this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s%%', $externalId));
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setInternalReference(string $internalReference): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+
+        $this->query->where('journal_meta.name', '=', 'internal_reference');
+        $this->query->where('journal_meta.data', 'LIKE', sprintf('%%%s%%', $internalReference));
+
+        return $this;
+    }
+
+
+}

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TimeCollection.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collector\Extensions;
 
 use Carbon\Carbon;

app/Helpers/Collector/GroupCollector.php

@@ -31,16 +31,11 @@ use FireflyIII\Helpers\Collector\Extensions\AmountCollection;
 use FireflyIII\Helpers\Collector\Extensions\CollectorProperties;
 use FireflyIII\Helpers\Collector\Extensions\MetaCollection;
 use FireflyIII\Helpers\Collector\Extensions\TimeCollection;
-use FireflyIII\Models\Bill;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -67,8 +62,10 @@ class GroupCollector implements GroupCollectorInterface
         $this->hasCatInformation    = false;
         $this->hasBudgetInformation = false;
         $this->hasBillInformation   = false;
+        $this->hasNotesInformation  = false;
         $this->hasJoinedTagTables   = false;
         $this->hasJoinedAttTables   = false;
+        $this->hasJoinedMetaTables  = false;
         $this->integerFields        = [
             'transaction_group_id',
             'user_id',
@@ -171,13 +168,8 @@ class GroupCollector implements GroupCollectorInterface
      */
     public function getGroups(): Collection
     {
-        //$start = microtime(true);
         /** @var Collection $result */
         $result = $this->query->get($this->fields);
-        //$end    = round(microtime(true) - $start, 5);
-        // log info about query time.
-        //Log::info(sprintf('Query took Firefly III %s seconds', $end));
-        //Log::info($this->query->toSql(), $this->query->getBindings());
 
         // now to parse this into an array.
         $collection  = $this->parseArray($result);
@@ -316,7 +308,7 @@ class GroupCollector implements GroupCollectorInterface
         $this->query->where(
             static function (EloquentBuilder $q) use ($array) {
                 $q->where(
-                    function (EloquentBuilder $q1) use ($array) {
+                    static function (EloquentBuilder $q1) use ($array) {
                         foreach ($array as $word) {
                             $keyword = sprintf('%%%s%%', $word);
                             $q1->where('transaction_journals.description', 'LIKE', $keyword);
@@ -526,7 +518,7 @@ class GroupCollector implements GroupCollectorInterface
             }
             // or parse the rest.
             $journalId = (int) $augumentedJournal->transaction_journal_id;
-            $groups[$groupId]['count']++;
+
 
             if (isset($groups[$groupId]['transactions'][$journalId])) {
                 // append data to existing group + journal (for multiple tags or multiple attachments)
@@ -536,6 +528,7 @@ class GroupCollector implements GroupCollectorInterface
 
             if (!isset($groups[$groupId]['transactions'][$journalId])) {
                 // create second, third, fourth split:
+                $groups[$groupId]['count']++;
                 $groups[$groupId]['transactions'][$journalId] = $this->parseAugmentedJournal($augumentedJournal);
             }
         }
@@ -556,9 +549,14 @@ class GroupCollector implements GroupCollectorInterface
         $result['tags']        = [];
         $result['attachments'] = [];
         try {
-            $result['date']       = new Carbon($result['date']);
-            $result['created_at'] = new Carbon($result['created_at']);
-            $result['updated_at'] = new Carbon($result['updated_at']);
+            $result['date']       = new Carbon($result['date'], 'UTC');
+            $result['created_at'] = new Carbon($result['created_at'], 'UTC');
+            $result['updated_at'] = new Carbon($result['updated_at'], 'UTC');
+
+            // this is going to happen a lot:
+            $result['date']->setTimezone(env('TZ'));
+            $result['created_at']->setTimezone(env('TZ'));
+            $result['updated_at']->setTimezone(env('TZ'));
         } catch (Exception $e) {
             Log::error($e->getMessage());
         }

app/Helpers/Collector/GroupCollectorInterface.php

@@ -398,6 +398,13 @@ interface GroupCollectorInterface
      */
     public function withCategoryInformation(): GroupCollectorInterface;
 
+    /**
+     * Will include notes.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withNotes(): GroupCollectorInterface;
+
     /**
      * Add tag info.
      *
@@ -419,4 +426,22 @@ interface GroupCollectorInterface
      */
     public function withoutCategory(): GroupCollectorInterface;
 
+    /**
+     * Look for specific external ID's.
+     *
+     * @param string $externalId
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setExternalId(string $externalId): GroupCollectorInterface;
+
+    /**
+     * Look for specific external ID's.
+     *
+     * @param string $externalId
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setInternalReference(string $externalId): GroupCollectorInterface;
+
 }

app/Helpers/Help/Help.php

@@ -77,7 +77,7 @@ class Help implements HelpInterface
      */
     public function getFromGitHub(string $route, string $language): string
     {
-        $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route);
+        $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/main/%s/%s.md', $language, $route);
         Log::debug(sprintf('Trying to get %s...', $uri));
         $opt        = ['headers' => ['User-Agent' => $this->userAgent]];
         $content    = '';

app/Helpers/Report/NetWorth.php

@@ -109,15 +109,13 @@ class NetWorth implements NetWorthInterface
 
             Log::debug(sprintf('Balance is %s', $balance));
 
-            // if the account is a credit card, subtract the virtual balance from the balance,
-            // to better reflect that this is not money that is actually "yours".
-            $role           = (string) $this->accountRepository->getMetaValue($account, 'account_role');
+            // always subtract virtual balance.
             $virtualBalance = (string) $account->virtual_balance;
-            if ('ccAsset' === $role && '' !== $virtualBalance && (float) $virtualBalance > 0) {
+            if ('' !== $virtualBalance) {
                 $balance = bcsub($balance, $virtualBalance);
             }
 
-            Log::debug(sprintf('Balance corrected to %s', $balance));
+            Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
 
             if (!isset($netWorth[$currencyId])) {
                 $netWorth[$currencyId] = '0';

app/Helpers/Update/UpdateTrait.php

@@ -43,8 +43,9 @@ trait UpdateTrait
     {
         Log::debug('Now in getLatestRelease()');
         /** @var UpdateRequestInterface $checker */
-        $checker = app(UpdateRequestInterface::class);
-        $channel = app('fireflyconfig')->get('update_channel', 'stable')->data;
+        $checker       = app(UpdateRequestInterface::class);
+        $channelConfig = app('fireflyconfig')->get('update_channel', 'stable');
+        $channel       = $channelConfig ? $channelConfig->data : 'stable';
 
         return $checker->getUpdateInformation($channel);
     }

app/Http/Controllers/Account/CreateController.php

@@ -151,7 +151,12 @@ class CreateController extends Controller
         // store attachment(s):
         /** @var array $files */
         $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
-        $this->attachments->saveAttachmentsForModel($account, $files);
+        if (null !== $files && !auth()->user()->hasRole('demo')) {
+            $this->attachments->saveAttachmentsForModel($account, $files);
+        }
+        if (null !== $files && auth()->user()->hasRole('demo')) {
+            session()->flash('info',(string)trans('firefly.no_att_demo_user'));
+        }
 
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore

app/Http/Controllers/Account/EditController.php

@@ -49,8 +49,7 @@ class EditController extends Controller
     /** @var AccountRepositoryInterface The account repository */
     private $repository;
 
-    /** @var AttachmentHelperInterface Helper for attachments. */
-    private $attachments;
+    private AttachmentHelperInterface $attachments;
 
     /**
      * EditController constructor.
@@ -67,7 +66,7 @@ class EditController extends Controller
 
                 $this->repository    = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $this->attachments = app(AttachmentHelperInterface::class);
+                $this->attachments   = app(AttachmentHelperInterface::class);
 
                 return $next($request);
             }
@@ -190,9 +189,13 @@ class EditController extends Controller
         app('preferences')->mark();
 
         // store new attachment(s):
-        /** @var array $files */
         $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
-        $this->attachments->saveAttachmentsForModel($account, $files);
+        if (null !== $files && !auth()->user()->hasRole('demo')) {
+            $this->attachments->saveAttachmentsForModel($account, $files);
+        }
+        if (null !== $files && auth()->user()->hasRole('demo')) {
+            session()->flash('info',(string)trans('firefly.no_att_demo_user'));
+        }
 
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore