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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Rules/UniqueAccountNumber.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Rules;
use Closure;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
@@ -39,10 +38,6 @@ class UniqueAccountNumber implements ValidationRule
/**
* Create a new rule instance.
*
*
* @param Account|null $account
* @param string|null $expectedType
*/
public function __construct(?Account $account, ?string $expectedType)
{
@@ -64,9 +59,6 @@ class UniqueAccountNumber implements ValidationRule
/**
* Get the validation error message.
*
*
* @return string
*/
public function message(): string
{
@@ -74,15 +66,9 @@ class UniqueAccountNumber implements ValidationRule
}
/**
* @param string $attribute
* @param mixed $value
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
public function validate(string $attribute, mixed $value, \Closure $fail): void
{
if (!auth()->check()) {
return;
@@ -107,16 +93,13 @@ class UniqueAccountNumber implements ValidationRule
);
$fail('validation.unique_account_number_for_user')->translate();
return;
}
}
app('log')->debug('Account number is valid.');
}
/**
* @return array
*
*/
private function getMaxOccurrences(): array
{
$maxCounts = [
@@ -139,20 +122,15 @@ class UniqueAccountNumber implements ValidationRule
return $maxCounts;
}
/**
* @param string $type
* @param string $accountNumber
*
* @return int
*/
private function countHits(string $type, string $accountNumber): int
{
$query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.user_id', auth()->user()->id)
->where('account_types.type', $type)
->where('account_meta.name', '=', 'account_number')
->where('account_meta.data', json_encode($accountNumber));
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.user_id', auth()->user()->id)
->where('account_types.type', $type)
->where('account_meta.name', '=', 'account_number')
->where('account_meta.data', json_encode($accountNumber))
;
if (null !== $this->account) {
$query->where('accounts.id', '!=', $this->account->id);