diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index abb5f1cc59..606e2a253b 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -50,28 +50,28 @@ class UpdateRequest extends FormRequest public function getUpdateData(): array { $fields = [ - 'name' => ['name', 'string'], + 'name' => ['name', 'convertString'], 'active' => ['active', 'boolean'], 'include_net_worth' => ['include_net_worth', 'boolean'], - 'account_type_name' => ['type', 'string'], - 'virtual_balance' => ['virtual_balance', 'string'], - 'iban' => ['iban', 'string'], - 'BIC' => ['bic', 'string'], - 'account_number' => ['account_number', 'string'], - 'account_role' => ['account_role', 'string'], - 'liability_type' => ['liability_type', 'string'], - 'opening_balance' => ['opening_balance', 'string'], + 'account_type_name' => ['type', 'convertString'], + 'virtual_balance' => ['virtual_balance', 'convertString'], + 'iban' => ['iban', 'convertString'], + 'BIC' => ['bic', 'convertString'], + 'account_number' => ['account_number', 'convertString'], + 'account_role' => ['account_role', 'convertString'], + 'liability_type' => ['liability_type', 'convertString'], + 'opening_balance' => ['opening_balance', 'convertString'], 'opening_balance_date' => ['opening_balance_date', 'date'], - 'cc_type' => ['credit_card_type', 'string'], - 'cc_monthly_payment_date' => ['monthly_payment_date', 'string'], + 'cc_type' => ['credit_card_type', 'convertString'], + 'cc_monthly_payment_date' => ['monthly_payment_date', 'convertString'], 'notes' => ['notes', 'stringWithNewlines'], - 'interest' => ['interest', 'string'], - 'interest_period' => ['interest_period', 'string'], + 'interest' => ['interest', 'convertString'], + 'interest_period' => ['interest_period', 'convertString'], 'order' => ['order', 'integer'], 'currency_id' => ['currency_id', 'integer'], - 'currency_code' => ['currency_code', 'string'], - 'liability_direction' => ['liability_direction', 'string'], - 'liability_amount' => ['liability_amount', 'string'], + 'currency_code' => ['currency_code', 'convertString'], + 'liability_direction' => ['liability_direction', 'convertString'], + 'liability_amount' => ['liability_amount', 'convertString'], 'liability_start_date' => ['liability_start_date', 'date'], ]; /** @var Account $account */ diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php index e0d3092663..0dd11131af 100644 --- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php @@ -45,10 +45,10 @@ class UpdateRequest extends FormRequest public function getAll(): array { $fields = [ - 'filename' => ['filename', 'string'], - 'title' => ['title', 'string'], + 'filename' => ['filename', 'convertString'], + 'title' => ['title', 'convertString'], 'notes' => ['notes', 'stringWithNewlines'], - 'attachable_type' => ['attachable_type', 'string'], + 'attachable_type' => ['attachable_type', 'convertString'], 'attachable_id' => ['attachable_id', 'integer'], ]; diff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.php index 5ffbca27bf..30210f2898 100644 --- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php +++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php @@ -48,8 +48,8 @@ class Request extends FormRequest // this is the way: $fields = [ 'currency_id' => ['currency_id', 'integer'], - 'currency_code' => ['currency_code', 'string'], - 'amount' => ['amount', 'string'], + 'currency_code' => ['currency_code', 'convertString'], + 'amount' => ['amount', 'convertString'], 'start' => ['start', 'date'], 'end' => ['end', 'date'], ]; diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php index 5a90f9eab3..75f64d9f88 100644 --- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php @@ -49,21 +49,21 @@ class StoreRequest extends FormRequest { Log::debug('Raw fields in Bill StoreRequest', $this->all()); $fields = [ - 'name' => ['name', 'string'], - 'amount_min' => ['amount_min', 'string'], - 'amount_max' => ['amount_max', 'string'], + 'name' => ['name', 'convertString'], + 'amount_min' => ['amount_min', 'convertString'], + 'amount_max' => ['amount_max', 'convertString'], 'currency_id' => ['currency_id', 'integer'], - 'currency_code' => ['currency_code', 'string'], + 'currency_code' => ['currency_code', 'convertString'], 'date' => ['date', 'date'], 'end_date' => ['end_date', 'date'], 'extension_date' => ['extension_date', 'date'], - 'repeat_freq' => ['repeat_freq', 'string'], + 'repeat_freq' => ['repeat_freq', 'convertString'], 'skip' => ['skip', 'integer'], 'active' => ['active', 'boolean'], 'order' => ['order', 'integer'], 'notes' => ['notes', 'stringWithNewlines'], 'object_group_id' => ['object_group_id', 'integer'], - 'object_group_title' => ['object_group_title', 'string'], + 'object_group_title' => ['object_group_title', 'convertString'], ]; return $this->getAllData($fields); diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php index 7ab518c0bf..07c5206b37 100644 --- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php @@ -47,21 +47,21 @@ class UpdateRequest extends FormRequest public function getAll(): array { $fields = [ - 'name' => ['name', 'string'], - 'amount_min' => ['amount_min', 'string'], - 'amount_max' => ['amount_max', 'string'], + 'name' => ['name', 'convertString'], + 'amount_min' => ['amount_min', 'convertString'], + 'amount_max' => ['amount_max', 'convertString'], 'currency_id' => ['currency_id', 'integer'], - 'currency_code' => ['currency_code', 'string'], + 'currency_code' => ['currency_code', 'convertString'], 'date' => ['date', 'date'], 'end_date' => ['end_date', 'date'], 'extension_date' => ['extension_date', 'date'], - 'repeat_freq' => ['repeat_freq', 'string'], + 'repeat_freq' => ['repeat_freq', 'convertString'], 'skip' => ['skip', 'integer'], 'active' => ['active', 'boolean'], 'order' => ['order', 'integer'], 'notes' => ['notes', 'stringWithNewlines'], 'object_group_id' => ['object_group_id', 'integer'], - 'object_group_title' => ['object_group_title', 'string'], + 'object_group_title' => ['object_group_title', 'convertString'], ]; return $this->getAllData($fields); diff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.php index 036b3e3187..75948a1c41 100644 --- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php @@ -47,17 +47,17 @@ class StoreRequest extends FormRequest public function getAll(): array { $fields = [ - 'name' => ['name', 'string'], + 'name' => ['name', 'convertString'], 'active' => ['active', 'boolean'], 'order' => ['active', 'integer'], - 'notes' => ['notes', 'string'], + 'notes' => ['notes', 'convertString'], // auto budget currency: 'currency_id' => ['auto_budget_currency_id', 'integer'], - 'currency_code' => ['auto_budget_currency_code', 'string'], - 'auto_budget_type' => ['auto_budget_type', 'string'], - 'auto_budget_amount' => ['auto_budget_amount', 'string'], - 'auto_budget_period' => ['auto_budget_period', 'string'], + 'currency_code' => ['auto_budget_currency_code', 'convertString'], + 'auto_budget_type' => ['auto_budget_type', 'convertString'], + 'auto_budget_amount' => ['auto_budget_amount', 'convertString'], + 'auto_budget_period' => ['auto_budget_period', 'convertString'], ]; return $this->getAllData($fields); diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php index 44f7004906..1c1c04302e 100644 --- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php @@ -48,15 +48,15 @@ class UpdateRequest extends FormRequest { // this is the way: $fields = [ - 'name' => ['name', 'string'], + 'name' => ['name', 'convertString'], 'active' => ['active', 'boolean'], 'order' => ['order', 'integer'], - 'notes' => ['notes', 'string'], + 'notes' => ['notes', 'convertString'], 'currency_id' => ['auto_budget_currency_id', 'integer'], - 'currency_code' => ['auto_budget_currency_code', 'string'], - 'auto_budget_type' => ['auto_budget_type', 'string'], - 'auto_budget_amount' => ['auto_budget_amount', 'string'], - 'auto_budget_period' => ['auto_budget_period', 'string'], + 'currency_code' => ['auto_budget_currency_code', 'convertString'], + 'auto_budget_type' => ['auto_budget_type', 'convertString'], + 'auto_budget_amount' => ['auto_budget_amount', 'convertString'], + 'auto_budget_period' => ['auto_budget_period', 'convertString'], ]; $allData = $this->getAllData($fields); if (array_key_exists('auto_budget_type', $allData)) { diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php index fc1cec7ea5..bde29867b0 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php @@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest $fields = [ 'start' => ['start', 'date'], 'end' => ['end', 'date'], - 'amount' => ['amount', 'string'], + 'amount' => ['amount', 'convertString'], 'currency_id' => ['currency_id', 'integer'], - 'currency_code' => ['currency_code', 'string'], + 'currency_code' => ['currency_code', 'convertString'], ]; return $this->getAllData($fields); diff --git a/app/Api/V1/Requests/Models/Category/UpdateRequest.php b/app/Api/V1/Requests/Models/Category/UpdateRequest.php index 26b9abf33e..827df56734 100644 --- a/app/Api/V1/Requests/Models/Category/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Category/UpdateRequest.php @@ -44,7 +44,7 @@ class UpdateRequest extends FormRequest public function getAll(): array { $fields = [ - 'name' => ['name', 'string'], + 'name' => ['name', 'convertString'], 'notes' => ['notes', 'stringWithNewlines'], ]; diff --git a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php index 6d3c5c9740..44f1e2d863 100644 --- a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php @@ -43,7 +43,7 @@ class UpdateRequest extends FormRequest public function getUpdateData(): array { $fields = [ - 'title' => ['title', 'string'], + 'title' => ['title', 'convertString'], 'order' => ['order', 'integer'], ]; diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php index e41fc798bf..04b7a87b85 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php @@ -46,15 +46,15 @@ class UpdateRequest extends FormRequest public function getAll(): array { $fields = [ - 'name' => ['name', 'string'], + 'name' => ['name', 'convertString'], 'account_id' => ['account_id', 'integer'], - 'targetamount' => ['target_amount', 'string'], - 'current_amount' => ['current_amount', 'string'], + 'targetamount' => ['target_amount', 'convertString'], + 'current_amount' => ['current_amount', 'convertString'], 'startdate' => ['start_date', 'date'], - 'targetdate' => ['target_date', 'string'], + 'targetdate' => ['target_date', 'convertString'], 'notes' => ['notes', 'stringWithNewlines'], 'order' => ['order', 'integer'], - 'object_group_title' => ['object_group_title', 'string'], + 'object_group_title' => ['object_group_title', 'convertString'], 'object_group_id' => ['object_group_id', 'integer'], ]; diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index 5da9c567bf..f0515f35ac 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -49,9 +49,9 @@ class StoreRequest extends FormRequest public function getAll(): array { $fields = [ - 'type' => ['type', 'string'], - 'title' => ['title', 'string'], - 'description' => ['description', 'string'], + 'type' => ['type', 'convertString'], + 'title' => ['title', 'convertString'], + 'description' => ['description', 'convertString'], 'first_date' => ['first_date', 'date'], 'repeat_until' => ['repeat_until', 'date'], 'nr_of_repetitions' => ['nr_of_repetitions', 'integer'], diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index e008cdad7c..5999b57ce2 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -51,14 +51,14 @@ class UpdateRequest extends FormRequest { // this is the way: $fields = [ - 'title' => ['title', 'string'], - 'description' => ['description', 'string'], + 'title' => ['title', 'convertString'], + 'description' => ['description', 'convertString'], 'first_date' => ['first_date', 'date'], 'repeat_until' => ['repeat_until', 'date'], 'nr_of_repetitions' => ['nr_of_repetitions', 'integer'], 'apply_rules' => ['apply_rules', 'boolean'], 'active' => ['active', 'boolean'], - 'notes' => ['notes', 'string'], + 'notes' => ['notes', 'convertString'], ]; $reps = $this->getRepetitionData(); $transactions = $this->getTransactionData(); diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index ac86fee418..f82b3fa7bb 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -46,12 +46,12 @@ class StoreRequest extends FormRequest public function getAll(): array { $fields = [ - 'title' => ['title', 'string'], - 'description' => ['description', 'string'], + 'title' => ['title', 'convertString'], + 'description' => ['description', 'convertString'], 'rule_group_id' => ['rule_group_id', 'integer'], 'order' => ['order', 'integer'], - 'rule_group_title' => ['rule_group_title', 'string'], - 'trigger' => ['trigger', 'string'], + 'rule_group_title' => ['rule_group_title', 'convertString'], + 'trigger' => ['trigger', 'convertString'], 'strict' => ['strict', 'boolean'], 'stop_processing' => ['stop_processing', 'boolean'], 'active' => ['active', 'boolean'], diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index 6f18a7400c..cad045491e 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -46,10 +46,10 @@ class UpdateRequest extends FormRequest public function getAll(): array { $fields = [ - 'title' => ['title', 'string'], + 'title' => ['title', 'convertString'], 'description' => ['description', 'stringWithNewlines'], 'rule_group_id' => ['rule_group_id', 'integer'], - 'trigger' => ['trigger', 'string'], + 'trigger' => ['trigger', 'convertString'], 'strict' => ['strict', 'boolean'], 'stop_processing' => ['stop_processing', 'boolean'], 'active' => ['active', 'boolean'], diff --git a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php index b6896b891f..330dc52b49 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php @@ -45,7 +45,7 @@ class UpdateRequest extends FormRequest { // This is the way. $fields = [ - 'title' => ['title', 'string'], + 'title' => ['title', 'convertString'], 'description' => ['description', 'stringWithNewlines'], 'active' => ['active', 'boolean'], 'order' => ['order', 'integer'], diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index 9ce9be4676..4fc11e9a32 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest { // This is the way. $fields = [ - 'tag' => ['tag', 'string'], + 'tag' => ['tag', 'convertString'], 'date' => ['date', 'date'], - 'description' => ['description', 'string'], + 'description' => ['description', 'convertString'], ]; $data = $this->getAllData($fields); diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index ad183cca80..80ece22ce8 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -46,9 +46,9 @@ class UpdateRequest extends FormRequest { // return nothing that isn't explicitely in the array: $fields = [ - 'name' => ['name', 'string'], - 'code' => ['code', 'string'], - 'symbol' => ['symbol', 'string'], + 'name' => ['name', 'convertString'], + 'code' => ['code', 'convertString'], + 'symbol' => ['symbol', 'convertString'], 'decimal_places' => ['decimal_places', 'integer'], 'default' => ['default', 'boolean'], 'enabled' => ['enabled', 'boolean'], diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index 5345f7eeb8..242ad7d9e2 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -45,12 +45,12 @@ class CreateRequest extends FormRequest $deliveries = array_flip(config('firefly.webhooks.deliveries')); $fields = [ - 'title' => ['title', 'string'], + 'title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], - 'trigger' => ['trigger', 'string'], - 'response' => ['response', 'string'], - 'delivery' => ['delivery', 'string'], - 'url' => ['url', 'string'], + 'trigger' => ['trigger', 'convertString'], + 'response' => ['response', 'convertString'], + 'delivery' => ['delivery', 'convertString'], + 'url' => ['url', 'convertString'], ]; // this is the way. diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index b5ea3eb5c9..7330cebfe4 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -45,12 +45,12 @@ class UpdateRequest extends FormRequest $deliveries = array_flip(config('firefly.webhooks.deliveries')); $fields = [ - 'title' => ['title', 'string'], + 'title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], - 'trigger' => ['trigger', 'string'], - 'response' => ['response', 'string'], - 'delivery' => ['delivery', 'string'], - 'url' => ['url', 'string'], + 'trigger' => ['trigger', 'convertString'], + 'response' => ['response', 'convertString'], + 'delivery' => ['delivery', 'convertString'], + 'url' => ['url', 'convertString'], ]; // this is the way.