From 75e739f6fb61c1f45ff8280cc08c1ba63e360b93 Mon Sep 17 00:00:00 2001 From: Constantin Graf Date: Mon, 24 Jun 2024 14:05:26 +0200 Subject: [PATCH] Changed billable_rate_update_time_entries to real boolean --- app/Http/Requests/V1/Member/MemberUpdateRequest.php | 5 ++--- .../Requests/V1/Organization/OrganizationUpdateRequest.php | 5 ++--- app/Http/Requests/V1/Project/ProjectUpdateRequest.php | 5 ++--- .../Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php | 5 ++--- tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php | 2 +- tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php | 2 +- tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php | 2 +- tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php | 2 +- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/Http/Requests/V1/Member/MemberUpdateRequest.php b/app/Http/Requests/V1/Member/MemberUpdateRequest.php index e7defb67..4d2179ce 100644 --- a/app/Http/Requests/V1/Member/MemberUpdateRequest.php +++ b/app/Http/Requests/V1/Member/MemberUpdateRequest.php @@ -34,8 +34,7 @@ class MemberUpdateRequest extends FormRequest 'min:0', ], 'billable_rate_update_time_entries' => [ - 'string', - 'in:true,false', + 'boolean', ], ]; } @@ -50,7 +49,7 @@ class MemberUpdateRequest extends FormRequest public function getBillableRateUpdateTimeEntries(): bool { return $this->has('billable_rate_update_time_entries') && - $this->input('billable_rate_update_time_entries') === 'true'; + $this->boolean('billable_rate_update_time_entries'); } public function getRole(): Role diff --git a/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php b/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php index 1915d527..466b57dd 100644 --- a/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php +++ b/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php @@ -32,8 +32,7 @@ class OrganizationUpdateRequest extends FormRequest 'min:0', ], 'billable_rate_update_time_entries' => [ - 'string', - 'in:true,false', + 'boolean', ], ]; } @@ -48,6 +47,6 @@ class OrganizationUpdateRequest extends FormRequest public function getBillableRateUpdateTimeEntries(): bool { return $this->has('billable_rate_update_time_entries') && - $this->input('billable_rate_update_time_entries') === 'true'; + $this->boolean('billable_rate_update_time_entries'); } } diff --git a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php index ed163c92..74ad58f6 100644 --- a/app/Http/Requests/V1/Project/ProjectUpdateRequest.php +++ b/app/Http/Requests/V1/Project/ProjectUpdateRequest.php @@ -63,8 +63,7 @@ class ProjectUpdateRequest extends FormRequest 'min:0', ], 'billable_rate_update_time_entries' => [ - 'string', - 'in:true,false', + 'boolean', ], ]; } @@ -86,6 +85,6 @@ class ProjectUpdateRequest extends FormRequest public function getBillableRateUpdateTimeEntries(): bool { return $this->has('billable_rate_update_time_entries') && - $this->input('billable_rate_update_time_entries') === 'true'; + $this->boolean('billable_rate_update_time_entries'); } } diff --git a/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php b/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php index 05542449..8c281728 100644 --- a/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php +++ b/app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php @@ -27,8 +27,7 @@ class ProjectMemberUpdateRequest extends FormRequest 'min:0', ], 'billable_rate_update_time_entries' => [ - 'string', - 'in:true,false', + 'boolean', ], ]; } @@ -43,6 +42,6 @@ class ProjectMemberUpdateRequest extends FormRequest public function getBillableRateUpdateTimeEntries(): bool { return $this->has('billable_rate_update_time_entries') && - $this->input('billable_rate_update_time_entries') === 'true'; + $this->boolean('billable_rate_update_time_entries'); } } diff --git a/tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php b/tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php index 071ed79d..0f70b706 100644 --- a/tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php @@ -124,7 +124,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract // Act $response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $data->member]), [ 'billable_rate' => 10001, - 'billable_rate_update_time_entries' => 'true', + 'billable_rate_update_time_entries' => true, ]); // Assert diff --git a/tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php b/tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php index ad40ac2b..c01cd7b7 100644 --- a/tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php @@ -142,7 +142,7 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract $response = $this->withoutExceptionHandling()->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [ 'name' => $organizationFake->name, 'billable_rate' => $organizationFake->billable_rate, - 'billable_rate_update_time_entries' => 'true', + 'billable_rate_update_time_entries' => true, ]); // Assert diff --git a/tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php index f9a5898b..c5258802 100644 --- a/tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php @@ -556,7 +556,7 @@ class ProjectEndpointTest extends ApiEndpointTestAbstract 'color' => $projectFake->color, 'is_billable' => $projectFake->is_billable, 'billable_rate' => 10003, - 'billable_rate_update_time_entries' => 'true', + 'billable_rate_update_time_entries' => true, ]); // Assert diff --git a/tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php b/tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php index 4cc46516..bb9153ef 100644 --- a/tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php @@ -326,7 +326,7 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract // Act $response = $this->putJson(route('api.v1.project-members.update', [$data->organization->getKey(), $projectMember->getKey()]), [ 'billable_rate' => $billableRate, - 'billable_rate_update_time_entries' => 'true', + 'billable_rate_update_time_entries' => true, ]); // Assert