kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Refactor installer.

Browse Source
This commit is contained in:
James Cole
2019-03-30 11:03:39 +01:00
parent 5b1fb5354e
commit c07ef3658b
18 changed files with 230 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Handlers/Events/StoredJournalEventHandler.php → app/Handlers/Events/StoredGroupEventHandler.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* StoredJournalEventHandler.php
* StoredGroupEventHandler.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
@@ -22,47 +22,52 @@ declare(strict_types=1);
namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\StoredTransactionJournal;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\TransactionRules\Processor;
/**
* Class StoredJournalEventHandler
* Class StoredGroupEventHandler
*/
class StoredJournalEventHandler
class StoredGroupEventHandler
{
/**
* This method grabs all the users rules and processes them.
*
* @param StoredTransactionJournal $storedJournalEvent
* @param StoredTransactionGroup $storedJournalEvent
*
* @return bool
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function processRules(StoredTransactionJournal $storedJournalEvent): bool
public function processRules(StoredTransactionGroup $storedJournalEvent): bool
{
$journal = $storedJournalEvent->journal;
$journals = $storedJournalEvent->transactionGroup->transactionJournals;
// create objects:
/** @var RuleGroupRepositoryInterface $ruleGroupRepos */
$ruleGroupRepos = app(RuleGroupRepositoryInterface::class);
$ruleGroupRepos->setUser($journal->user);
$groups = $ruleGroupRepos->getActiveGroups($journal->user);
/** @var RuleGroup $group */
foreach ($groups as $group) {
$rules = $ruleGroupRepos->getActiveStoreRules($group);
/** @var Rule $rule */
foreach ($rules as $rule) {
/** @var Processor $processor */
$processor = app(Processor::class);
$processor->make($rule);
$processor->handleTransactionJournal($journal);
foreach ($journals as $journal) {
$ruleGroupRepos->setUser($journal->user);
$groups = $ruleGroupRepos->getActiveGroups($journal->user);
if ($rule->stop_processing) {
break;
/** @var RuleGroup $group */
foreach ($groups as $group) {
$rules = $ruleGroupRepos->getActiveStoreRules($group);
/** @var Rule $rule */
foreach ($rules as $rule) {
/** @var Processor $processor */
$processor = app(Processor::class);
$processor->make($rule);
$processor->handleTransactionJournal($journal);
// TODO refactor the stop_processing logic.
// TODO verify that rule execution happens in one place only, including the journal + rule loop (if any)
if ($rule->stop_processing) {
break;
}
}
}
}

43
app/Handlers/Events/UpdatedJournalEventHandler.php → app/Handlers/Events/UpdatedGroupEventHandler.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* UpdatedJournalEventHandler.php
* UpdatedGroupEventHandler.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
@@ -22,48 +22,51 @@ declare(strict_types=1);
namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\TransactionRules\Processor;
/**
* Class UpdatedJournalEventHandler
* Class UpdatedGroupEventHandler
*/
class UpdatedJournalEventHandler
class UpdatedGroupEventHandler
{
/**
* This method will check all the rules when a journal is updated.
*
* @param UpdatedTransactionJournal $updatedJournalEvent
* @param UpdatedTransactionGroup $updatedJournalEvent
*
* @return bool
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function processRules(UpdatedTransactionJournal $updatedJournalEvent): bool
public function processRules(UpdatedTransactionGroup $updatedJournalEvent): bool
{
// get all the user's rule groups, with the rules, order by 'order'.
$journal = $updatedJournalEvent->journal;
$journals = $updatedJournalEvent->transactionGroup;
/** @var RuleGroupRepositoryInterface $ruleGroupRepos */
$ruleGroupRepos = app(RuleGroupRepositoryInterface::class);
$ruleGroupRepos->setUser($journal->user);
$groups = $ruleGroupRepos->getActiveGroups($journal->user);
foreach ($journals as $journal) {
$ruleGroupRepos->setUser($journal->user);
/** @var RuleGroup $group */
foreach ($groups as $group) {
$rules = $ruleGroupRepos->getActiveUpdateRules($group);
/** @var Rule $rule */
foreach ($rules as $rule) {
/** @var Processor $processor */
$processor = app(Processor::class);
$processor->make($rule);
$processor->handleTransactionJournal($journal);
$groups = $ruleGroupRepos->getActiveGroups($journal->user);
if ($rule->stop_processing) {
break;
/** @var RuleGroup $group */
foreach ($groups as $group) {
$rules = $ruleGroupRepos->getActiveUpdateRules($group);
/** @var Rule $rule */
foreach ($rules as $rule) {
/** @var Processor $processor */
$processor = app(Processor::class);
$processor->make($rule);
$processor->handleTransactionJournal($journal);
if ($rule->stop_processing) {
break;
}
}
}
}