adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-17 12:42:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed billable_rate_update_time_entries to real boolean

Browse Source
This commit is contained in:
Constantin Graf
2024-06-24 14:05:26 +02:00
committed by Gregor Vostrak
parent a69d1cb4c4
commit 75e739f6fb
8 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Requests/V1/Member/MemberUpdateRequest.php
View File

@@ -34,8 +34,7 @@ class MemberUpdateRequest extends FormRequest
'min:0', 'min:0',
], ],
'billable_rate_update_time_entries' => [ 'billable_rate_update_time_entries' => [
'string', 'boolean',
'in:true,false',
], ],
]; ];
} }
@@ -50,7 +49,7 @@ class MemberUpdateRequest extends FormRequest
public function getBillableRateUpdateTimeEntries(): bool public function getBillableRateUpdateTimeEntries(): bool
{ {
return $this->has('billable_rate_update_time_entries') && 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 public function getRole(): Role

5
app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php
View File

@@ -32,8 +32,7 @@ class OrganizationUpdateRequest extends FormRequest
'min:0', 'min:0',
], ],
'billable_rate_update_time_entries' => [ 'billable_rate_update_time_entries' => [
'string', 'boolean',
'in:true,false',
], ],
]; ];
} }
@@ -48,6 +47,6 @@ class OrganizationUpdateRequest extends FormRequest
public function getBillableRateUpdateTimeEntries(): bool public function getBillableRateUpdateTimeEntries(): bool
{ {
return $this->has('billable_rate_update_time_entries') && return $this->has('billable_rate_update_time_entries') &&
$this->input('billable_rate_update_time_entries') === 'true'; $this->boolean('billable_rate_update_time_entries');
} }
} }

5
app/Http/Requests/V1/Project/ProjectUpdateRequest.php
View File

@@ -63,8 +63,7 @@ class ProjectUpdateRequest extends FormRequest
'min:0', 'min:0',
], ],
'billable_rate_update_time_entries' => [ 'billable_rate_update_time_entries' => [
'string', 'boolean',
'in:true,false',
], ],
]; ];
} }
@@ -86,6 +85,6 @@ class ProjectUpdateRequest extends FormRequest
public function getBillableRateUpdateTimeEntries(): bool public function getBillableRateUpdateTimeEntries(): bool
{ {
return $this->has('billable_rate_update_time_entries') && return $this->has('billable_rate_update_time_entries') &&
$this->input('billable_rate_update_time_entries') === 'true'; $this->boolean('billable_rate_update_time_entries');
} }
} }

5
app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php
View File

@@ -27,8 +27,7 @@ class ProjectMemberUpdateRequest extends FormRequest
'min:0', 'min:0',
], ],
'billable_rate_update_time_entries' => [ 'billable_rate_update_time_entries' => [
'string', 'boolean',
'in:true,false',
], ],
]; ];
} }
@@ -43,6 +42,6 @@ class ProjectMemberUpdateRequest extends FormRequest
public function getBillableRateUpdateTimeEntries(): bool public function getBillableRateUpdateTimeEntries(): bool
{ {
return $this->has('billable_rate_update_time_entries') && return $this->has('billable_rate_update_time_entries') &&
$this->input('billable_rate_update_time_entries') === 'true'; $this->boolean('billable_rate_update_time_entries');
} }
} }

2
tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php
View File

@@ -124,7 +124,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
// Act // Act
$response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $data->member]), [ $response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $data->member]), [
'billable_rate' => 10001, 'billable_rate' => 10001,
'billable_rate_update_time_entries' => 'true', 'billable_rate_update_time_entries' => true,
]); ]);
// Assert // Assert

2
tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php
View File

@@ -142,7 +142,7 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
$response = $this->withoutExceptionHandling()->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [ $response = $this->withoutExceptionHandling()->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
'name' => $organizationFake->name, 'name' => $organizationFake->name,
'billable_rate' => $organizationFake->billable_rate, 'billable_rate' => $organizationFake->billable_rate,
'billable_rate_update_time_entries' => 'true', 'billable_rate_update_time_entries' => true,
]); ]);
// Assert // Assert

2
tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php
View File

@@ -556,7 +556,7 @@ class ProjectEndpointTest extends ApiEndpointTestAbstract
'color' => $projectFake->color, 'color' => $projectFake->color,
'is_billable' => $projectFake->is_billable, 'is_billable' => $projectFake->is_billable,
'billable_rate' => 10003, 'billable_rate' => 10003,
'billable_rate_update_time_entries' => 'true', 'billable_rate_update_time_entries' => true,
]); ]);
// Assert // Assert

2
tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php
View File

@@ -326,7 +326,7 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
// Act // Act
$response = $this->putJson(route('api.v1.project-members.update', [$data->organization->getKey(), $projectMember->getKey()]), [ $response = $this->putJson(route('api.v1.project-members.update', [$data->organization->getKey(), $projectMember->getKey()]), [
'billable_rate' => $billableRate, 'billable_rate' => $billableRate,
'billable_rate_update_time_entries' => 'true', 'billable_rate_update_time_entries' => true,
]); ]);
// Assert // Assert