adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-10-14 16:53:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for billable rate restriction in importers and API edge cases

Browse Source
This commit is contained in:
Constantin Graf
2026-10-14 13:29:32 +02:00
committed by Gregor Vostrak
parent 902270a189
commit c69edc81be
11 changed files with 287 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1186,4 +1186,25 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
$this->assertSame(10000, $timeEntry->refresh()->billable_rate);
}
public function test_member_update_does_not_remove_billable_rate_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$data = $this->createUserWithPermission([
'members:update',
]);
$member = Member::factory()->forOrganization($data->organization)->forUser(User::factory()->create())->role(Role::Employee)->create([
'billable_rate' => 10000,
]);
$this->actAsOrganizationWithoutBillableRates();
Passport::actingAs($data->user);
// Act
$response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $member->getKey()]), [
'billable_rate' => null,
]);
// Assert
$response->assertOk();
$this->assertSame(10000, $member->refresh()->billable_rate);
}
}

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

@@ -6253,6 +6253,73 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
$this->assertSame('Mass update', $nonBillableTimeEntry->description);
}
public function test_time_entry_update_multiple_can_remove_billable_flag_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$data = $this->createUserWithPermission([
'time-entries:update:own',
]);
$timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->billable()->create();
$this->actAsOrganizationWithoutBillableRates();
Passport::actingAs($data->user);
// Act
$response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
'ids' => [$timeEntry->getKey()],
'changes' => [
'billable' => false,
],
]);
// Assert
$response->assertOk();
$response->assertExactJson([
'success' => [$timeEntry->getKey()],
'error' => [],
]);
$timeEntry->refresh();
$this->assertFalse($timeEntry->billable);
$this->assertNull($timeEntry->billable_rate);
}
public function test_time_entry_update_with_project_change_does_not_make_time_entry_billable_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$data = $this->createUserWithPermission([
'time-entries:update:own',
]);
$project = Project::factory()->forOrganization($data->organization)->isPublic()->billable(10000)->create();
$otherProject = Project::factory()->forOrganization($data->organization)->isPublic()->billable(20000)->create();
$billableTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->billable()
->startWithDuration(Carbon::now()->subHours(5), 3600)->create();
$nonBillableTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->notBillable()
->startWithDuration(Carbon::now()->subHours(3), 3600)->create();
$this->actAsOrganizationWithoutBillableRates();
Passport::actingAs($data->user);
// Act
$responseBillable = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $billableTimeEntry->getKey()]), [
'project_id' => $otherProject->getKey(),
'billable' => true,
]);
$responseNonBillable = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $nonBillableTimeEntry->getKey()]), [
'project_id' => $otherProject->getKey(),
'billable' => true,
]);
// Assert
$responseBillable->assertOk();
$responseNonBillable->assertOk();
$billableTimeEntry->refresh();
$this->assertSame($otherProject->getKey(), $billableTimeEntry->project_id);
$this->assertTrue($billableTimeEntry->billable);
$this->assertSame(20000, $billableTimeEntry->billable_rate);
$nonBillableTimeEntry->refresh();
$this->assertSame($otherProject->getKey(), $nonBillableTimeEntry->project_id);
$this->assertFalse($nonBillableTimeEntry->billable);
$this->assertNull($nonBillableTimeEntry->billable_rate);
}
public function test_time_entry_store_does_not_check_billable_rates_for_non_billable_time_entry(): void
{
// Arrange

22
tests/Unit/Service/Import/Importers/ClockifyProjectsImporterTest.php
View File

@@ -157,4 +157,26 @@ class ClockifyProjectsImporterTest extends ImporterTestAbstract
Task::query()->where('project_id', $project->id)->pluck('name')->all(),
);
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new ClockifyProjectsImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('clockify_projects_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$projects = Project::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $projects);
foreach ($projects as $project) {
$this->assertFalse($project->is_billable);
$this->assertNull($project->billable_rate);
}
}
}

22
tests/Unit/Service/Import/Importers/ClockifyTimeEntriesImporterTest.php
View File

@@ -256,4 +256,26 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
}
$this->fail();
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new ClockifyTimeEntriesImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $timeEntries);
foreach ($timeEntries as $timeEntry) {
$this->assertFalse($timeEntry->billable);
$this->assertNull($timeEntry->billable_rate);
}
}
}

22
tests/Unit/Service/Import/Importers/GenericProjectsImporterTest.php
View File

@@ -82,4 +82,26 @@ class GenericProjectsImporterTest extends ImporterTestAbstract
$this->assertSame(3, $report->projectsCreated);
$this->assertSame(2, $report->clientsCreated);
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new GenericProjectsImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('generic_projects_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$projects = Project::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(3, $projects);
foreach ($projects as $project) {
$this->assertFalse($project->is_billable);
$this->assertNull($project->billable_rate);
}
}
}

22
tests/Unit/Service/Import/Importers/GenericTimeEntriesImporterTest.php
View File

@@ -113,4 +113,26 @@ class GenericTimeEntriesImporterTest extends ImporterTestAbstract
}
$this->fail();
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new GenericTimeEntriesImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('generic_time_entries_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $timeEntries);
foreach ($timeEntries as $timeEntry) {
$this->assertFalse($timeEntry->billable);
$this->assertNull($timeEntry->billable_rate);
}
}
}

