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

No use models directly.

Browse Source
This commit is contained in:
James Cole
2016-10-23 12:41:54 +02:00
parent a79a8c8874
commit 6a2f8fa9ee
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/AccountFormRequest.php
View File

@@ -14,7 +14,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
/** /**
* Class AccountFormRequest * Class AccountFormRequest
@@ -60,13 +60,15 @@ class AccountFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$accountRoles = join(',', array_keys(config('firefly.accountRoles'))); $accountRoles = join(',', array_keys(config('firefly.accountRoles')));
$types = join(',', array_keys(config('firefly.subTitlesByIdentifier'))); $types = join(',', array_keys(config('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes'))); $ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes')));
$nameRule = 'required|min:1|uniqueAccountForUser'; $nameRule = 'required|min:1|uniqueAccountForUser';
$idRule = ''; $idRule = '';
if (Account::find($this->get('id'))) { if (!is_null($repository->find(intval($this->get('id')))->id)) {
$idRule = 'belongsToUser:accounts'; $idRule = 'belongsToUser:accounts';
$nameRule = 'required|min:1|uniqueAccountForUser:' . $this->get('id'); $nameRule = 'required|min:1|uniqueAccountForUser:' . $this->get('id');
} }

9
app/Http/Requests/BudgetFormRequest.php
View File

@@ -13,7 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
/** /**
* Class BudgetFormRequest * Class BudgetFormRequest
@@ -47,9 +47,10 @@ class BudgetFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
/** @var BudgetRepositoryInterface $repository */
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name'; $repository = app(BudgetRepositoryInterface::class);
if (Budget::find($this->get('id'))) { $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name';
if (!is_null($repository->find(intval($this->get('id')))->id)) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval($this->get('id')); $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval($this->get('id'));
} }

9
app/Http/Requests/CategoryFormRequest.php
View File

@@ -13,7 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
/** /**
* Class CategoryFormRequest * Class CategoryFormRequest
@@ -47,9 +47,10 @@ class CategoryFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
/** @var CategoryRepositoryInterface $repository */
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name'; $repository = app(CategoryRepositoryInterface::class);
if (Category::find($this->get('id'))) { $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
if (!is_null($repository->find(intval($this->get('id')))->id)) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id')); $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id'));
} }

7
app/Http/Requests/RuleFormRequest.php
View File

@@ -13,7 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
/** /**
* Class RuleFormRequest * Class RuleFormRequest
@@ -57,7 +57,8 @@ class RuleFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
/** @var RuleGroupRepositoryInterface $repository */
$repository = app(RuleGroupRepositoryInterface::class);
$validTriggers = array_keys(config('firefly.rule-triggers')); $validTriggers = array_keys(config('firefly.rule-triggers'));
$validActions = array_keys(config('firefly.rule-actions')); $validActions = array_keys(config('firefly.rule-actions'));
@@ -65,7 +66,7 @@ class RuleFormRequest extends Request
$contextActions = join(',', config('firefly.rule-actions-text')); $contextActions = join(',', config('firefly.rule-actions-text'));
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
if (RuleGroup::find($this->get('id'))) { if (!is_null($repository->find(intval($this->get('id')))->id)) {
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id')); $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id'));
} }

10
app/Http/Requests/TagFormRequest.php
View File

@@ -13,7 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\Tag; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
/** /**
* Class TagFormRequest * Class TagFormRequest
@@ -68,9 +68,11 @@ class TagFormRequest extends Request
*/ */
public function rules() public function rules()
{ {
$idRule = ''; /** @var TagRepositoryInterface $repository */
$tagRule = 'required|min:1|uniqueObjectForUser:tags,tag'; $repository = app(TagRepositoryInterface::class);
if (Tag::find($this->get('id'))) { $idRule = '';
$tagRule = 'required|min:1|uniqueObjectForUser:tags,tag';
if (!is_null($repository->find(intval($this->get('id')))->id)) {
$idRule = 'belongsToUser:tags'; $idRule = 'belongsToUser:tags';
$tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . $this->get('id'); $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . $this->get('id');
} }