geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

- Form Request array syntax: Convert pipe (|) delimited validation rules from strings into an array of validation rules while using Laravel Rule objects where available

Browse source 
- Streamline order methods: Streamline query builder orderBy calls with asc and desc arguments.
- delete some old Request-Clases
This commit is contained in:
Arno Kaimbacher 2022-08-12 06:52:06 +00:00
parent 6156bdf0c6
commit 50ceeb193b
18 changed files with 143 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Requests/Collection/CollectionRequest.php
View file

@ -27,8 +27,13 @@ class CollectionRequest extends Request
public function rules()
{
return [
'name' => 'required|max:255',
'role_id' => 'required',
'name' => [
'required',
'max:255',
],
'role_id' => [
'required',
],
];
}
}

9
app/Http/Requests/DocumentRequest.php
View file

@ -24,8 +24,13 @@ class DocumentRequest extends Request
public function rules()
{
return [
'type' => 'required|min:3',
'server_state' => 'required',
'type' => [
'required',
'min:3',
],
'server_state' => [
'required',
],
// 'author' => 'required|min:4',
// 'stock' => 'required|integer',
// 'year' => 'required|integer|min:4'

43
app/Http/Requests/LicenseRequest.php
View file

@ -24,15 +24,40 @@ class LicenseRequest extends Request
public function rules()
{
return [
'desc_text' => 'max:4000',
'language' => 'max:3',
'link_licence' => 'required|url:max:255',
'link_logo' => 'url|max:255',
'mime_type' => 'max:30',
'name_long' => 'required|min:5|max:255',
'sort_order' => 'required|integer',
'active' => 'required|boolean',
'pod_allowed' => 'required|boolean'
'desc_text' => [
'max:4000',
],
'language' => [
'max:3',
],
'link_licence' => [
'required',
'url:max:255',
],
'link_logo' => [
'url',
'max:255',
],
'mime_type' => [
'max:30',
],
'name_long' => [
'required',
'min:5',
'max:255',
],
'sort_order' => [
'required',
'integer',
],
'active' => [
'required',
'boolean',
],
'pod_allowed' => [
'required',
'boolean',
],
];
}
}

5
app/Http/Requests/Pages/UpdatePageRequest.php
View file

@ -28,7 +28,10 @@ class UpdatePageRequest extends Request
public function rules()
{
return [
'en_title' => 'required|max:191'
'en_title' => [
'required',
'max:191',
],
// 'description_en' => 'required'
];
}

30
app/Http/Requests/PeminjamanRequest.php
View file

@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests;
use App\Http\Requests\Request;
class PeminjamanRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
//
];
}
}

29
app/Http/Requests/PeriodeRequest.php
View file

@ -1,29 +0,0 @@
<?php
namespace App\Http\Requests;
use App\Http\Requests\Request;
class PeriodeRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'days' => 'required|integer'
];
}
}

42
app/Http/Requests/Person/CreatePersonRequest.php
View file

@ -24,17 +24,45 @@ class CreatePersonRequest extends Request
public function rules()
{
return [
'academic_title' => 'nullable|min:2|max:255',
'last_name' => 'required|min:3|max:255|unique_with:persons,first_name,date_of_birth',
'first_name' => 'required|min:3|max:255',
'email' => 'required|email|max:50|unique:persons,email',
'academic_title' => [
'nullable',
'min:2',
'max:255',
],
'last_name' => [
'required',
'min:3',
'max:255',
'unique_with:persons,first_name,date_of_birth',
],
'first_name' => [
'required',
'min:3',
'max:255',
],
'email' => [
'required',
'email',
'max:50',
'unique:persons,email',
],
// 'email' => [
// 'required', 'email', 'max:100',
// Rule::unique('persons')->ignore($user->id),
// ],
'identifier_orcid' => 'nullable|min:19|max:50',
'status' => 'required|boolean',
'date_of_birth' => 'nullable|date'
'identifier_orcid' => [
'nullable',
'min:19',
'max:50',
],
'status' => [
'required',
'boolean',
],
'date_of_birth' => [
'nullable',
'date',
],
];
}
}

42
app/Http/Requests/Person/EditPersonRequest.php
View file

@ -26,17 +26,45 @@ class EditPersonRequest extends Request
public function rules()
{
return [
'academic_title' => 'nullable|min:2|max:255',
'last_name' => 'required|min:3|max:255|unique_with:persons,first_name,date_of_birth',
'first_name' => 'required|min:3|max:255',
'email' => 'required|email|max:50|unique:persons,email',
'academic_title' => [
'nullable',
'min:2',
'max:255',
],
'last_name' => [
'required',
'min:3',
'max:255',
'unique_with:persons,first_name,date_of_birth',
],
'first_name' => [
'required',
'min:3',
'max:255',
],
'email' => [
'required',
'email',
'max:50',
'unique:persons,email',
],
// 'email' => [
// 'required', 'email', 'max:100',
// Rule::unique('persons')->ignore($user->id),
// ],
'identifier_orcid' => 'nullable|min:19|max:50',
'status' => 'required|boolean',
'date_of_birth' => 'nullable|date'
'identifier_orcid' => [
'nullable',
'min:19',
'max:50',
],
'status' => [
'required',
'boolean',
],
'date_of_birth' => [
'nullable',
'date',
],
];
}
}

16
app/Http/Requests/ProjectRequest.php
View file

@ -24,9 +24,19 @@ class ProjectRequest extends Request
{
return [
'name' => 'required|min:3|max:255',
'label' => 'required|min:3|max:20',
'description' => 'required'
'name' => [
'required',
'min:3',
'max:255',
],
'label' => [
'required',
'min:3',
'max:20',
],
'description' => [
'required',
],
];
}
}

30
app/Http/Requests/ShelfRequest.php
View file

@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests;
use App\Http\Requests\Request;
class ShelfRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'shelf' => 'required'
];
}
}