22
tests/Unit/Service/Import/Importers/HarvestProjectsImporterTest.php
View File

@@ -56,4 +56,26 @@ class HarvestProjectsImporterTest extends ImporterTestAbstract
$this->assertSame(null, $project2->estimated_time);
$this->assertSame(false, $project2->is_billable);
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new HarvestProjectsImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('harvest_projects_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$projects = Project::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $projects);
foreach ($projects as $project) {
$this->assertFalse($project->is_billable);
$this->assertNull($project->billable_rate);
}
}
}

28
tests/Unit/Service/Import/Importers/HarvestTimeEntriesImporterTest.php
View File

@@ -128,4 +128,32 @@ class HarvestTimeEntriesImporterTest extends ImporterTestAbstract
}
$this->fail();
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new HarvestTimeEntriesImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('harvest_time_entries_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $timeEntries);
foreach ($timeEntries as $timeEntry) {
$this->assertFalse($timeEntry->billable);
$this->assertNull($timeEntry->billable_rate);
}
$projects = Project::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $projects);
foreach ($projects as $project) {
$this->assertFalse($project->is_billable);
$this->assertNull($project->billable_rate);
}
}
}

11
tests/Unit/Service/Import/Importers/SolidtimeImporterTest.php
View File

@@ -7,6 +7,7 @@ namespace Tests\Unit\Service\Import\Importers;
use App\Enums\TimeEntryType;
use App\Jobs\RecalculateSpentTimeForProject;
use App\Jobs\RecalculateSpentTimeForTask;
use App\Models\Member;
use App\Models\Organization;
use App\Models\Project;
use App\Models\ProjectMember;
@@ -111,6 +112,13 @@ class SolidtimeImporterTest extends ImporterTestAbstract
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$zipPath = $this->createTestZip('solidtime_import_test_1');
// Note: The member of the test file has no billable rate, so one is added to the zip
$zip = new ZipArchive;
$zip->open($zipPath);
$members = str_replace(',ee5a8cd6-312f-4ae6-b044-e2014f09ecc2,,admin,', ',ee5a8cd6-312f-4ae6-b044-e2014f09ecc2,10003,admin,', $zip->getFromName('members.csv'), $replacements);
$this->assertSame(1, $replacements);
$zip->addFromString('members.csv', $members);
$zip->close();
$timezone = 'Europe/Vienna';
$organization = Organization::factory()->create();
$importer = new SolidtimeImporter;
@@ -127,6 +135,9 @@ class SolidtimeImporterTest extends ImporterTestAbstract
// Assert
$this->assertSame(3, Project::query()->whereBelongsTo($organization, 'organization')->whereNull('billable_rate')->where('is_billable', '=', false)->count());
$this->assertSame(1, ProjectMember::query()->whereBelongsToOrganization($organization)->whereNull('billable_rate')->count());
$members = Member::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(1, $members);
$this->assertNull($members->first()->billable_rate);
$timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $timeEntries);
foreach ($timeEntries as $timeEntry) {

28
tests/Unit/Service/Import/Importers/TogglDataImporterTest.php
View File

@@ -5,6 +5,8 @@ declare(strict_types=1);
namespace Tests\Unit\Service\Import\Importers;
use App\Models\Organization;
use App\Models\Project;
use App\Models\ProjectMember;
use App\Models\User;
use App\Service\Import\Importers\DefaultImporter;
use App\Service\Import\Importers\ImportException;
@@ -216,4 +218,30 @@ class TogglDataImporterTest extends ImporterTestAbstract
$this->assertSame('UTC', $user->timezone);
$this->assertTrue($user->is_placeholder);
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$zipPath = $this->createTestZip('toggl_data_import_test_1');
$timezone = 'Europe/Vienna';
$organization = Organization::factory()->create();
$importer = new TogglDataImporter;
$importer->init($organization);
$data = file_get_contents($zipPath);
// Act
$importer->importData($data, $timezone);
// Assert
$projects = Project::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(3, $projects);
foreach ($projects as $project) {
$this->assertFalse($project->is_billable);
$this->assertNull($project->billable_rate);
}
$projectMembers = ProjectMember::query()->whereBelongsToOrganization($organization)->get();
$this->assertCount(1, $projectMembers);
$this->assertNull($projectMembers->first()->billable_rate);
}
}

22
tests/Unit/Service/Import/Importers/TogglTimeEntriesImporterTest.php
View File

@@ -143,4 +143,26 @@ class TogglTimeEntriesImporterTest extends ImporterTestAbstract
}
$this->fail();
}
public function test_import_drops_billable_flags_and_rates_if_organization_can_not_use_billable_rates(): void
{
// Arrange
$this->actAsOrganizationWithoutBillableRates();
$organization = Organization::factory()->create();
$timezone = 'Europe/Vienna';
$importer = new TogglTimeEntriesImporter;
$importer->init($organization);
$data = Storage::disk('testfiles')->get('toggl_time_entries_import_test_1.csv');
// Act
$importer->importData($data, $timezone);
// Assert
$timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
$this->assertCount(2, $timeEntries);
foreach ($timeEntries as $timeEntry) {
$this->assertFalse($timeEntry->billable);
$this->assertNull($timeEntry->billable_rate);
}
}
}