Fix some end of period stuff.

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -84,7 +84,8 @@ class CorrectsAmounts extends Command
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
         $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
-        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
+        $journals   = TransactionJournal::
+        leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')->whereNotNull('transactions.foreign_amount')->where('transaction_journals.transaction_type_id', $type->id)->distinct()->get(['transaction_journals.*']);
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
@@ -93,7 +94,7 @@ class CorrectsAmounts extends Command
 
             $valid          = $this->validateJournal($journal);
             if (false === $valid) {
-                Log::debug(sprintf('Journal #%d does not need to be fixed or is invalid (see previous messages)', $journal->id));
+                // Log::debug(sprintf('Journal #%d does not need to be fixed or is invalid (see previous messages)', $journal->id));
 
                 continue;
             }
@@ -298,7 +299,7 @@ class CorrectsAmounts extends Command
             return false;
         }
         if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
-            Log::debug('No foreign currency information is present, can safely continue with other transactions.');
+            // Log::debug('No foreign currency information is present, can safely continue with other transactions.');
 
             return false;
         }

app/Http/Controllers/HomeController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;

app/Support/Models/AccountBalanceCalculator.php

@@ -78,6 +78,7 @@ class AccountBalanceCalculator
     private function getLatestBalance(int $accountId, int $currencyId, ?Carbon $notBefore): string
     {
         if (!$notBefore instanceof Carbon) {
+            Log::debug(sprintf('Start balance for account #%d and currency #%d is 0.', $accountId, $currencyId));
             return '0';
         }
         Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));

app/Support/Navigation.php

@@ -23,16 +23,16 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support;
 
-use FireflyIII\Support\Facades\Preferences;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\IntervalException;
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Support\Calendar\Calculator;
 use FireflyIII\Support\Calendar\Periodicity;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Facades\Log;
 use Throwable;
-use FireflyIII\Support\Facades\Steam;
 
 /**
  * Class Navigation.
@@ -79,10 +79,10 @@ class Navigation
 
         if (!array_key_exists($repeatFreq, $functionMap)) {
             Log::error(sprintf(
-                'The periodicity %s is unknown. Choose one of available periodicity: %s',
-                $repeatFreq,
-                implode(', ', array_keys($functionMap))
-            ));
+                           'The periodicity %s is unknown. Choose one of available periodicity: %s',
+                           $repeatFreq,
+                           implode(', ', array_keys($functionMap))
+                       ));
 
             return $theDate;
         }
@@ -95,7 +95,7 @@ class Navigation
         if ($end < $start) {
             [$start, $end] = [$end, $start];
         }
-        $periods   = [];
+        $periods = [];
         // first, 13 periods of [range]
         $loopCount = 0;
         $loopDate  = clone $end;
@@ -153,7 +153,7 @@ class Navigation
     public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int
     {
         Log::debug(sprintf('diffInPeriods: %s (skip: %d), between %s and %s.', $period, $skip, $beginning->format('Y-m-d'), $end->format('Y-m-d')));
-        $map       = [
+        $map = [
             'daily'     => 'diffInDays',
             'weekly'    => 'diffInWeeks',
             'monthly'   => 'diffInMonths',
@@ -166,7 +166,7 @@ class Navigation
 
             return 1;
         }
-        $func      = $map[$period];
+        $func = $map[$period];
         // first do the diff
         $floatDiff = $beginning->{$func}($end, true); // @phpstan-ignore-line
 
@@ -181,7 +181,7 @@ class Navigation
         }
 
         // then do ceil()
-        $diff      = ceil($floatDiff);
+        $diff = ceil($floatDiff);
 
         Log::debug(sprintf('Diff is %f periods (%d rounded up)', $floatDiff, $diff));
 
@@ -189,11 +189,11 @@ class Navigation
             $parameter = $skip + 1;
             $diff      = ceil($diff / $parameter) * $parameter;
             Log::debug(sprintf(
-                'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',
-                $skip,
-                $parameter,
-                $diff
-            ));
+                           'diffInPeriods: skip is %d, so param is %d, and diff becomes %d',
+                           $skip,
+                           $parameter,
+                           $diff
+                       ));
         }
 
         return (int)$diff;
@@ -201,7 +201,7 @@ class Navigation
 
     public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
     {
-        $currentEnd  = clone $end;
+        $currentEnd = clone $end;
 
         // Log::debug(sprintf('Now in endOfPeriod("%s", "%s").', $currentEnd->toIso8601String(), $repeatFreq));
         if ('MTD' === $repeatFreq && $end->isFuture()) {
@@ -214,6 +214,11 @@ class Navigation
             Log::debug('endOfPeriod() requests "YTD" + future, set it to "1Y" instead.');
             $repeatFreq = '1Y';
         }
+        if ('QTD' === $repeatFreq && $end->isFuture()) {
+            // fall back to a yearly schedule if the requested period is YTD.
+            Log::debug('endOfPeriod() requests "YTD" + future, set it to "3M" instead.');
+            $repeatFreq = '3M';
+        }
 
         $functionMap = [
             '1D'        => 'endOfDay',
@@ -246,7 +251,7 @@ class Navigation
                 Log::debug('Session data available.');
 
                 /** @var Carbon $tStart */
