diff --git a/app/Service/TimeEntryAggregationService.php b/app/Service/TimeEntryAggregationService.php index 2e75d536..3b8648c0 100644 --- a/app/Service/TimeEntryAggregationService.php +++ b/app/Service/TimeEntryAggregationService.php @@ -12,6 +12,7 @@ use Carbon\CarbonTimeZone; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; class TimeEntryAggregationService { @@ -175,18 +176,19 @@ class TimeEntryAggregationService return $data; } else { $format = match ($interval) { - TimeEntryAggregationTypeInterval::Day => 'Y-m-d', - TimeEntryAggregationTypeInterval::Week => 'Y-m-d H:i:s', + TimeEntryAggregationTypeInterval::Day, TimeEntryAggregationTypeInterval::Week => 'Y-m-d', TimeEntryAggregationTypeInterval::Month => 'Y-m', TimeEntryAggregationTypeInterval::Year => 'Y', }; $slots = $this->timeSlotsBetween($start, $end, $timezone, $startOfWeek, $interval, $format); + $foundEntries = []; $filledData = []; foreach ($slots as $slot) { $foundDataSet = null; foreach ($data as $item) { if ($item['key'] === $slot) { $foundDataSet = $item; + $foundEntries[] = $item['key']; break; } } @@ -219,6 +221,16 @@ class TimeEntryAggregationService } } + if (count($foundEntries) !== count($data)) { + foreach ($data as $item) { + if (! in_array($item['key'], $foundEntries, true)) { + Log::error('Problem with filling gaps in time groups', [ + 'item' => $item, + ]); + } + } + } + return $filledData; } } @@ -233,11 +245,11 @@ class TimeEntryAggregationService } else { $dateWithTimeZone = 'start'; } - $startOfWeek = Carbon::now()->setTimezone($timezone)->startOfWeek($startOfWeek->carbonWeekDay())->utc()->toDateTimeString(); + $startOfWeek = Carbon::now()->setTimezone($timezone)->startOfWeek($startOfWeek->carbonWeekDay())->toDateTimeString(); if ($group === TimeEntryAggregationType::Day) { return 'date('.$dateWithTimeZone.')'; } elseif ($group === TimeEntryAggregationType::Week) { - return "to_char(date_bin('7 days', ".$dateWithTimeZone.", timestamp '".$startOfWeek."'), 'YYYY-MM-DD HH24:MI:SS')"; + return "to_char(date_bin('7 days', ".$dateWithTimeZone.", timestamp '".$startOfWeek."'), 'YYYY-MM-DD')"; } elseif ($group === TimeEntryAggregationType::Month) { return 'to_char('.$dateWithTimeZone.', \'YYYY-MM\')'; } elseif ($group === TimeEntryAggregationType::Year) { @@ -268,7 +280,7 @@ class TimeEntryAggregationService if ($interval === TimeEntryAggregationTypeInterval::Day) { $current->startOfDay(); } elseif ($interval === TimeEntryAggregationTypeInterval::Week) { - $current->startOfWeek($startOfWeek->carbonWeekDay())->utc(); + $current->startOfWeek($startOfWeek->carbonWeekDay()); } elseif ($interval === TimeEntryAggregationTypeInterval::Month) { $current->startOfMonth(); } elseif ($interval === TimeEntryAggregationTypeInterval::Year) { diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php index 7476f1ea..7365950f 100644 --- a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php @@ -638,8 +638,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract $data = $this->createUserWithPermission([ 'time-entries:view:all', ]); - $week1 = Carbon::now()->timezone($data->user->timezone)->startOfWeek($data->user->week_start->carbonWeekDay())->utc(); - $week2 = Carbon::now()->timezone($data->user->timezone)->subWeeks(2)->startOfWeek($data->user->week_start->carbonWeekDay())->utc(); + $week1 = Carbon::now()->timezone($data->user->timezone)->startOfWeek($data->user->week_start->carbonWeekDay()); + $week2 = Carbon::now()->timezone($data->user->timezone)->subWeeks(2)->startOfWeek($data->user->week_start->carbonWeekDay()); $timeEntry1Week1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($week1->copy()->addDays(1), 10)->create(); $timeEntry2Week1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($week1->copy()->addDays(2), 10)->create(); $timeEntry1Week2 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($week2->copy()->addDays(3), 10)->create(); @@ -661,14 +661,14 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract 'grouped_type' => 'week', 'grouped_data' => [ 0 => [ - 'key' => $week2->format('Y-m-d H:i:s'), + 'key' => $week2->format('Y-m-d'), 'seconds' => 20, 'cost' => 0, 'grouped_type' => null, 'grouped_data' => null, ], 1 => [ - 'key' => $week1->format('Y-m-d H:i:s'), + 'key' => $week1->format('Y-m-d'), 'seconds' => 20, 'cost' => 0, 'grouped_type' => null, @@ -685,8 +685,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract $data = $this->createUserWithPermission([ 'time-entries:view:all', ]); - $laterWeekEnd = Carbon::now()->timezone($data->user->timezone)->endOfWeek($data->user->week_start->toEndOfWeek()->carbonWeekDay())->utc(); - $earlierWeekStart = Carbon::now()->timezone($data->user->timezone)->subWeeks(2)->startOfWeek($data->user->week_start->carbonWeekDay())->utc(); + $laterWeekEnd = Carbon::now()->timezone($data->user->timezone)->endOfWeek($data->user->week_start->toEndOfWeek()->carbonWeekDay()); + $earlierWeekStart = Carbon::now()->timezone($data->user->timezone)->subWeeks(2)->startOfWeek($data->user->week_start->carbonWeekDay()); $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($laterWeekEnd->copy()->subDays(1), 10)->create(); $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($laterWeekEnd->copy()->subDays(2), 10)->create(); @@ -712,21 +712,21 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract 'grouped_type' => 'week', 'grouped_data' => [ 0 => [ - 'key' => '2024-05-05 22:00:00', + 'key' => $earlierWeekStart->startOfWeek($data->user->week_start->carbonWeekDay())->format('Y-m-d'), 'seconds' => 20, 'cost' => 0, 'grouped_type' => null, 'grouped_data' => null, ], 1 => [ - 'key' => '2024-05-12 22:00:00', + 'key' => $laterWeekEnd->copy()->subWeek()->startOfWeek($data->user->week_start->carbonWeekDay())->format('Y-m-d'), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, 'grouped_data' => null, ], 2 => [ - 'key' => '2024-05-19 22:00:00', + 'key' => $laterWeekEnd->startOfWeek($data->user->week_start->carbonWeekDay())->format('Y-m-d'), 'seconds' => 20, 'cost' => 0, 'grouped_type' => null,