Add marker. Seems fastest solution.

This commit is contained in:
James Cole 2024-01-05 14:47:44 +01:00
parent 11f77685e4
commit 5725570dbb
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 10 additions and 10 deletions

View File

@ -33,15 +33,16 @@ use Illuminate\Contracts\Validation\ValidationRule;
*/ */
class UniqueAccountNumber implements ValidationRule class UniqueAccountNumber implements ValidationRule
{ {
private ?Account $account; private ?Account $account;
private ?string $expectedType; private ?string $expectedType;
/** /**
* Create a new rule instance. * Create a new rule instance.
*/ */
public function __construct(?Account $account, ?string $expectedType) public function __construct(?Account $account, ?string $expectedType)
{ {
app('log')->debug('Constructed UniqueAccountNumber'); app('log')
->debug('Constructed UniqueAccountNumber');
$this->account = $account; $this->account = $account;
$this->expectedType = $expectedType; $this->expectedType = $expectedType;
// a very basic fix to make sure we get the correct account type: // a very basic fix to make sure we get the correct account type:
@ -62,7 +63,7 @@ class UniqueAccountNumber implements ValidationRule
*/ */
public function message(): string public function message(): string
{ {
return (string)trans('validation.unique_account_number_for_user'); return (string) trans('validation.unique_account_number_for_user');
} }
/** /**
@ -125,12 +126,11 @@ class UniqueAccountNumber implements ValidationRule
private function countHits(string $type, string $accountNumber): int private function countHits(string $type, string $accountNumber): int
{ {
$query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') $query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.user_id', auth()->user()->id) ->where('accounts.user_id', auth()->user()->id)
->where('account_types.type', $type) ->where('account_types.type', $type)
->where('account_meta.name', '=', 'account_number') ->where('account_meta.name', '=', 'account_number')
->where('account_meta.data', json_encode($accountNumber)) ->where('account_meta.data', json_encode($accountNumber));
;
if (null !== $this->account) { if (null !== $this->account) {
$query->where('accounts.id', '!=', $this->account->id); $query->where('accounts.id', '!=', $this->account->id);

BIN
public/marker-icon-2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
public/marker-shadow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B