Merge branch 'develop' into feature/credit_calc

# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue

app/Console/Commands/Correction/CorrectDatabase.php

@@ -76,6 +76,7 @@ class CorrectDatabase extends Command
             'firefly-iii:fix-recurring-transactions',
             'firefly-iii:restore-oauth-keys',
             'firefly-iii:fix-transaction-types',
+            'firefly-iii:fix-frontpage-accounts'
         ];
         foreach ($commands as $command) {
             $this->line(sprintf('Now executing %s', $command));

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -71,6 +71,7 @@ class DeleteEmptyJournals extends Command
             ->groupBy('transactions.transaction_journal_id')
             ->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']);
         $total = 0;
+        /** @var Transaction $row */
         foreach ($set as $row) {
             $count = (int)$row->the_count;
             if (1 === $count % 2) {

app/Console/Commands/Correction/FixFrontpageAccounts.php

@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * FixFrontpageAccounts.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Preference;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\User;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixFrontpageAccounts
+ */
+class FixFrontpageAccounts extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes a preference that may include deleted accounts or accounts of another type.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-frontpage-accounts';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $start          = microtime(true);
+
+        $users = User::get();
+        /** @var User $user */
+        foreach ($users as $user) {
+            $preference = Preferences::getForUser($user, 'frontPageAccounts', null);
+            if (null !== $preference) {
+                $this->fixPreference($preference);
+            }
+        }
+        $end = round(microtime(true) - $start, 2);
+        $this->info(sprintf('Verifying account preferences took %s seconds', $end));
+
+        return 0;
+    }
+
+    /**
+     * @param Preference $preference
+     */
+    private function fixPreference(Preference $preference): void
+    {
+        $fixed = [];
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        if (null === $preference->user) {
+            return;
+        }
+        $repository->setUser($preference->user);
+        $data = $preference->data;
+        if (is_array($data)) {
+            /** @var string $accountId */
+            foreach ($data as $accountId) {
+                $accountId = (int)$accountId;
+                $account   = $repository->findNull($accountId);
+                if (null !== $account) {
+                    if (
+                        in_array($account->accountType->type, [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], true)
+                    && true === $account->active
+                    ) {
+                        $fixed[] = $account->id;
+                        continue;
+                    }
+                }
+            }
+        }
+        Preferences::setForUser($preference->user, 'frontPageAccounts', $fixed);
+    }
+}

app/Console/Commands/Correction/FixGroupAccounts.php

@@ -60,6 +60,7 @@ class FixGroupAccounts extends Command
         $res    = TransactionJournal
             ::groupBy('transaction_group_id')
             ->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')]);
+        /** @var TransactionJournal $journal */
         foreach ($res as $journal) {
             if ((int)$journal->the_count > 1) {
                 $groups[] = (int)$journal->transaction_group_id;

app/Console/Commands/DecryptDatabase.php

@@ -177,7 +177,7 @@ class DecryptDatabase extends Command
     /**
      * Tries to decrypt data. Will only throw an exception when the MAC is invalid.
      *
-     * @param $value
+     * @param mixed $value
      *
      * @return string
      * @throws FireflyException

app/Console/Commands/Export/ExportData.php

@@ -28,6 +28,7 @@ use Carbon\Carbon;
 use Exception;
 use FireflyIII\Console\Commands\VerifiesAccessToken;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -124,11 +125,11 @@ class ExportData extends Command
         $exporter->setExportBills($options['export']['bills']);
         $exporter->setExportPiggies($options['export']['piggies']);
         $data = $exporter->export();
-        if (0===count($data)) {
+        if (0 === count($data)) {
             $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
         }
         $returnCode = 0;
-        if (0!== count($data)) {
+        if (0 !== count($data)) {
             try {
                 $this->exportData($options, $data);
                 app('telemetry')->feature('system.command.executed', $this->signature);
@@ -199,24 +200,27 @@ class ExportData extends Command
         $error = false;
         if (null !== $this->option($field)) {
             try {
-                $date = Carbon::createFromFormat('Y-m-d', $this->option($field));
+                $date = Carbon::createFromFormat('!Y-m-d', $this->option($field));
             } catch (InvalidArgumentException $e) {
                 Log::error($e->getMessage());
                 $this->error(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
                 $error = true;
             }
         }
-        if (false === $error && 'start' === $field) {
+
+        if (true === $error && 'start' === $field) {
             $journal = $this->journalRepository->firstNull();
             $date    = null === $journal ? Carbon::now()->subYear() : $journal->date;
             $date->startOfDay();
         }
-        if (false === $error && 'end' === $field) {
+        if (true === $error && 'end' === $field) {
             $date = today(config('app.timezone'));
             $date->endOfDay();
         }
+        if ('end' === $field) {
+            $date->endOfDay();
+        }
 
-        // fallback
         return $date;
     }
 
@@ -238,7 +242,7 @@ class ExportData extends Command
             $accounts = $this->accountRepository->getAccountsByType($types);
         }
         // filter accounts,
-        /** @var AccountType $account */
+        /** @var Account $account */
         foreach ($accounts as $account) {
             if (in_array($account->accountType->type, $types, true)) {
                 $final->push($account);

app/Console/Commands/Upgrade/BackToJournals.php

@@ -144,8 +144,7 @@ class BackToJournals extends Command
         $chunks       = array_chunk($transactions, 500);
 
         foreach ($chunks as $chunk) {
-            $set = DB::table('transactions')->whereIn('transactions.id', $chunk)
-                     ->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
             $array = array_merge($array, $set);
         }
 

app/Console/Commands/Upgrade/MigrateToGroups.php

@@ -414,7 +414,7 @@ class MigrateToGroups extends Command
         if ($total > 0) {
             Log::debug(sprintf('Going to convert %d transaction journals. Please hold..', $total));
             $this->line(sprintf('Going to convert %d transaction journals. Please hold..', $total));
-            /** @var array $journal */
+            /** @var array $array */
             foreach ($orphanedJournals as $array) {
                 $this->giveGroup($array);
             }

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -95,6 +95,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:fix-recurring-transactions',
             'firefly-iii:unify-group-accounts',
             'firefly-iii:fix-transaction-types',
+            'firefly-iii:fix-frontpage-accounts',
 
             // two report commands
             'firefly-iii:report-empty-objects',