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

Add time entry aggregation type “description”

Browse Source
This commit is contained in:
Constantin Graf
2024-09-17 16:25:24 +02:00
committed by Constantin Graf
parent d4e71e7c2c
commit 5e4270e3f5
3 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Enums/TimeEntryAggregationType.php
View File

@@ -15,6 +15,7 @@ enum TimeEntryAggregationType: string
case Task = 'task'; case Task = 'task';
case Client = 'client'; case Client = 'client';
case Billable = 'billable'; case Billable = 'billable';
case Description = 'description';
public function toInterval(): ?TimeEntryAggregationTypeInterval public function toInterval(): ?TimeEntryAggregationTypeInterval
{ {

2
app/Service/TimeEntryAggregationService.php
View File

@@ -270,6 +270,8 @@ class TimeEntryAggregationService
return 'client_id'; return 'client_id';
} elseif ($group === TimeEntryAggregationType::Billable) { } elseif ($group === TimeEntryAggregationType::Billable) {
return 'billable'; return 'billable';
} elseif ($group === TimeEntryAggregationType::Description) {
return 'description';
} }
} }

100
tests/Unit/Service/TimeEntryAggregationServiceTest.php
View File

@@ -53,6 +53,90 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
], $result); ], $result);
} }
public function test_aggregate_time_entries_by_project_and_description(): void
{
// Arrange
$project1 = Project::factory()->create([
// Note: To ensure deterministic order
'id' => '5de4e6df-9560-4675-95be-18d42c441bfc',
]);
$project2 = Project::factory()->create([
// Note: To ensure deterministic order
'id' => '130bdf66-d370-4564-aec7-7171e9b415f7',
]);
TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create([
'description' => 'Test',
]);
TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create([
'description' => '',
]);
TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create([
'description' => 'Test',
]);
TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create([
'description' => 'Test',
]);
$query = TimeEntry::query();
// Act
$result = $this->service->getAggregatedTimeEntries(
$query,
TimeEntryAggregationType::Project,
TimeEntryAggregationType::Description,
'Europe/Vienna',
Weekday::Monday,
false,
Carbon::now()->subDays(2)->utc(),
Carbon::now()->subDay()->utc(),
);
// Assert
$this->assertSame([
'seconds' => 40,
'cost' => 0,
'grouped_type' => 'project',
'grouped_data' => [
[
'key' => $project2->getKey(),
'seconds' => 20,
'cost' => 0,
'grouped_type' => 'description',
'grouped_data' => [
[
'key' => null,
'seconds' => 10,
'cost' => 0,
'grouped_type' => null,
'grouped_data' => null,
],
[
'key' => 'Test',
'seconds' => 10,
'cost' => 0,
'grouped_type' => null,
'grouped_data' => null,
],
],
],
[
'key' => $project1->getKey(),
'seconds' => 20,
'cost' => 0,
'grouped_type' => 'description',
'grouped_data' => [
[
'key' => 'Test',
'seconds' => 20,
'cost' => 0,
'grouped_type' => null,
'grouped_data' => null,
],
],
],
],
], $result);
}
public function test_aggregate_time_entries_empty_state_by_day_and_project_with_filled_gaps(): void public function test_aggregate_time_entries_empty_state_by_day_and_project_with_filled_gaps(): void
{ {
// Arrange // Arrange
@@ -67,7 +151,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
Weekday::Monday, Weekday::Monday,
true, true,
Carbon::now()->subDays(2)->utc(), Carbon::now()->subDays(2)->utc(),
Carbon::now()->subDays(1)->utc(), Carbon::now()->subDay()->utc(),
); );
// Assert // Assert
@@ -84,7 +168,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
'grouped_data' => [], 'grouped_data' => [],
], ],
[ [
'key' => Carbon::now()->subDays(1)->utc()->format('Y-m-d'), 'key' => Carbon::now()->subDay()->utc()->format('Y-m-d'),
'seconds' => 0, 'seconds' => 0,
'cost' => 0, 'cost' => 0,
'grouped_type' => 'project', 'grouped_type' => 'project',
@@ -108,7 +192,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
Weekday::Monday, Weekday::Monday,
true, true,
Carbon::now()->subDays(2), Carbon::now()->subDays(2),
Carbon::now()->subDays(1), Carbon::now()->subDay(),
); );
// Assert // Assert
@@ -134,7 +218,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
Weekday::Monday, Weekday::Monday,
true, true,
Carbon::now()->subDays(2), Carbon::now()->subDays(2),
Carbon::now()->subDays(1), Carbon::now()->subDay(),
); );
// Assert // Assert
@@ -154,10 +238,10 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
$project1 = Project::factory()->forClient($client1)->create(); $project1 = Project::factory()->forClient($client1)->create();
$project2 = Project::factory()->forClient($client2)->create(); $project2 = Project::factory()->forClient($client2)->create();
$project3 = Project::factory()->create(); $project3 = Project::factory()->create();
$timeEntry1 = TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create(); TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project1)->create();
$timeEntry2 = TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create(); TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project2)->create();
$timeEntry3 = TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project3)->create(); TimeEntry::factory()->startWithDuration(now(), 10)->forProject($project3)->create();
$timeEntry4 = TimeEntry::factory()->startWithDuration(now(), 10)->create(); TimeEntry::factory()->startWithDuration(now(), 10)->create();
$query = TimeEntry::query(); $query = TimeEntry::query();
// Act // Act