Fix #11313

app/Events/Model/TransactionGroup/TriggeredStoredTransactionGroup.php

@@ -0,0 +1,36 @@
+<?php
+/*
+ * TriggeredStoredTransactionGroup.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\Events\Model\TransactionGroup;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\TransactionGroup;
+use Illuminate\Queue\SerializesModels;
+
+class TriggeredStoredTransactionGroup extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public TransactionGroup $transactionGroup) {}
+}

app/Handlers/Events/StoredGroupEventHandler.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Enums\WebhookTrigger;
+use FireflyIII\Events\Model\TransactionGroup\TriggeredStoredTransactionGroup;
 use FireflyIII\Events\RequestedSendWebhookMessages;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
@@ -51,6 +52,12 @@ class StoredGroupEventHandler
         $this->removePeriodStatistics($event);
     }
 
+    public function triggerRulesManually(TriggeredStoredTransactionGroup $event): void
+    {
+        $newEvent = new StoredTransactionGroup($event->transactionGroup, true, false);
+        $this->processRules($newEvent);
+    }
+
     /**
      * This method grabs all the users rules and processes them.
      */

app/Http/Controllers/RuleGroup/ExecutionController.php

@@ -26,14 +26,16 @@ namespace FireflyIII\Http\Controllers\RuleGroup;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Events\Model\TransactionGroup\TriggeredStoredTransactionGroup;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\SelectTransactionsRequest;
 use FireflyIII\Models\RuleGroup;
-use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
+use FireflyIII\Models\TransactionGroup;
-use FireflyIII\User;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -41,18 +43,20 @@ use Illuminate\View\View;
  */
 class ExecutionController extends Controller
 {
+    private AccountRepositoryInterface $repository;
+
     /**
      * ExecutionController constructor.
      */
     public function __construct()
     {
         parent::__construct();
-
+        $this->repository = app(AccountRepositoryInterface::class);
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.rules'));
+                app('view')->share('title', (string)trans('firefly.rules'));
                 app('view')->share('mainTitleIcon', 'fa-random');
-
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -67,34 +71,35 @@ class ExecutionController extends Controller
     public function execute(SelectTransactionsRequest $request, RuleGroup $ruleGroup): RedirectResponse
     {
         // Get parameters specified by the user
-        /** @var User $user */
+        $accounts = $request->get('accounts');
-        $user          = auth()->user();
+        $set      = $this->repository->getAccountsById($accounts);
-        $accounts      = implode(',', $request->get('accounts'));
+        /** @var GroupCollectorInterface $collector */
-        // create new rule engine:
+        $collector = app(GroupCollectorInterface::class);
-        $newRuleEngine = app(RuleEngineInterface::class);
+        $collector->setAccounts($set);
-        $newRuleEngine->setUser($user);
-
         // add date operators.
         if (null !== $request->get('start')) {
             $startDate = new Carbon($request->get('start'));
-            $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);
+            $collector->setStart($startDate);
         }
         if (null !== $request->get('end')) {
             $endDate = new Carbon($request->get('end'));
-            $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);
+            $collector->setEnd($endDate);
+        }
+        $final = $collector->getGroups();
+        $ids   = $final->pluck('id')->toArray();
+        Log::debug(sprintf('Found %d groups collected from %d account(s)', $final->count(), $set->count()));
+        foreach (array_chunk($ids, 1337) as $setOfIds) {
+            Log::debug(sprintf('Now processing %d groups', count($setOfIds)));
+            $groups = TransactionGroup::whereIn('id', $setOfIds)->get();
+            /** @var TransactionGroup $group */
+            foreach ($groups as $group) {
+                Log::debug(sprintf('Processing group #%d.', $group->id));
+                event(new TriggeredStoredTransactionGroup($group));
+            }
         }
 
-        // add extra operators:
-        $newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]);
-
-        // set rules:
-        // #10427, file rule group and not the set of rules.
-        $collection    = new Collection()->push($ruleGroup);
-        $newRuleEngine->setRuleGroups($collection);
-        $newRuleEngine->fire();
-
         // Tell the user that the job is queued
-        session()->flash('success', (string) trans('firefly.applied_rule_group_selection', ['title' => $ruleGroup->title]));
+        session()->flash('success', (string)trans('firefly.applied_rule_group_selection', ['title' => $ruleGroup->title]));
 
         return redirect()->route('rules.index');
     }
@@ -104,9 +109,9 @@ class ExecutionController extends Controller
      *
      * @return Factory|View
      */
-    public function selectTransactions(RuleGroup $ruleGroup): Factory|\Illuminate\Contracts\View\View
+    public function selectTransactions(RuleGroup $ruleGroup): Factory | \Illuminate\Contracts\View\View
     {
-        $subTitle = (string) trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
+        $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
 
         return view('rules.rule-group.select-transactions', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]);
     }

app/Providers/EventServiceProvider.php

@@ -33,6 +33,7 @@ use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
 use FireflyIII\Events\Model\PiggyBank\ChangedName;
 use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray;
 use FireflyIII\Events\Model\Rule\RuleActionFailedOnObject;
+use FireflyIII\Events\Model\TransactionGroup\TriggeredStoredTransactionGroup;
 use FireflyIII\Events\NewVersionAvailable;
 use FireflyIII\Events\Preferences\UserGroupChangedPrimaryCurrency;
 use FireflyIII\Events\RegisteredUser;
@@ -131,6 +132,9 @@ class EventServiceProvider extends ServiceProvider
             StoredTransactionGroup::class            => [
                 'FireflyIII\Handlers\Events\StoredGroupEventHandler@runAllHandlers',
             ],
+            TriggeredStoredTransactionGroup::class   => [
+                'FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerRulesManually',
+            ],
             // is a Transaction Journal related event.
             UpdatedTransactionGroup::class           => [
                 'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@runAllHandlers',