Add table for period statistics, and see what happens re: performance.

app/Models/Account.php

@@ -241,4 +241,12 @@ class Account extends Model
             get: static fn ($value) => (string)$value,
         );
     }
+
+    public function primaryPeriodStatistics(): MorphMany
+
+    {
+
+        return $this->morphMany(PeriodStatistic::class, 'primary_statable');
+
+    }
 }

app/Models/PeriodStatistic.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace FireflyIII\Models;
+
+use FireflyIII\Casts\SeparateTimezoneCaster;
+use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class PeriodStatistic extends Model
+{
+    use SoftDeletes;
+    use ReturnsIntegerUserIdTrait;
+
+    protected function casts(): array
+    {
+        return [
+            'created_at'    => 'datetime',
+            'updated_at'    => 'datetime',
+            'deleted_at'    => 'datetime',
+            'date'          => SeparateTimezoneCaster::class,
+        ];
+    }
+
+    protected function count(): Attribute
+    {
+        return Attribute::make(
+            get: static fn ($value) => (int)$value,
+        );
+    }
+
+
+    public function primaryStatable(): MorphTo
+    {
+
+        return $this->morphTo();
+
+    }
+
+    public function secondaryStatable(): MorphTo
+    {
+
+        return $this->morphTo();
+
+    }
+    public function tertiaryStatable(): MorphTo
+    {
+
+        return $this->morphTo();
+
+    }
+
+    //
+}

app/Providers/FireflyServiceProvider.php

@@ -43,6 +43,8 @@ use FireflyIII\Repositories\AuditLogEntry\ALERepository;
 use FireflyIII\Repositories\AuditLogEntry\ALERepositoryInterface;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepository;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
+use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepository;
+use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepository;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepository;
@@ -161,6 +163,7 @@ class FireflyServiceProvider extends ServiceProvider
 
         $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class);
         $this->app->bind(ALERepositoryInterface::class, ALERepository::class);
