mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-11 09:42:15 +01:00
Added missing chart data to dashboard endpoint
This commit is contained in:
Constantin Graf
@@ -6,10 +6,13 @@ namespace Tests\Unit\Service;
|
||||
|
||||
use App\Enums\Weekday;
|
||||
use App\Models\Organization;
|
||||
use App\Models\Project;
|
||||
use App\Models\Task;
|
||||
use App\Models\TimeEntry;
|
||||
use App\Models\User;
|
||||
use App\Service\DashboardService;
|
||||
use Carbon\Carbon;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
@@ -251,4 +254,282 @@ class DashboardServiceTest extends TestCase
|
||||
'currency' => $currency,
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_weekly_project_overview_returns_correct_value_if_time_entries_for_projects_exist_in_current_week(): void
|
||||
{
|
||||
// Arrange
|
||||
// Note: Is a Monday
|
||||
$now = CarbonImmutable::create(2024, 1, 1, 12, 0, 0, 'Europe/Vienna');
|
||||
$this->travelTo($now);
|
||||
$user = User::factory()->create([
|
||||
'timezone' => 'Europe/Vienna',
|
||||
'week_start' => Weekday::Sunday,
|
||||
]);
|
||||
$organization = Organization::factory()->withOwner($user)->create();
|
||||
$organization->users()->attach($user, [
|
||||
'role' => 'owner',
|
||||
]);
|
||||
$project1 = Project::factory()->forOrganization($organization)->create();
|
||||
$project2 = Project::factory()->forOrganization($organization)->create();
|
||||
$timeEntry1Project1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project1)->create([
|
||||
// Note: At the start of the week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry2Project1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project1)->create([
|
||||
// Note: At the end of the week
|
||||
'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry1Project2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project2)->create([
|
||||
// Note: At the start of the week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry2Project2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project2)->create([
|
||||
// Note: At the end of the week
|
||||
'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry1WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: At the start of the week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry2WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: At the end of the week
|
||||
'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: Outside of week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->subSecond()->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(39)->utc(),
|
||||
]);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->weeklyProjectOverview($user, $organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
[
|
||||
'value' => 80,
|
||||
'id' => $project1->getKey(),
|
||||
'name' => $project1->name,
|
||||
'color' => $project1->color,
|
||||
],
|
||||
[
|
||||
'value' => 80,
|
||||
'id' => $project2->getKey(),
|
||||
'name' => $project2->name,
|
||||
'color' => $project2->color,
|
||||
],
|
||||
[
|
||||
'value' => 80,
|
||||
'id' => null,
|
||||
'name' => 'No project',
|
||||
'color' => '#cccccc',
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_weekly_project_overview_returns_correct_value_if_only_entries_without_project_exist_in_the_week(): void
|
||||
{
|
||||
// Arrange
|
||||
// Note: Is a Monday
|
||||
$now = CarbonImmutable::create(2024, 1, 1, 12, 0, 0, 'Europe/Vienna');
|
||||
$this->travelTo($now);
|
||||
$organization = Organization::factory()->create();
|
||||
$user = User::factory()->create([
|
||||
'timezone' => 'Europe/Vienna',
|
||||
'week_start' => Weekday::Sunday,
|
||||
]);
|
||||
$user->organizations()->attach($organization);
|
||||
$timeEntry1WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: At the start of the week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry2WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: At the end of the week
|
||||
'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
|
||||
'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
|
||||
]);
|
||||
$timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
// Note: Outside of week
|
||||
'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->subSecond()->utc(),
|
||||
'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(39)->utc(),
|
||||
]);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->weeklyProjectOverview($user, $organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
[
|
||||
'value' => 80,
|
||||
'id' => null,
|
||||
'name' => 'No project',
|
||||
'color' => '#cccccc',
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_weekly_project_overview_returns_correct_value_if_no_entries_are_in_the_week(): void
|
||||
{
|
||||
// Arrange
|
||||
// Note: Is a Monday
|
||||
$this->travelTo(Carbon::create(2024, 1, 1, 12, 0, 0, 'Europe/Vienna'));
|
||||
$organization = Organization::factory()->create();
|
||||
$user = User::factory()->create([
|
||||
'timezone' => 'Europe/Vienna',
|
||||
'week_start' => Weekday::Sunday,
|
||||
]);
|
||||
$user->organizations()->attach($organization);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->weeklyProjectOverview($user, $organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
[
|
||||
'value' => 0,
|
||||
'id' => null,
|
||||
'name' => 'No project',
|
||||
'color' => '#cccccc',
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_latest_team_activity_returns_the_most_current_working_users_and_what_they_are_working_on(): void
|
||||
{
|
||||
// Arrange
|
||||
$organization = Organization::factory()->create();
|
||||
$user1 = User::factory()->create();
|
||||
$user2 = User::factory()->create();
|
||||
$user3 = User::factory()->create();
|
||||
$user4 = User::factory()->create();
|
||||
$user5 = User::factory()->create();
|
||||
$task1 = Task::factory()->forOrganization($organization)->create();
|
||||
$timeEntry1 = TimeEntry::factory()->forUser($user1)->forOrganization($organization)->active()->create([
|
||||
'start' => now()->subMinutes(10),
|
||||
]);
|
||||
$timeEntry2 = TimeEntry::factory()->forUser($user2)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(20),
|
||||
]);
|
||||
$timeEntry3 = TimeEntry::factory()->forUser($user3)->forOrganization($organization)->forTask($task1)->create([
|
||||
'description' => '',
|
||||
'start' => now()->subMinutes(30),
|
||||
]);
|
||||
$timeEntry4 = TimeEntry::factory()->forUser($user4)->forOrganization($organization)->forTask($task1)->create([
|
||||
'description' => 'TEST 123',
|
||||
'start' => now()->subMinutes(40),
|
||||
]);
|
||||
$timeEntry5 = TimeEntry::factory()->forUser($user4)->forOrganization($organization)->forTask($task1)->create([
|
||||
'description' => 'TEST 321',
|
||||
'start' => now()->subMinutes(50),
|
||||
]);
|
||||
$timeEntry6 = TimeEntry::factory()->forUser($user5)->forOrganization($organization)->forTask($task1)->create([
|
||||
'description' => 'TEST 321',
|
||||
'start' => now()->subMinutes(60),
|
||||
]);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->latestTeamActivity($organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
[
|
||||
'user_id' => $user1->getKey(),
|
||||
'name' => $user1->name,
|
||||
'description' => $timeEntry1->description,
|
||||
'time_entry_id' => $timeEntry1->getKey(),
|
||||
'task_id' => null,
|
||||
'status' => true,
|
||||
],
|
||||
[
|
||||
'user_id' => $user2->getKey(),
|
||||
'name' => $user2->name,
|
||||
'description' => $timeEntry2->description,
|
||||
'time_entry_id' => $timeEntry2->getKey(),
|
||||
'task_id' => null,
|
||||
'status' => false,
|
||||
],
|
||||
[
|
||||
'user_id' => $user3->getKey(),
|
||||
'name' => $user3->name,
|
||||
'description' => $timeEntry3->description,
|
||||
'time_entry_id' => $timeEntry3->getKey(),
|
||||
'task_id' => $task1->getKey(),
|
||||
'status' => false,
|
||||
],
|
||||
[
|
||||
'user_id' => $user4->getKey(),
|
||||
'name' => $user4->name,
|
||||
'description' => $timeEntry4->description,
|
||||
'time_entry_id' => $timeEntry4->getKey(),
|
||||
'task_id' => $task1->getKey(),
|
||||
'status' => false,
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_latest_tasks_returns_the_4_tasks_with_the_latest_time_entries(): void
|
||||
{
|
||||
// Arrange
|
||||
$organization = Organization::factory()->create();
|
||||
$user = User::factory()->create();
|
||||
$task1 = Task::factory()->forOrganization($organization)->create();
|
||||
$task2 = Task::factory()->forOrganization($organization)->create();
|
||||
$task3 = Task::factory()->forOrganization($organization)->create();
|
||||
$task4 = Task::factory()->forOrganization($organization)->create();
|
||||
$task5 = Task::factory()->forOrganization($organization)->create();
|
||||
|
||||
$timeEntry1Task1 = TimeEntry::factory()->forTask($task1)->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(20),
|
||||
]);
|
||||
$timeEntry1Task2 = TimeEntry::factory()->forTask($task2)->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(30),
|
||||
]);
|
||||
$timeEntry1Task3 = TimeEntry::factory()->forTask($task3)->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(40),
|
||||
]);
|
||||
$timeEntry1Task4 = TimeEntry::factory()->forTask($task4)->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(50),
|
||||
]);
|
||||
$timeEntry1Task5 = TimeEntry::factory()->forTask($task5)->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now()->subMinutes(60),
|
||||
]);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->latestTasks($user, $organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
[
|
||||
'id' => $timeEntry1Task1->task->getKey(),
|
||||
'name' => $timeEntry1Task1->task->name,
|
||||
'project_name' => $timeEntry1Task1->task->project->name,
|
||||
'project_id' => $timeEntry1Task1->task->project->getKey(),
|
||||
],
|
||||
[
|
||||
'id' => $timeEntry1Task2->task->getKey(),
|
||||
'name' => $timeEntry1Task2->task->name,
|
||||
'project_name' => $timeEntry1Task2->task->project->name,
|
||||
'project_id' => $timeEntry1Task2->task->project->getKey(),
|
||||
],
|
||||
[
|
||||
'id' => $timeEntry1Task3->task->getKey(),
|
||||
'name' => $timeEntry1Task3->task->name,
|
||||
'project_name' => $timeEntry1Task3->task->project->name,
|
||||
'project_id' => $timeEntry1Task3->task->project->getKey(),
|
||||
],
|
||||
[
|
||||
'id' => $timeEntry1Task4->task->getKey(),
|
||||
'name' => $timeEntry1Task4->task->name,
|
||||
'project_name' => $timeEntry1Task4->task->project->name,
|
||||
'project_id' => $timeEntry1Task4->task->project->getKey(),
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user