Account search fixed.

This commit is contained in:
James Cole
2020-08-28 11:24:55 +02:00
parent 63794cab07
commit 093f34b7a8
26 changed files with 157 additions and 996 deletions

View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
@@ -82,6 +83,14 @@ trait CollectsValues
return $this->user()->bills()->inRandomOrder()->first();
}
/**
* @return PiggyBank
*/
public function getRandomPiggyBank(): PiggyBank
{
return $this->user()->piggyBanks()->inRandomOrder()->first();
}
/**
* @return Tag
@@ -99,6 +108,14 @@ trait CollectsValues
return $this->getRandomJournal(TransactionType::WITHDRAWAL);
}
/**
* @return TransactionJournal
*/
public function getRandomTransfer(): TransactionJournal
{
return $this->getRandomJournal(TransactionType::TRANSFER);
}
/**
* @return TransactionJournal
*/

View File

@@ -0,0 +1,90 @@
<?php
/*
* UpdatePiggybankTest.php
* Copyright (c) 2020 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 Tests\Unit\TransactionRules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\TransactionRules\Actions\UpdatePiggybank;
use Log;
use Tests\TestCase;
class UpdatePiggybankTest extends TestCase
{
/**
*
*/
public function setUp(): void
{
parent::setUp();
Log::info(sprintf('Now in %s.', get_class($this)));
}
/**
* @covers \FireflyIII\TransactionRules\Actions\UpdatePiggybank
*/
public function testActOnArraySource(): void
{
// from saving to checking
$transfer = $this->user()->transactionJournals()->where('description', 'Transfer for piggy bank 1')->first();
// update (the only) piggy to belong to source:
$piggy = $this->user()->piggyBanks()->where('piggy_banks.name', 'Action test 1')->first();
$array = [
'transaction_journal_id' => $transfer->id,
'user_id' => $this->user()->id,
'transaction_type_type' => 'Transfer',
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $piggy->name;
$action = new UpdatePiggybank($ruleAction);
$result = $action->actOnArray($array);
$this->assertTrue($result);
}
/**
* @covers \FireflyIII\TransactionRules\Actions\UpdatePiggybank
*/
public function testActOnArrayDestination(): void
{
// from saving to checking
$transfer = $this->user()->transactionJournals()->where('description', 'Transfer for piggy bank 2')->first();
// update (the only) piggy to belong to source:
$piggy = $this->user()->piggyBanks()->where('piggy_banks.name', 'Action test 1')->first();
$array = [
'transaction_journal_id' => $transfer->id,
'user_id' => $this->user()->id,
'transaction_type_type' => 'Transfer',
];
// fire the action:
$ruleAction = new RuleAction;
$ruleAction->action_value = $piggy->name;
$action = new UpdatePiggybank($ruleAction);
$result = $action->actOnArray($array);
$this->assertTrue($result);
}
}