-                $tStart     = session('start', today(config('app.timezone'))->startOfMonth());
+                $tStart = session('start', today(config('app.timezone'))->startOfMonth());
 
                 /** @var Carbon $tEnd */
                 $tEnd       = session('end', today(config('app.timezone'))->endOfMonth());
@@ -282,7 +287,7 @@ class Navigation
             return $end->endOfMonth();
         }
 
-        $result      = match ($repeatFreq) {
+        $result = match ($repeatFreq) {
             'last7'   => $currentEnd->addDays(7)->startOfDay(),
             'last30'  => $currentEnd->addDays(30)->startOfDay(),
             'last90'  => $currentEnd->addDays(90)->startOfDay(),
@@ -295,7 +300,20 @@ class Navigation
         if (null !== $result) {
             // add sanity check.
             if ($currentEnd->lt($end)) {
-                throw new FireflyException(sprintf('[d] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString()));
+                switch ($repeatFreq) {
+                    case 'QTD':
+                        $currentEnd->endOfQuarter()->setMilli(0);
+                        break;
+                    case 'MTD':
+                        $currentEnd->endOfMonth()->setMilli(0);
+                        break;
+                    case 'YTD':
+                        $currentEnd->endOfYear()->setMilli(0);
+                        break;
+                }
+                if ($currentEnd->lt($end)) {
+                    throw new FireflyException(sprintf('[d] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString()));
+                }
             }
 
             return $result;
@@ -312,7 +330,7 @@ class Navigation
 
             return $end;
         }
-        $function    = $functionMap[$repeatFreq];
+        $function = $functionMap[$repeatFreq];
 
         if (array_key_exists($repeatFreq, $modifierMap)) {
             $currentEnd->{$function}($modifierMap[$repeatFreq])->milli(0); // @phpstan-ignore-line
@@ -362,7 +380,7 @@ class Navigation
             'yearly'    => 'endOfYear',
         ];
 
-        $currentEnd  = clone $theCurrentEnd;
+        $currentEnd = clone $theCurrentEnd;
 
         if (array_key_exists($repeatFreq, $functionMap)) {
             $function = $functionMap[$repeatFreq];
@@ -405,7 +423,7 @@ class Navigation
      */
     public function listOfPeriods(Carbon $start, Carbon $end): array
     {
-        $locale        = Steam::getLocale();
+        $locale = Steam::getLocale();
         // define period to increment
         $increment     = 'addDay';
         $format        = $this->preferredCarbonFormat($start, $end);
@@ -422,8 +440,8 @@ class Navigation
             $increment     = 'addYear';
             $displayFormat = (string)trans('config.year_js');
         }
-        $begin         = clone $start;
-        $entries       = [];
+        $begin   = clone $start;
+        $entries = [];
         while ($begin < $end) {
             $formatted           = $begin->format($format);
             $displayed           = $begin->isoFormat($displayFormat);
@@ -606,9 +624,9 @@ class Navigation
 
     public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
     {
-        $date         = clone $theDate;
+        $date = clone $theDate;
         // Log::debug(sprintf('Now in startOfPeriod("%s", "%s")', $date->toIso8601String(), $repeatFreq));
-        $functionMap  = [
+        $functionMap = [
             '1D'        => 'startOfDay',
             'daily'     => 'startOfDay',
             '1W'        => 'startOfWeek',
@@ -655,7 +673,7 @@ class Navigation
             return $date;
         }
 
-        $result       = match ($repeatFreq) {
+        $result = match ($repeatFreq) {
             'last7'   => $date->subDays(7)->startOfDay(),
             'last30'  => $date->subDays(30)->startOfDay(),
             'last90'  => $date->subDays(90)->startOfDay(),
@@ -687,7 +705,7 @@ class Navigation
     public function subtractPeriod(Carbon $theDate, string $repeatFreq, ?int $subtract = null): Carbon
     {
         $subtract ??= 1;
-        $date        = clone $theDate;
+        $date     = clone $theDate;
         // 1D 1W 1M 3M 6M 1Y
         $functionMap = [
             '1D'      => 'subDays',
@@ -726,7 +744,7 @@ class Navigation
         // this is then subtracted from $theDate (* $subtract).
         if ('custom' === $repeatFreq) {
             /** @var Carbon $tStart */
-            $tStart     = session('start', today(config('app.timezone'))->startOfMonth());
+            $tStart = session('start', today(config('app.timezone'))->startOfMonth());
 
             /** @var Carbon $tEnd */
             $tEnd       = session('end', today(config('app.timezone'))->endOfMonth());
@@ -820,7 +838,7 @@ class Navigation
 
             return $fiscalHelper->endOfFiscalYear($end);
         }
-        $list        = [
+        $list = [
             'last7',
             'last30',
             'last90',