kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Improve tests for transaction rules.

Browse Source
This commit is contained in:
James Cole
2018-03-04 16:42:29 +01:00
parent 04b8552d27
commit d22fb9f438
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/TransactionRules/Actions/ClearBudget.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Log;
@@ -55,6 +56,13 @@ class ClearBudget implements ActionInterface
{
$journal->budgets()->detach();
$journal->touch();
// also remove categories from transactions:
/** @var Transaction $transaction */
foreach($journal->transactions as $transaction) {
$transaction->budgets()->detach();
}
Log::debug(sprintf('RuleAction ClearBudget removed all budgets from journal %d.', $journal->id));
return true;

8
app/TransactionRules/Actions/ClearCategory.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Log;
@@ -55,6 +56,13 @@ class ClearCategory implements ActionInterface
{
$journal->categories()->detach();
$journal->touch();
// also remove categories from transactions:
/** @var Transaction $transaction */
foreach($journal->transactions as $transaction) {
$transaction->categories()->detach();
}
Log::debug(sprintf('RuleAction ClearCategory removed all categories from journal %d.', $journal->id));
return true;

8
app/TransactionRules/Actions/SetBudget.php
View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Budget;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -87,7 +88,12 @@ class SetBudget implements ActionInterface
Log::debug(sprintf('RuleAction SetBudget set the budget of journal #%d to budget #%d ("%s").', $journal->id, $budget->id, $budget->name));
$journal->budgets()->sync([$budget->id]);
$journal->budgets()->detach();
// set budget on transactions:
/** @var Transaction $transaction */
foreach ($journal->transaction as $transaction) {
$transaction->budgets()->sync([$budget->id]);
}
$journal->touch();
return true;

12
app/TransactionRules/Actions/SetCategory.php
View File

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
use FireflyIII\Models\Category;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Log;
@@ -56,7 +57,16 @@ class SetCategory implements ActionInterface
{
$name = $this->action->action_value;
$category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => $journal->user->id]);
$journal->categories()->sync([$category->id]);
$journal->categories()->detach();
// set category on transactions:
/** @var Transaction $transaction */
foreach ($journal->transaction as $transaction) {
$transaction->categories()->sync([$category->id]);
}
$journal->touch();
$journal->touch();
Log::debug(sprintf('RuleAction SetCategory set the category of journal #%d to budget #%d ("%s").', $journal->id, $category->id, $category->name));

2
tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
View File

@@ -41,7 +41,7 @@ class ClearCategoryTest extends TestCase
// associate budget with journal:
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$category = $journal->user->categories()->first();
$journal->budgets()->save($category);
$journal->categories()->save($category);
$this->assertGreaterThan(0, $journal->categories()->count());
// fire the action: