kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-07-10 07:29:39 +02:00
parent b0ccd26928
commit ddb222cc72
15 changed files with 52 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/Validation/FireflyValidator.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Budget;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\TransactionType;
use FireflyIII\Models\Webhook;
@@ -266,16 +265,8 @@ class FireflyValidator extends Validator
if ('set_budget' === $actionType) {
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$budgets = $repository->getBudgets();
// count budgets, should have at least one
// See reference nr. 102
$count = $budgets->filter(
function (Budget $budget) use ($value) {
return $budget->name === $value;
}
)->count();
return 1 === $count;
return null !== $repository->findByName($value);
}
// if it's link to bill, verify the name of the bill.
@@ -450,16 +441,14 @@ class FireflyValidator extends Validator
$type = AccountType::find($this->data['account_type_id'])->first();
$value = $this->data['name'];
$set = $user->accounts()->where('account_type_id', $type->id)->get();
// See reference nr. 103
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name === $value) {
return false;
$set = $user->accounts()->where('account_type_id', $type->id)->get();
$result = $set->first(
function (Account $account) use ($value) {
return $account->name === $value;
}
}
);
return true;
return null === $result;
}
/**
@@ -483,15 +472,13 @@ class FireflyValidator extends Validator
$accountTypeIds = $accountTypes->pluck('id')->toArray();
/** @var Collection $set */
$set = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)->get();
// See reference nr. 104
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name === $value) {
return false;
$result = $set->first(
function (Account $account) use ($value) {
return $account->name === $value;
}
}
);
return null === $result;
return true;
}
/**
@@ -507,16 +494,13 @@ class FireflyValidator extends Validator
/** @var Collection $set */
$set = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
// See reference nr. 105
/** @var Account $entry */
foreach ($set as $entry) {
// See reference nr. 106
if ($entry->name === $value) {
return false;
}
}
return true;
$result = $set->first(
function (Account $account) use ($value) {
return $account->name === $value;
}
);
return null === $result;
}
/**
@@ -733,18 +717,8 @@ class FireflyValidator extends Validator
if (null !== $exclude) {
$query->where('piggy_banks.id', '!=', (int)$exclude);
}
$set = $query->get(['piggy_banks.*']);
/** @var PiggyBank $entry */
foreach ($set as $entry) {
$fieldValue = $entry->name;
if ($fieldValue === $value) {
return false;
}
}
return true;
$query->where('piggy_banks.name',$value);
return null === $query->first(['piggy_banks.*']);
}
/**