+        $this->app->bind(PeriodStatisticRepositoryInterface::class, PeriodStatisticRepository::class);
 
         $this->app->bind(
             static function (Application $app): ObjectGroupRepositoryInterface {

app/Repositories/PeriodStatistic/PeriodStatisticRepository.php

@@ -0,0 +1,65 @@
+<?php
+/*
+ * PeriodStatisticRepository.php
+ * Copyright (c) 2025 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\Repositories\PeriodStatistic;
+
+use Carbon\Carbon;
+use FireflyIII\Models\PeriodStatistic;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+
+class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface
+{
+
+    public function findPeriodStatistics(Model $model, Carbon $start, Carbon $end, array $types): Collection
+    {
+        return $model->primaryPeriodStatistics()
+                     ->where('start', $start)
+                     ->where('end', $end)
+                     ->whereIn('type', $types)
+                     ->get();
+    }
+
+    public function findPeriodStatistic(Model $model, Carbon $start, Carbon $end, string $type): Collection
+    {
+        return $model->primaryPeriodStatistics()
+                     ->where('start', $start)
+                     ->where('end', $end)
+                     ->where('type', $type)
+                     ->get();
+    }
+
+    public function saveStatistic(Model $model, int $currencyId, Carbon $start, Carbon $end, string $type, int $count, string $amount): PeriodStatistic
+    {
+        $stat = new PeriodStatistic;
+        $stat->primaryStatable()->associate($model);
+        $stat->transaction_currency_id = $currencyId;
+        $stat->start                   = $start;
+        $stat->start_tz                = $start->format('e');
+        $stat->end                     = $end;
+        $stat->end_tz                  = $end->format('e');
+        $stat->amount                  = $amount;
+        $stat->count                   = $count;
+        $stat->type                    = $type;
+        $stat->save();
+        return $stat;
+    }
+}

app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * PeriodStatisticRepositoryInterface.php
+ * Copyright (c) 2025 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\Repositories\PeriodStatistic;
+
+use Carbon\Carbon;
+use FireflyIII\Models\PeriodStatistic;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+
+interface PeriodStatisticRepositoryInterface
+{
+
+    public function findPeriodStatistics(Model $model, Carbon $start, Carbon $end, array $types): Collection;
+
+    public function findPeriodStatistic(Model $model, Carbon $start, Carbon $end, string $type): Collection;
+
+    public function saveStatistic(Model $model, int $currencyId, Carbon $start, Carbon $end, string $type, int $count, string $amount): PeriodStatistic;
+
+}

app/Support/Http/Controllers/PeriodOverview.php

@@ -30,11 +30,13 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\PeriodStatistic;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use FireflyIII\Support\Debug\Timer;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Navigation;
 use Illuminate\Support\Facades\Log;
 
@@ -69,6 +71,7 @@ trait PeriodOverview
 {
     protected AccountRepositoryInterface         $accountRepository;
     protected JournalRepositoryInterface         $journalRepos;
+    protected PeriodStatisticRepositoryInterface $periodStatisticRepo;
 
     /**
      * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
@@ -79,68 +82,104 @@ trait PeriodOverview
      */
     protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
     {
-        Log::debug('Now in getAccountPeriodOverview()');
-        $timer                   = Timer::getInstance();
-        $timer->start('account-period-total');
+        Log::debug(sprintf('Now in getAccountPeriodOverview(#%d, %s %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
         $this->accountRepository   = app(AccountRepositoryInterface::class);
+        $this->periodStatisticRepo = app(PeriodStatisticRepositoryInterface::class);
         $range                     = Navigation::getViewRange(true);
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
-
-        // properties for cache
-        $cache                   = new CacheProperties();
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('account-show-period-entries');
-        $cache->addProperty($account->id);
-        if ($cache->has()) {
-            Log::debug('Return CACHED in getAccountPeriodOverview()');
-
-            return $cache->get();
-        }
-
         /** @var array $dates */
         $dates   = Navigation::blockPeriods($start, $end, $range);
         $entries = [];
-
-        // run a custom query because doing this with the collector is MEGA slow.
-        $timer->start('account-period-collect');
-        $transactions            = $this->accountRepository->periodCollection($account, $start, $end);
-        $timer->stop('account-period-collect');
-        // loop dates
         Log::debug(sprintf('Count of loops: %d', count($dates)));
-        $loops                   = 0;
-        // stop after 10 loops for memory reasons.
-        $timer->start('account-period-loop');
         foreach ($dates as $currentDate) {
-            $title                            = Navigation::periodShow($currentDate['start'], $currentDate['period']);
-            [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
-            $entries[]
-                                              = [
-                                                  'title'              => $title,
-                                                  'route'              => route('accounts.show', [$account->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
-                                                  'total_transactions' => count($spent) + count($earned) + count($transferredAway) + count($transferredIn),
-                                                  'spent'              => $this->groupByCurrency($spent),
-                                                  'earned'             => $this->groupByCurrency($earned),
-                                                  'transferred_away'   => $this->groupByCurrency($transferredAway),
-                                                  'transferred_in'     => $this->groupByCurrency($transferredIn),
-                                              ];
-            ++$loops;
+            $entries[] = $this->getSingleAccountPeriod($account, $currentDate['start'], $currentDate['end']);
         }
-        $timer->stop('account-period-loop');
-        $cache->store($entries);
-        $timer->stop('account-period-total');
         Log::debug('End of getAccountPeriodOverview()');
 
         return $entries;
     }
 
+    protected function getSingleAccountPeriod(Account $account, Carbon $start, Carbon $end): array
+    {
+        Log::debug(sprintf('Now in getSingleAccountPeriod(#%d, %s %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
+        $types  = ['spent', 'earned', 'transferred_in', 'transferred_away'];
+        $return = [
+            'title'              => Navigation::periodShow($start, $end),
+            'route'              => route('accounts.show', [$account->id, $start->format('Y-m-d'), $start->format('Y-m-d')]),
+            'total_transactions' => 0,
+        ];
+        foreach ($types as $type) {
+            $set                          = $this->getSingleAccountPeriodByType($account, $start, $end, $type);
+            $return['total_transactions'] += $set['count'];
+            unset($set['count']);
+            $return[$type] = $set;
+        }
+        return $return;
+    }
+
+    protected function getSingleAccountPeriodByType(Account $account, Carbon $start, Carbon $end, string $type): array
+    {
+        Log::debug(sprintf('Now in getSingleAccountPeriodByType(#%d, %s %s, %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d'), $type));
+        $statistics = $this->periodStatisticRepo->findPeriodStatistic($account, $start, $end, $type);
+
+        // nothing found, regenerate them.
+        if (0 === $statistics->count()) {
+            $transactions = $this->accountRepository->periodCollection($account, $start, $end);
+            switch ($type) {
+                default:
+                    throw new FireflyException(sprintf('Cannot deal with account period type %s', $type));
+                case 'spent':
+                    $result = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $start, $end);
+                    break;
+                case 'earned':
+                    $result = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $start, $end);
+                    break;
+                case 'transferred_in':
+                    $result = $this->filterTransfers('in', $transactions, $start, $end);
+                    break;
+                case 'transferred_away':
+                    $result = $this->filterTransfers('away', $transactions, $start, $end);
+                    break;
+            }
+            // each result must be grouped by currency, then saved as period statistic.
+            $grouped = $this->groupByCurrency($result);
+
+            // TODO save as statistic.
+            $this->saveGroupedAsStatistics($account, $start, $end, $type, $grouped);
+            return $grouped;
+        }
+        $grouped = [
+            'count' => 0,
+        ];
+        /** @var PeriodStatistic $statistic */
+        foreach($statistics as $statistic) {
+            $id = (int) $statistic->transaction_currency_id;
+            $currency = Amount::getTransactionCurrencyById($id);
+            $grouped[$id] = [
+                'amount'                  => (string) $statistic->amount,
+                'count'                   => (int) $statistic->count,
+                'currency_id'             => $currency->id,
+                'currency_name'           => $currency->name,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+            ];
+            $grouped['count'] += (int) $statistic->count;
+        }
+        return $grouped;
+    }
+
+    protected function saveGroupedAsStatistics(Account $account, Carbon $start, Carbon $end, string $type, array $array): void
+    {
+        unset($array['count']);
+        foreach ($array as $entry) {
+            $this->periodStatisticRepo->saveStatistic($account, $entry['currency_id'], $start, $end, $type, $entry['count'], $entry['amount']);
+        }
+    }
+
     private function filterTransactionsByType(TransactionTypeEnum $type, array $transactions, Carbon $start, Carbon $end): array
     {
         $result = [];
-        $filtered = [];
 
         /**
          * @var int $index
@@ -153,18 +192,14 @@ trait PeriodOverview
                 $result[] = $item;
                 unset($transactions[$index]);
             }
-            if (!$fits) {
-                $filtered[] = $item;
-            }
         }
 
-        return [$filtered, $result];
+        return $result;
     }
 
     private function filterTransfers(string $direction, array $transactions, Carbon $start, Carbon $end): array
     {
         $result = [];
-        $filtered = [];
 
         /**
          * @var int $index
@@ -184,18 +219,27 @@ trait PeriodOverview
                     continue;
                 }
             }
-            $filtered[] = $item;
         }
 
-        return [$filtered, $result];
+        return $result;
     }
 
     private function groupByCurrency(array $journals): array
     {
-        $return = [];
+        Log::debug('groupByCurrency()');
+        $return = [
+            'count' => 0,
+        ];
 
         /** @var array $journal */
         foreach ($journals as $journal) {
+
+            if (!array_key_exists('currency_id', $journal)) {
+                Log::debug('very strange!');
+                var_dump($journals);
+                exit;
+            }
+
             $currencyId            = (int)$journal['currency_id'];
             $currencyCode          = $journal['currency_code'];
             $currencyName          = $journal['currency_name'];
@@ -233,6 +277,7 @@ trait PeriodOverview
 
             $return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $amount);
             ++$return[$currencyId]['count'];
+            ++$return['count'];
         }
 
         return $return;

database/migrations/2025_09_25_175248_create_period_statistics.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('period_statistics', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->softDeletes();
+            $table->integer('primary_statable_id', false, true)->nullable();
+            $table->string('primary_statable_type', 255)->nullable();
+
+            $table->integer('secondary_statable_id', false, true)->nullable();
+            $table->string('secondary_statable_type', 255)->nullable();
+
+            $table->integer('tertiary_statable_id', false, true)->nullable();
+            $table->string('tertiary_statable_type', 255)->nullable();
+
+            $table->integer('transaction_currency_id', false, true);
+            $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
+
+            $table->dateTime('start')->nullable();
+            $table->string('start_tz', 50)->nullable();
+            $table->dateTime('end')->nullable();
+            $table->string('end_tz', 50)->nullable();
+            $table->string('type',255);
+            $table->integer('count', false, true)->default(0);
+            $table->decimal('amount', 32, 12);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('period_statistics');
+    }
+};