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

Fix bug in time-entry.update-multiple; Add computed property for client_id

Browse Source
This commit is contained in:
Constantin Graf
2024-10-08 19:15:16 +02:00
committed by Constantin Graf
parent b3b84db004
commit d5a4df738f
4 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
View File

@@ -1883,6 +1883,53 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
$response->assertForbidden();
}
public function test_update_multiple_remove_task_from_time_entries_only_if_project_is_set_to_a_new_value_without_setting_a_new_task(): void
{
// Arrange
$data = $this->createUserWithPermission([
'time-entries:update:own',
]);
$project1 = Project::factory()->forOrganization($data->organization)->create();
$project2 = Project::factory()->forOrganization($data->organization)->create();
$task1 = Task::factory()->forProject($project1)->forOrganization($data->organization)->create();
$task2 = Task::factory()->forProject($project2)->forOrganization($data->organization)->create();
$timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project1)->forTask($task1)->forMember($data->member)->create();
$timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project2)->forTask($task2)->forMember($data->member)->create();
Passport::actingAs($data->user);
// Act
$response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
'ids' => [
$timeEntry1->getKey(),
$timeEntry2->getKey(),
],
'changes' => [
'project_id' => $project2->getKey(),
],
]);
// Assert
$response->assertValid();
$response->assertStatus(200);
$response->assertExactJson([
'success' => [
$timeEntry1->getKey(),
$timeEntry2->getKey(),
],
'error' => [],
]);
$this->assertDatabaseHas(TimeEntry::class, [
'id' => $timeEntry1->getKey(),
'project_id' => $project2->getKey(),
'task_id' => null,
]);
$this->assertDatabaseHas(TimeEntry::class, [
'id' => $timeEntry2->getKey(),
'project_id' => $project2->getKey(),
'task_id' => $task2->getKey(),
]);
}
public function test_update_multiple_updates_own_time_entries_and_fails_for_time_entries_of_other_users_and_and_other_organizations_with_own_time_entries_permission(): void
{
// Arrange
@@ -2096,7 +2143,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
Passport::actingAs($data->user);
// Act
$response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
$response = $this->withoutExceptionHandling()->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
'ids' => [
$ownTimeEntry->getKey(),
$otherTimeEntry->getKey(),

31
tests/Unit/Model/TimeEntryModelTest.php
View File

@@ -148,4 +148,35 @@ class TimeEntryModelTest extends ModelTestAbstract
$this->assertCount(1, $result);
$this->assertTrue($result->first()->is($timeEntry1));
}
public function test_computed_client_id_returns_null_when_no_project_is_assigned(): void
{
// Arrange
$timeEntry = TimeEntry::factory()->forProject(null)->create();
$timeEntry->client_id = null;
$timeEntry->save();
// Act
$timeEntry->setComputedAttributeValue('client_id');
$clientId = $timeEntry->client_id;
// Assert
$this->assertNull($clientId);
}
public function test_computed_client_id_returns_project_client_id(): void
{
// Arrange
$project = Project::factory()->create();
$timeEntry = TimeEntry::factory()->forProject($project)->create();
$timeEntry->client_id = null;
$timeEntry->save();
// Act
$timeEntry->setComputedAttributeValue('client_id');
$clientId = $timeEntry->client_id;
// Assert
$this->assertSame($project->client_id, $clientId);
}
}