diff --git a/app/Http/Requests/Jobs/UpdateRequest.php b/app/Http/Requests/Jobs/UpdateRequest.php index 86b91f8..67728c4 100644 --- a/app/Http/Requests/Jobs/UpdateRequest.php +++ b/app/Http/Requests/Jobs/UpdateRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Jobs; -use App\Http\Requests\Request; use App\Entities\Projects\Project; +use App\Http\Requests\Request; class UpdateRequest extends Request { @@ -26,12 +26,22 @@ class UpdateRequest extends Request */ public function rules() { - return [ - 'name' => 'required|max:60', - 'price' => 'required|numeric', - 'worker_id' => 'required|numeric', - 'type_id' => 'required|numeric', - 'description' => 'max:255', + $rules = [ + 'name' => 'required|max:60', + 'price' => 'required|numeric', + 'worker_id' => 'required|numeric', + 'type_id' => 'required|numeric', ]; + + //Allow for flexibility instead of optionless hard-coded value for "description". This is + //achieved using environmental variable. + //A value of zero (0) will mean "no limit" + + $char_len_job_description = intval(env("CHAR_LEN_JOB_DESCRIPTION", 255)); + if ($char_len_job_description > 0) { + $rules["description"] = "max:$char_len_job_description"; + } + + return $rules; } } diff --git a/app/Http/Requests/Projects/UpdateRequest.php b/app/Http/Requests/Projects/UpdateRequest.php index dee3281..eee90ac 100644 --- a/app/Http/Requests/Projects/UpdateRequest.php +++ b/app/Http/Requests/Projects/UpdateRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Projects; -use App\Http\Requests\Request; use App\Entities\Projects\Project; +use App\Http\Requests\Request; class UpdateRequest extends Request { @@ -26,9 +26,8 @@ class UpdateRequest extends Request */ public function rules() { - return [ + $rules = [ 'name' => 'required|max:50', - 'description' => 'nullable|max:255', 'proposal_date' => 'nullable|date|date_format:Y-m-d', 'proposal_value' => 'nullable|numeric', 'start_date' => 'nullable|date|date_format:Y-m-d', @@ -38,5 +37,16 @@ class UpdateRequest extends Request 'customer_id' => 'nullable|numeric', 'status_id' => 'required|numeric', ]; + + //Allow for flexibility instead of optionless hard-coded value for "description". This is + //achieved using environmental variable. + //A value of zero (0) will mean "no limit" + + $char_len_project_description = intval(env("CHAR_LEN_PROJECT_DESCRIPTION", 255)); + if ($char_len_project_description > 0) { + $rules["description"] = "max:$char_len_project_description"; + } + + return $rules; } } diff --git a/app/Http/Requests/Tasks/UpdateRequest.php b/app/Http/Requests/Tasks/UpdateRequest.php index a59827b..caca7c3 100644 --- a/app/Http/Requests/Tasks/UpdateRequest.php +++ b/app/Http/Requests/Tasks/UpdateRequest.php @@ -25,11 +25,21 @@ class UpdateRequest extends Request */ public function rules() { - return [ - 'name' => 'required|max:60', - 'description' => 'nullable|max:255', - 'progress' => 'required|numeric|max:100', - 'job_id' => 'required|numeric|exists:jobs,id', + $rules = [ + 'name' => 'required|max:60', + 'progress' => 'required|numeric|max:100', + 'job_id' => 'required|numeric|exists:jobs,id', ]; + + //Allow for flexibility instead of optionless hard-coded value for "description". This is + //achieved using environmental variable. + //A value of zero (0) will mean "no limit" + + $char_len_task_description = intval(env("CHAR_LEN_TASK_DESCRIPTION", 255)); + if ($char_len_task_description > 0) { + $rules["description"] = "max:$char_len_task_description"; + } + + return $rules; } }