mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 09:52:20 +00:00
Fix account type list.
This commit is contained in:
@@ -24,6 +24,8 @@ declare(strict_types=1);
|
|||||||
namespace FireflyIII\Api\V1\Requests\Models\Account;
|
namespace FireflyIII\Api\V1\Requests\Models\Account;
|
||||||
|
|
||||||
use FireflyIII\Api\V1\Requests\ApiRequest;
|
use FireflyIII\Api\V1\Requests\ApiRequest;
|
||||||
|
use FireflyIII\Rules\Account\IsValidAccountType;
|
||||||
|
use FireflyIII\Rules\Account\IsValidAccountTypeList;
|
||||||
use FireflyIII\Support\Http\Api\AccountFilter;
|
use FireflyIII\Support\Http\Api\AccountFilter;
|
||||||
use Illuminate\Validation\Validator;
|
use Illuminate\Validation\Validator;
|
||||||
|
|
||||||
@@ -33,8 +35,9 @@ class AccountTypesApiRequest extends ApiRequest
|
|||||||
|
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
|
// sprintf('in:%s', implode(',', array_keys($this->types))),
|
||||||
return [
|
return [
|
||||||
'types' => sprintf('in:%s', implode(',', array_keys($this->types))),
|
'types' => new IsValidAccountTypeList(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
56
app/Rules/Account/IsValidAccountTypeList.php
Normal file
56
app/Rules/Account/IsValidAccountTypeList.php
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* IsValidAccountType.php
|
||||||
|
* Copyright (c) 2024 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/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FireflyIII\Rules\Account;
|
||||||
|
|
||||||
|
use Closure;
|
||||||
|
use FireflyIII\Support\Http\Api\AccountFilter;
|
||||||
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
|
use Override;
|
||||||
|
|
||||||
|
class IsValidAccountTypeList implements ValidationRule
|
||||||
|
{
|
||||||
|
use AccountFilter;
|
||||||
|
|
||||||
|
#[Override]
|
||||||
|
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||||
|
{
|
||||||
|
|
||||||
|
// only check the type.
|
||||||
|
$values = [];
|
||||||
|
if(is_string($value)) {
|
||||||
|
$values = explode(',', $value);
|
||||||
|
}
|
||||||
|
if(!is_array($values)) {
|
||||||
|
$fail('validation.invalid_account_list')->translate();
|
||||||
|
}
|
||||||
|
$keys = array_keys($this->types);
|
||||||
|
foreach ($values as $entry) {
|
||||||
|
$entry = (string) $entry;
|
||||||
|
if (!in_array($entry, $keys, true)) {
|
||||||
|
$fail('validation.invalid_account_list')->translate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
'invalid_account_list' => 'Invalid account type list',
|
||||||
'limit_exists' => 'There is already a budget limit (amount) for this budget and currency in the given period.',
|
'limit_exists' => 'There is already a budget limit (amount) for this budget and currency in the given period.',
|
||||||
'invalid_sort_instruction' => 'The sort instruction is invalid for an object of type ":object".',
|
'invalid_sort_instruction' => 'The sort instruction is invalid for an object of type ":object".',
|
||||||
'invalid_sort_instruction_index' => 'The sort instruction at index #:index is invalid for an object of type ":object".',
|
'invalid_sort_instruction_index' => 'The sort instruction at index #:index is invalid for an object of type ":object".',
|
||||||
|
|||||||
Reference in New Issue
Block a user