mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-08 08:12:17 +01:00
Added dashboard chart lastSevenDays
This commit is contained in:
Constantin Graf
committed by
Constantin Graf
Constantin Graf
parent
4400741391
commit
1ee3a3072a
@@ -40,6 +40,35 @@ class DashboardService
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{start: string, end: string, dates: array<string, array<string>>}
|
||||
*/
|
||||
private function lastDaysSplitInWindows(int $days, CarbonTimeZone $timeZone, int $windows): array
|
||||
{
|
||||
$result = [];
|
||||
$windowSize = 24 / $windows;
|
||||
$date = Carbon::now($timeZone)->startOfDay();
|
||||
$end = $date->copy()->endOfDay()->utc()->toDateTimeString();
|
||||
$start = $end;
|
||||
for ($i = 0; $i < $days; $i++) {
|
||||
$tempDate = $date->copy();
|
||||
$start = $tempDate->utc()->toDateTimeString();
|
||||
$tempWindows = [];
|
||||
for ($j = 0; $j < $windows; $j++) {
|
||||
$tempWindow = $tempDate->addHours($windowSize)->utc()->toDateTimeString();
|
||||
$tempWindows[] = $tempWindow;
|
||||
}
|
||||
$result[$date->format('Y-m-d')] = $tempWindows;
|
||||
$date->subDay();
|
||||
}
|
||||
|
||||
return [
|
||||
'start' => $start,
|
||||
'end' => $end,
|
||||
'dates' => $result,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, string>
|
||||
*/
|
||||
@@ -385,114 +414,45 @@ class DashboardService
|
||||
*/
|
||||
public function lastSevenDays(User $user, Organization $organization): array
|
||||
{
|
||||
return [
|
||||
[
|
||||
'date' => '2024-02-26',
|
||||
'duration' => 3600, // in seconds
|
||||
// if that is too difficult we can just skip that for now
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-25',
|
||||
'duration' => 7200, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-24',
|
||||
'duration' => 10800, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-23',
|
||||
'duration' => 14400, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-22',
|
||||
'duration' => 18000, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-21',
|
||||
'duration' => 21600, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
[
|
||||
'date' => '2024-02-20',
|
||||
'duration' => 25200, // in seconds
|
||||
'history' => [
|
||||
// duration in s of the 3h windows for the day starting at 00:00
|
||||
300,
|
||||
0,
|
||||
500,
|
||||
0,
|
||||
100,
|
||||
200,
|
||||
100,
|
||||
300,
|
||||
],
|
||||
],
|
||||
$timezone = $this->timezoneService->getTimezoneFromUser($user);
|
||||
$lastDaysSplitInWindows = $this->lastDaysSplitInWindows(7, $timezone, 8);
|
||||
$data = collect(DB::select('
|
||||
SELECT time_ranges.start, EXTRACT(epoch FROM sum(LEAST(time_ranges."end", coalesce(time_entries."end", :now::timestamp)) - GREATEST(time_ranges.start, time_entries.start))) AS aggregate
|
||||
FROM (
|
||||
SELECT time_range_starts.start AS start, time_range_starts.start + interval \'3 hours\' AS "end"
|
||||
FROM generate_series(:start_time_ranges::timestamp, :end_time_ranges::timestamp, interval \'3 hours\') as time_range_starts (start)
|
||||
) time_ranges
|
||||
JOIN time_entries ON time_entries.start < time_ranges."end"
|
||||
AND coalesce(time_entries."end", :now::timestamp) > time_ranges.start
|
||||
where time_entries.user_id = :user_id and
|
||||
time_entries.organization_id = :organization_id
|
||||
GROUP BY time_ranges.start
|
||||
ORDER BY time_ranges.start
|
||||
', [
|
||||
'start_time_ranges' => $lastDaysSplitInWindows['start'],
|
||||
'end_time_ranges' => $lastDaysSplitInWindows['end'],
|
||||
'user_id' => $user->getKey(),
|
||||
'organization_id' => $organization->getKey(),
|
||||
'now' => Carbon::now()->toDateTimeString(),
|
||||
]))->pluck('aggregate', 'start');
|
||||
|
||||
];
|
||||
$response = [];
|
||||
|
||||
foreach ($lastDaysSplitInWindows['dates'] as $date => $windows) {
|
||||
$history = [];
|
||||
$duration = 0;
|
||||
foreach ($windows as $window) {
|
||||
$value = (int) ($data->get($window, null) ?? 0);
|
||||
$history[] = $value;
|
||||
$duration += $value;
|
||||
}
|
||||
$response[] = [
|
||||
'date' => $date,
|
||||
'duration' => $duration,
|
||||
'history' => $history,
|
||||
];
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -532,4 +532,132 @@ class DashboardServiceTest extends TestCase
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
|
||||
public function test_last_seven_days_returns_spend_time_in_the_last_seven_days_aggregated_in_three_hour_blocks(): void
|
||||
{
|
||||
// Arrange
|
||||
$now = Carbon::create(2024, 4, 17, 12, 0, 0, 'Europe/Vienna');
|
||||
$this->travelTo($now);
|
||||
$organization = Organization::factory()->create();
|
||||
$user = User::factory()->create([
|
||||
'timezone' => 'Europe/Vienna',
|
||||
]);
|
||||
$timeEntryOverWholePeriod = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now('Europe/Vienna')->subDays(7)->startOfDay()->subMinute()->utc(),
|
||||
'end' => now('Europe/Vienna')->endOfDay()->addMinute()->utc(), // TODO: addMinute should not be necessary
|
||||
]);
|
||||
$timeEntryOverWholePeriodWithoutEnd = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now('Europe/Vienna')->subDays(7)->startOfDay()->subMinute()->utc(),
|
||||
'end' => null,
|
||||
]);
|
||||
$timeEntry1Task1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
|
||||
'start' => now('Europe/Vienna')->subMinutes(30)->utc(),
|
||||
'end' => now('Europe/Vienna')->subMinutes(20)->utc(),
|
||||
]);
|
||||
|
||||
// Act
|
||||
$result = $this->dashboardService->lastSevenDays($user, $organization);
|
||||
|
||||
// Assert
|
||||
$this->assertSame([
|
||||
0 => [
|
||||
'date' => '2024-04-17',
|
||||
'duration' => 115800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 22200,
|
||||
3 => 18000,
|
||||
4 => 10800,
|
||||
5 => 10800,
|
||||
6 => 10800, // TODO
|
||||
7 => 0, // TODO
|
||||
],
|
||||
],
|
||||
1 => [
|
||||
'date' => '2024-04-16',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
2 => [
|
||||
'date' => '2024-04-15',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
3 => [
|
||||
'date' => '2024-04-14',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
4 => [
|
||||
'date' => '2024-04-13',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
5 => [
|
||||
'date' => '2024-04-12',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
6 => [
|
||||
'date' => '2024-04-11',
|
||||
'duration' => 172800,
|
||||
'history' => [
|
||||
0 => 21600,
|
||||
1 => 21600,
|
||||
2 => 21600,
|
||||
3 => 21600,
|
||||
4 => 21600,
|
||||
5 => 21600,
|
||||
6 => 21600,
|
||||
7 => 21600,
|
||||
],
|
||||
],
|
||||
], $result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user