kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-07 06:30:47 -07:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/12169

Browse Source
This commit is contained in:
James Cole
2026-04-22 07:54:53 +02:00
parent a9723a85d1
commit 32250ddc1a
5 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Api/V1/Controllers/Models/Rule/TriggerController.php
+9 -9
View File
@@ -54,7 +54,7 @@ final class TriggerController extends Controller
parent::__construct();
$this->middleware(function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
$this->ruleRepository = app(RuleRepositoryInterface::class);
$this->ruleRepository->setUser($user);
@@ -69,10 +69,10 @@ final class TriggerController extends Controller
*/
public function testRule(TestRequest $request, Rule $rule): JsonResponse
{
$parameters = $request->getTestParameters();
$parameters = $request->getTestParameters();
/** @var RuleEngineInterface $ruleEngine */
$ruleEngine = app(RuleEngineInterface::class);
$ruleEngine = app(RuleEngineInterface::class);
$ruleEngine->setRules(new Collection()->push($rule));
// overrule the rule(s) if necessary.
@@ -94,21 +94,21 @@ final class TriggerController extends Controller
$count = $transactions->count();
// enrich
$enrichment = new TransactionGroupEnrichment();
$enrichment = new TransactionGroupEnrichment();
$enrichment->setUser($rule->user);
$transactions = $enrichment->enrich($transactions);
$paginator = new LengthAwarePaginator($transactions, $count, 31_337, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rules.test', [$rule->id]).$this->buildParams());
$paginator = new LengthAwarePaginator($transactions, $count, 31_337, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
// resulting list is presented as JSON thing.
$manager = $this->getManager();
$manager = $this->getManager();
/** @var TransactionGroupTransformer $transformer */
$transformer = app(TransactionGroupTransformer::class);
$transformer = app(TransactionGroupTransformer::class);
$transformer->setParameters($this->parameters);
$resource = new FractalCollection($transactions, $transformer, 'transactions');
$resource = new FractalCollection($transactions, $transformer, 'transactions');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php
+25
View File
@@ -46,12 +46,36 @@ class TransactionGroupEventObjects
return $object;
}
public function collectFromCollection(Collection $collection): void
{
Log::debug('Will now collect info from collection.');
/** @var TransactionGroup|null $object */
foreach ($collection as $object) {
if ($object instanceof TransactionGroup) {
Log::debug(sprintf('Added group #%d', $object->id));
$this->appendFromTransactionGroup($object);
}
if (!($object instanceof TransactionGroup)) {
if (is_array($object) && array_key_exists('id', $object)) {
// FIXME technically speaking not sure of this is the user's transaction group.
$group = TransactionGroup::find((int)$object['id']);
if (null !== $group) {
Log::debug(sprintf('Added group #%d', $group->id));
$this->appendFromTransactionGroup($group);
}
}
}
}
}
public function appendFromTransactionGroup(TransactionGroup $transactionGroup): void
{
Log::debug(sprintf('Appended transaction group #%d', $transactionGroup->id));
$this->transactionGroups->push($transactionGroup);
/** @var TransactionJournal $journal */
foreach ($transactionGroup->transactionJournals as $journal) {
Log::debug(sprintf('Appended transaction journal #%d', $journal->id));
$this->transactionJournals->push($journal);
$this->budgets = $this->budgets->merge($journal->budgets);
$this->categories = $this->categories->merge($journal->categories);
@@ -59,6 +83,7 @@ class TransactionGroupEventObjects
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
Log::debug(sprintf('Appended account #%d', $transaction->account->id));
$this->accounts->push($transaction->account);
}
}
app/TransactionRules/Engine/SearchRuleEngine.php
+24
View File
@@ -25,6 +25,9 @@ declare(strict_types=1);
namespace FireflyIII\TransactionRules\Engine;
use Carbon\Carbon;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Note;
use FireflyIII\Models\Rule;
@@ -399,9 +402,17 @@ class SearchRuleEngine implements RuleEngineInterface
private function fireNonStrictRule(Rule $rule): bool
{
Log::debug(sprintf('SearchRuleEngine::fireNonStrictRule(%d)!', $rule->id));
$flags = new TransactionGroupEventFlags();
$flags->applyRules = false;
$flags->fireWebhooks = false;
$objects = new TransactionGroupEventObjects();
$collection = $this->findNonStrictRule($rule);
$objects->collectFromCollection($collection);
$this->processResults($rule, $collection);
// collect from collection, again!
$objects->collectFromCollection($collection);
event(new UpdatedSingleTransactionGroup($flags, $objects));
Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
return $collection->count() > 0;
@@ -438,10 +449,23 @@ class SearchRuleEngine implements RuleEngineInterface
private function fireStrictRule(Rule $rule): bool
{
Log::debug(sprintf('SearchRuleEngine::fireStrictRule(%d)!', $rule->id));
$flags = new TransactionGroupEventFlags();
$flags->applyRules = false;
$flags->fireWebhooks = false;
$objects = new TransactionGroupEventObjects();
$collection = $this->findStrictRule($rule);
$objects->collectFromCollection($collection);
$this->processResults($rule, $collection);
// collect from collection, again!
$objects->collectFromCollection($collection);
// fire event for changed groups.
event(new UpdatedSingleTransactionGroup($flags, $objects));
$result = $collection->count() > 0;
if ($result) {
Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
config/passport.php
+14 -55
View File
@@ -1,38 +1,17 @@
<?php
/*
* passport.php
* Copyright (c) 2023 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);
return [
/*
|--------------------------------------------------------------------------
| Passport Guard
|--------------------------------------------------------------------------
|
| Here you may specify which authentication guard Passport will use when
| authenticating users. This value should correspond with one of your
| guards that is already present in your "auth" configuration file.
|
*/
|--------------------------------------------------------------------------
| Passport Guard
|--------------------------------------------------------------------------
|
| Here you may specify which authentication guard Passport will use when
| authenticating users. This value should correspond with one of your
| guards that is already present in your "auth" configuration file.
|
*/
'guard' => envDefaultWhenEmpty(env('AUTHENTICATION_GUARD'), 'web'),
@@ -51,32 +30,12 @@ return [
'public_key' => env('PASSPORT_PUBLIC_KEY'),
/*
|--------------------------------------------------------------------------
| Client UUIDs
|--------------------------------------------------------------------------
|
| By default, Passport uses auto-incrementing primary keys when assigning
| IDs to clients. However, if Passport is installed using the provided
| --uuids switch, this will be set to "true" and UUIDs will be used.
|
*/
'client_uuids' => false,
/*
|--------------------------------------------------------------------------
| Personal Access Client
|--------------------------------------------------------------------------
|
| If you enable client hashing, you should set the personal access client
| ID and unhashed secret within your environment file. The values will
| get used while issuing fresh personal access tokens to your users.
|
*/
'personal_access_client' => [
'id' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_ID'),
'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'),
],
'middleware' => [],
'connection' => env('PASSPORT_CONNECTION'),
];
resources/views/list/groups.twig
+2 -2
View File
@@ -32,9 +32,9 @@
<tr>
<th class="hidden-xs">&nbsp;</th>
<th>{{ trans('list.description') }}</th>
<th>{{ trans('list.amount') }}</th>
<th class="text-right">{{ trans('list.amount') }}</th>
{% if fireflyiiiconfig('use_running_balance', true) %}
<th>{{ trans('list.running_balance') }}</th>
<th class="text-right">{{ trans('list.running_balance') }}</th>
{% endif %}
<th>{{ trans('list.date') }}</th>
<th>{{ trans('list.source_account') }}</th>