kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-11 15:16:27 +00:00
Code Issues Projects Releases Wiki Activity

Allow statistics to be removed from /flush

Browse Source
This commit is contained in:
James Cole
2025-09-26 19:48:20 +02:00
parent 853a99852e
commit 822dee6e70
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Helpers\Update\UpdateTrait;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -66,8 +67,8 @@ class UpdateController extends Controller
{ {
$subTitle = (string) trans('firefly.update_check_title'); $subTitle = (string) trans('firefly.update_check_title');
$subTitleIcon = 'fa-star'; $subTitleIcon = 'fa-star';
$permission = app('fireflyconfig')->get('permission_update_check', -1); $permission = FireflyConfig::get('permission_update_check', -1);
$channel = app('fireflyconfig')->get('update_channel', 'stable'); $channel = FireflyConfig::get('update_channel', 'stable');
$selected = $permission->data; $selected = $permission->data;
$channelSelected = $channel->data; $channelSelected = $channel->data;
$options = [ $options = [
@@ -96,9 +97,9 @@ class UpdateController extends Controller
$channel = $request->get('update_channel'); $channel = $request->get('update_channel');
$channel = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable'; $channel = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';
app('fireflyconfig')->set('permission_update_check', $checkForUpdates); FireflyConfig::set('permission_update_check', $checkForUpdates);
app('fireflyconfig')->set('last_update_check', Carbon::now()->getTimestamp()); FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
app('fireflyconfig')->set('update_channel', $channel); FireflyConfig::set('update_channel', $channel);
session()->flash('success', (string) trans('firefly.configuration_updated')); session()->flash('success', (string) trans('firefly.configuration_updated'));
return redirect(route('settings.update-check')); return redirect(route('settings.update-check'));

3
app/Http/Controllers/DebugController.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Models\PeriodStatistic;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\Facades\Amount; use FireflyIII\Support\Facades\Amount;
@@ -108,6 +109,8 @@ class DebugController extends Controller
Artisan::call('route:clear'); Artisan::call('route:clear');
Artisan::call('view:clear'); Artisan::call('view:clear');
PeriodStatistic::where('id','>',0)->delete();
// also do some recalculations. // also do some recalculations.
Artisan::call('correction:recalculates-liabilities'); Artisan::call('correction:recalculates-liabilities');
AccountBalanceCalculator::recalculateAll(false); AccountBalanceCalculator::recalculateAll(false);

2
app/Models/PeriodStatistic.php
View File

@@ -14,14 +14,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class PeriodStatistic extends Model class PeriodStatistic extends Model
{ {
use ReturnsIntegerUserIdTrait; use ReturnsIntegerUserIdTrait;
use SoftDeletes;
protected function casts(): array protected function casts(): array
{ {
return [ return [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'start' => SeparateTimezoneCaster::class, 'start' => SeparateTimezoneCaster::class,
'end' => SeparateTimezoneCaster::class, 'end' => SeparateTimezoneCaster::class,
]; ];

1
database/migrations/2025_09_25_175248_create_period_statistics.php
View File

@@ -14,7 +14,6 @@ return new class extends Migration
Schema::create('period_statistics', function (Blueprint $table) { Schema::create('period_statistics', function (Blueprint $table) {
$table->id(); $table->id();
$table->timestamps(); $table->timestamps();
$table->softDeletes();
$table->integer('primary_statable_id', false, true)->nullable(); $table->integer('primary_statable_id', false, true)->nullable();
$table->string('primary_statable_type', 255)->nullable(); $table->string('primary_statable_type', 255)->nullable();