mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-24 14:46:37 +00:00
Code cleanup.
This commit is contained in:
@@ -32,18 +32,15 @@ use FireflyIII\Models\Rule;
|
||||
use FireflyIII\Models\RuleTrigger;
|
||||
use FireflyIII\Support\Http\Controllers\RuleManagement;
|
||||
use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
|
||||
use FireflyIII\TransactionRules\TransactionMatcher;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\View\View;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* Class SelectController.
|
||||
*
|
||||
*/
|
||||
class SelectController extends Controller
|
||||
{
|
||||
@@ -68,11 +65,6 @@ class SelectController extends Controller
|
||||
|
||||
/**
|
||||
* Execute the given rule on a set of existing transactions.
|
||||
*
|
||||
* @param SelectTransactionsRequest $request
|
||||
* @param Rule $rule
|
||||
*
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function execute(SelectTransactionsRequest $request, Rule $rule): RedirectResponse
|
||||
{
|
||||
@@ -104,12 +96,8 @@ class SelectController extends Controller
|
||||
|
||||
/**
|
||||
* View to select transactions by a rule.
|
||||
*
|
||||
* @param Rule $rule
|
||||
*
|
||||
* @return Factory|View|RedirectResponse
|
||||
*/
|
||||
public function selectTransactions(Rule $rule): Factory | View | RedirectResponse
|
||||
public function selectTransactions(Rule $rule): Factory|RedirectResponse|View
|
||||
{
|
||||
if (false === $rule->active) {
|
||||
session()->flash('warning', trans('firefly.cannot_fire_inactive_rules'));
|
||||
@@ -128,15 +116,13 @@ class SelectController extends Controller
|
||||
* This method allows the user to test a certain set of rule triggers. The rule triggers are passed along
|
||||
* using the URL parameters (GET), and are usually put there using a Javascript thing.
|
||||
*
|
||||
* @param TestRuleFormRequest $request
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
*/
|
||||
public function testTriggers(TestRuleFormRequest $request): JsonResponse
|
||||
{
|
||||
// build fake rule
|
||||
$rule = new Rule();
|
||||
|
||||
/** @var \Illuminate\Database\Eloquent\Collection<int, RuleTrigger> $triggers */
|
||||
$triggers = new Collection();
|
||||
$rule->strict = '1' === $request->get('strict');
|
||||
@@ -180,12 +166,14 @@ class SelectController extends Controller
|
||||
|
||||
// Return json response
|
||||
$view = 'ERROR, see logs.';
|
||||
|
||||
try {
|
||||
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
|
||||
} catch (Throwable $exception) {
|
||||
} catch (\Throwable $exception) {
|
||||
app('log')->error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
|
||||
app('log')->error($exception->getTraceAsString());
|
||||
$view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());
|
||||
|
||||
throw new FireflyException($view, 0, $exception);
|
||||
}
|
||||
|
||||
@@ -196,9 +184,6 @@ class SelectController extends Controller
|
||||
* This method allows the user to test a certain set of rule triggers. The rule triggers are grabbed from
|
||||
* the rule itself.
|
||||
*
|
||||
* @param Rule $rule
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
*/
|
||||
public function testTriggersByRule(Rule $rule): JsonResponse
|
||||
@@ -223,12 +208,14 @@ class SelectController extends Controller
|
||||
|
||||
// Return json response
|
||||
$view = 'ERROR, see logs.';
|
||||
|
||||
try {
|
||||
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
|
||||
} catch (Throwable $exception) {
|
||||
} catch (\Throwable $exception) {
|
||||
$message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());
|
||||
app('log')->error($message);
|
||||
app('log')->error($exception->getTraceAsString());
|
||||
|
||||
throw new FireflyException($message, 0, $exception);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user