diff --git a/app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php b/app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php index 96c1bc3e..107b127f 100644 --- a/app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php +++ b/app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Http\Requests\V1\ApiToken; -use Illuminate\Foundation\Http\FormRequest; +use App\Http\Requests\V1\BaseFormRequest; -class ApiTokenStoreRequest extends FormRequest +class ApiTokenStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/BaseFormRequest.php b/app/Http/Requests/V1/BaseFormRequest.php new file mode 100644 index 00000000..9a02db66 --- /dev/null +++ b/app/Http/Requests/V1/BaseFormRequest.php @@ -0,0 +1,30 @@ + + */ + protected function moneyRules(bool $bigInt = false): array + { + $rules = [ + 'integer', + 'min:0', + ]; + if ($bigInt) { + $rules[] = 'max:9223372036854775807'; + } else { + $rules[] = 'max:2147483647'; + } + + return $rules; + } +} diff --git a/app/Http/Requests/V1/Client/ClientIndexRequest.php b/app/Http/Requests/V1/Client/ClientIndexRequest.php index 0b241c44..3ea63a8b 100644 --- a/app/Http/Requests/V1/Client/ClientIndexRequest.php +++ b/app/Http/Requests/V1/Client/ClientIndexRequest.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Client; +use App\Http\Requests\V1\BaseFormRequest; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; -class ClientIndexRequest extends FormRequest +class ClientIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Client/ClientStoreRequest.php b/app/Http/Requests/V1/Client/ClientStoreRequest.php index f0c760f1..831ff8c9 100644 --- a/app/Http/Requests/V1/Client/ClientStoreRequest.php +++ b/app/Http/Requests/V1/Client/ClientStoreRequest.php @@ -4,17 +4,17 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Client; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding */ -class ClientStoreRequest extends FormRequest +class ClientStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Client/ClientUpdateRequest.php b/app/Http/Requests/V1/Client/ClientUpdateRequest.php index 3951a459..ff178918 100644 --- a/app/Http/Requests/V1/Client/ClientUpdateRequest.php +++ b/app/Http/Requests/V1/Client/ClientUpdateRequest.php @@ -4,18 +4,18 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Client; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding * @property Client|null $client Client from model binding */ -class ClientUpdateRequest extends FormRequest +class ClientUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Import/ImportRequest.php b/app/Http/Requests/V1/Import/ImportRequest.php index 523324b7..319e9880 100644 --- a/app/Http/Requests/V1/Import/ImportRequest.php +++ b/app/Http/Requests/V1/Import/ImportRequest.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Import; +use App\Http\Requests\V1\BaseFormRequest; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; -class ImportRequest extends FormRequest +class ImportRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Invitation/InvitationIndexRequest.php b/app/Http/Requests/V1/Invitation/InvitationIndexRequest.php index 7e4250b9..5c013c4e 100644 --- a/app/Http/Requests/V1/Invitation/InvitationIndexRequest.php +++ b/app/Http/Requests/V1/Invitation/InvitationIndexRequest.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Invitation; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; /** * @property Organization $organization */ -class InvitationIndexRequest extends FormRequest +class InvitationIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php b/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php index 0830cd93..1440c91d 100644 --- a/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php +++ b/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php @@ -5,18 +5,18 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Invitation; use App\Enums\Role; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\OrganizationInvitation; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization */ -class InvitationStoreRequest extends FormRequest +class InvitationStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Member/MemberIndexRequest.php b/app/Http/Requests/V1/Member/MemberIndexRequest.php index 77c4a592..706dc3c7 100644 --- a/app/Http/Requests/V1/Member/MemberIndexRequest.php +++ b/app/Http/Requests/V1/Member/MemberIndexRequest.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Member; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; /** * @property Organization $organization */ -class MemberIndexRequest extends FormRequest +class MemberIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Member/MemberMergeIntoRequest.php b/app/Http/Requests/V1/Member/MemberMergeIntoRequest.php index b341811a..cf63ae28 100644 --- a/app/Http/Requests/V1/Member/MemberMergeIntoRequest.php +++ b/app/Http/Requests/V1/Member/MemberMergeIntoRequest.php @@ -4,17 +4,17 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Member; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Member; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization */ -class MemberMergeIntoRequest extends FormRequest +class MemberMergeIntoRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Member/MemberUpdateRequest.php b/app/Http/Requests/V1/Member/MemberUpdateRequest.php index 52b5c40f..bdfc6c99 100644 --- a/app/Http/Requests/V1/Member/MemberUpdateRequest.php +++ b/app/Http/Requests/V1/Member/MemberUpdateRequest.php @@ -5,15 +5,15 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Member; use App\Enums\Role; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; /** * @property Organization $organization */ -class MemberUpdateRequest extends FormRequest +class MemberUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -27,12 +27,12 @@ class MemberUpdateRequest extends FormRequest 'string', Rule::enum(Role::class), ], - 'billable_rate' => [ - 'nullable', - 'integer', - 'min:0', - 'max:2147483647', - ], + 'billable_rate' => array_merge( + [ + 'nullable', + ], + $this->moneyRules() + ), ]; } diff --git a/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php b/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php index 8031b15c..074c4b80 100644 --- a/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php +++ b/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php @@ -9,14 +9,14 @@ use App\Enums\DateFormat; use App\Enums\IntervalFormat; use App\Enums\NumberFormat; use App\Enums\TimeFormat; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; /** * @property Organization $organization Organization from model binding */ -class OrganizationUpdateRequest extends FormRequest +class OrganizationUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -30,12 +30,12 @@ class OrganizationUpdateRequest extends FormRequest 'string', 'max:255', ], - 'billable_rate' => [ - 'nullable', - 'integer', - 'min:0', - 'max:2147483647', - ], + 'billable_rate' => array_merge( + [ + 'nullable', + ], + $this->moneyRules() + ), 'employees_can_see_billable_rates' => [ 'boolean', ], diff --git a/app/Http/Requests/V1/Project/ProjectIndexRequest.php b/app/Http/Requests/V1/Project/ProjectIndexRequest.php index eba503f5..c8bc31af 100644 --- a/app/Http/Requests/V1/Project/ProjectIndexRequest.php +++ b/app/Http/Requests/V1/Project/ProjectIndexRequest.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Project; +use App\Http\Requests\V1\BaseFormRequest; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; -class ProjectIndexRequest extends FormRequest +class ProjectIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Project/ProjectStoreRequest.php b/app/Http/Requests/V1/Project/ProjectStoreRequest.php index 096900b0..2e9471b7 100644 --- a/app/Http/Requests/V1/Project/ProjectStoreRequest.php +++ b/app/Http/Requests/V1/Project/ProjectStoreRequest.php @@ -4,13 +4,13 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Project; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Organization; use App\Models\Project; use App\Rules\ColorRule; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Str; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; @@ -18,7 +18,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding */ -class ProjectStoreRequest extends FormRequest +class ProjectStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -55,12 +55,12 @@ class ProjectStoreRequest extends FormRequest 'required', 'boolean', ], - 'billable_rate' => [ - 'nullable', - 'integer', - 'min:0', - 'max:2147483647', - ], + 'billable_rate' => array_merge( + [ + 'nullable', + ], + $this->moneyRules() + ), // ID of the client 'client_id' => [ 'present', diff --git a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php index 230640c6..10474461 100644 --- a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php +++ b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php @@ -4,13 +4,13 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Project; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Organization; use App\Models\Project; use App\Rules\ColorRule; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Str; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; @@ -19,7 +19,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; * @property Organization $organization Organization from model binding * @property Project|null $project Project from model binding */ -class ProjectUpdateRequest extends FormRequest +class ProjectUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -68,12 +68,11 @@ class ProjectUpdateRequest extends FormRequest return $builder->whereBelongsTo($this->organization, 'organization'); })->uuid(), ], - 'billable_rate' => [ + 'billable_rate' => array_merge([ 'nullable', - 'integer', - 'min:0', - 'max:2147483647', ], + $this->moneyRules() + ), // Estimated time in seconds 'estimated_time' => [ 'nullable', diff --git a/app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php b/app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php index d76ed1c0..194dc591 100644 --- a/app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php +++ b/app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php @@ -4,17 +4,17 @@ declare(strict_types=1); namespace App\Http\Requests\V1\ProjectMember; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Member; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization Organization from model binding */ -class ProjectMemberStoreRequest extends FormRequest +class ProjectMemberStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -31,12 +31,12 @@ class ProjectMemberStoreRequest extends FormRequest return $builder->whereBelongsTo($this->organization, 'organization'); })->uuid(), ], - 'billable_rate' => [ - 'nullable', - 'integer', - 'min:0', - 'max:2147483647', - ], + 'billable_rate' => array_merge( + [ + 'nullable', + ], + $this->moneyRules() + ), ]; } diff --git a/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php b/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php index 190cfbac..d5479b5d 100644 --- a/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php +++ b/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Http\Requests\V1\ProjectMember; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; /** * @property Organization $organization Organization from model binding */ -class ProjectMemberUpdateRequest extends FormRequest +class ProjectMemberUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. @@ -21,12 +21,12 @@ class ProjectMemberUpdateRequest extends FormRequest public function rules(): array { return [ - 'billable_rate' => [ - 'nullable', - 'integer', - 'min:0', - 'max:2147483647', - ], + 'billable_rate' => array_merge( + [ + 'nullable', + ], + $this->moneyRules() + ), ]; } diff --git a/app/Http/Requests/V1/Report/ReportStoreRequest.php b/app/Http/Requests/V1/Report/ReportStoreRequest.php index 44578618..696af297 100644 --- a/app/Http/Requests/V1/Report/ReportStoreRequest.php +++ b/app/Http/Requests/V1/Report/ReportStoreRequest.php @@ -7,17 +7,17 @@ namespace App\Http\Requests\V1\Report; use App\Enums\TimeEntryAggregationType; use App\Enums\TimeEntryAggregationTypeInterval; use App\Enums\Weekday; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\Rule as LegacyValidationRule; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Carbon; use Illuminate\Validation\Rule; /** * @property Organization $organization Organization from model binding */ -class ReportStoreRequest extends FormRequest +class ReportStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Report/ReportUpdateRequest.php b/app/Http/Requests/V1/Report/ReportUpdateRequest.php index b7b486c6..0b664a82 100644 --- a/app/Http/Requests/V1/Report/ReportUpdateRequest.php +++ b/app/Http/Requests/V1/Report/ReportUpdateRequest.php @@ -4,15 +4,15 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Report; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Carbon; /** * @property Organization $organization Organization from model binding */ -class ReportUpdateRequest extends FormRequest +class ReportUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Tag/TagStoreRequest.php b/app/Http/Requests/V1/Tag/TagStoreRequest.php index ddb6112e..ee8b4e69 100644 --- a/app/Http/Requests/V1/Tag/TagStoreRequest.php +++ b/app/Http/Requests/V1/Tag/TagStoreRequest.php @@ -4,17 +4,17 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Tag; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\Tag; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding */ -class TagStoreRequest extends FormRequest +class TagStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Tag/TagUpdateRequest.php b/app/Http/Requests/V1/Tag/TagUpdateRequest.php index 7e7f8673..8d7f4669 100644 --- a/app/Http/Requests/V1/Tag/TagUpdateRequest.php +++ b/app/Http/Requests/V1/Tag/TagUpdateRequest.php @@ -4,18 +4,18 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Tag; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\Tag; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding * @property Tag|null $tag Tag from model binding */ -class TagUpdateRequest extends FormRequest +class TagUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Task/TaskIndexRequest.php b/app/Http/Requests/V1/Task/TaskIndexRequest.php index a69ef116..6fd80307 100644 --- a/app/Http/Requests/V1/Task/TaskIndexRequest.php +++ b/app/Http/Requests/V1/Task/TaskIndexRequest.php @@ -4,19 +4,19 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Task; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\Project; use App\Service\PermissionStore; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Auth; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization Organization from model binding */ -class TaskIndexRequest extends FormRequest +class TaskIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Task/TaskStoreRequest.php b/app/Http/Requests/V1/Task/TaskStoreRequest.php index 6fa4c96f..4c3506d1 100644 --- a/app/Http/Requests/V1/Task/TaskStoreRequest.php +++ b/app/Http/Requests/V1/Task/TaskStoreRequest.php @@ -4,19 +4,19 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Task; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\Project; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding */ -class TaskStoreRequest extends FormRequest +class TaskStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/Task/TaskUpdateRequest.php b/app/Http/Requests/V1/Task/TaskUpdateRequest.php index 4eb90ace..f78778e8 100644 --- a/app/Http/Requests/V1/Task/TaskUpdateRequest.php +++ b/app/Http/Requests/V1/Task/TaskUpdateRequest.php @@ -4,18 +4,18 @@ declare(strict_types=1); namespace App\Http\Requests\V1\Task; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; /** * @property Organization $organization Organization from model binding * @property Task|null $task Task from model binding */ -class TaskUpdateRequest extends FormRequest +class TaskUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php index 63e2b1ba..7c33242b 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php @@ -7,6 +7,7 @@ namespace App\Http\Requests\V1\TimeEntry; use App\Enums\ExportFormat; use App\Enums\TimeEntryAggregationType; use App\Enums\TimeEntryAggregationTypeInterval; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Member; use App\Models\Organization; @@ -16,7 +17,6 @@ use App\Models\Task; use App\Models\User; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Carbon; use Illuminate\Validation\Rule; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; @@ -24,7 +24,7 @@ use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization */ -class TimeEntryAggregateExportRequest extends FormRequest +class TimeEntryAggregateExportRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php index 15e51639..45db56cb 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; use App\Enums\TimeEntryAggregationType; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Member; use App\Models\Organization; @@ -14,7 +15,6 @@ use App\Models\Task; use App\Models\User; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Carbon; use Illuminate\Validation\Rule; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; @@ -22,7 +22,7 @@ use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization */ -class TimeEntryAggregateRequest extends FormRequest +class TimeEntryAggregateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php index 40c4ab3c..2b21ee8a 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Organization; use Illuminate\Contracts\Validation\ValidationRule; -use Illuminate\Foundation\Http\FormRequest; /** * @property Organization $organization Organization from model binding */ -class TimeEntryDestroyMultipleRequest extends FormRequest +class TimeEntryDestroyMultipleRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php index 55052296..19203cbb 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Client; use App\Models\Member; use App\Models\Organization; @@ -12,13 +13,12 @@ use App\Models\Tag; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization */ -class TimeEntryIndexRequest extends FormRequest +class TimeEntryIndexRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php index cd18130d..4e0cd0d2 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Member; use App\Models\Organization; use App\Models\Project; @@ -11,13 +12,12 @@ use App\Models\Tag; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization Organization from model binding */ -class TimeEntryStoreRequest extends FormRequest +class TimeEntryStoreRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php index 06b824a8..353577aa 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Member; use App\Models\Organization; use App\Models\Project; @@ -11,13 +12,12 @@ use App\Models\Tag; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization Organization from model binding */ -class TimeEntryUpdateMultipleRequest extends FormRequest +class TimeEntryUpdateMultipleRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php index 37b3b420..ee9347f0 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Requests\V1\TimeEntry; +use App\Http\Requests\V1\BaseFormRequest; use App\Models\Member; use App\Models\Organization; use App\Models\Project; @@ -11,13 +12,12 @@ use App\Models\Tag; use App\Models\Task; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; /** * @property Organization $organization Organization from model binding */ -class TimeEntryUpdateRequest extends FormRequest +class TimeEntryUpdateRequest extends BaseFormRequest { /** * Get the validation rules that apply to the request.