Fix: Optimize course times display

#237

Author: rm-yakovenko

app/Models/Course.php

@@ -9,7 +9,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Str;
 use Spatie\Activitylog\LogOptions;
@@ -255,10 +255,10 @@ public function saveCourseTimes($newCourseTimes)
                     ->where('end', Carbon::parse($courseTime['end'])->toTimeString())
                     ->count() == 0) {
                 $this->times()->create([
-                    'day' => $courseTime['day'],
-                    'start' => Carbon::parse($courseTime['start'])->toTimeString(),
-                    'end' => Carbon::parse($courseTime['end'])->toTimeString(),
-                ]);
+                                           'day' => $courseTime['day'],
+                                           'start' => Carbon::parse($courseTime['start'])->toTimeString(),
+                                           'end' => Carbon::parse($courseTime['end'])->toTimeString(),
+                                       ]);
             }
         }
     }
@@ -304,40 +304,37 @@ public function getCourseTimesAttribute()
         }
 
         $courseTimes = $courseTimes->sortBy('day');
-
-        // Instead of showing this:
-        // Mon 9:00 - 5:00 | Tue 9:00 - 5:00 | Wed 9:00 - 5:00 | Thu 9:00 - 5:00 | Fri 9:00 - 5:00
-        // we could show:
-        // Mon - Fri 9:00 - 5:00
-        $daySequences = [];
         foreach ($courseTimes->groupBy('timeString') as $groupedCourseTimes) {
             $currentSeq = [];
             foreach ($groupedCourseTimes as $courseTime) {
                 $prevCourseTime = end($currentSeq);
                 if ($prevCourseTime && ($courseTime->day - $prevCourseTime->day) !== 1) {
-                    $daySequences[] = $currentSeq;
                     $currentSeq = [];
                 }
                 $currentSeq[] = $courseTime;
+                $courseTime->firstOfSeq = reset($currentSeq);
             }
-            $daySequences[] = $currentSeq;
         }
-        $daySequences = array_filter($daySequences, fn(array $sequence) => count($sequence) > 1);
+
+        $groups = $courseTimes->groupBy(fn (CourseTime $courseTime) => $courseTime->firstOfSeq->id)
+            ->groupBy(fn (Collection $seqGroup) => $seqGroup->count() > 1 ? 'multi_days' : 'multi_times');
+
         $result = [];
-        foreach ($daySequences as $sequence) {
-            $firstDay = reset($sequence);
-            $lastDay = end($sequence);
+
+        // Instead of showing this:
+        // Mon 9:00 - 5:00 | Tue 9:00 - 5:00 | Wed 9:00 - 5:00 | Thu 9:00 - 5:00 | Fri 9:00 - 5:00
+        // we could show:
+        // Mon - Fri 9:00 - 5:00
+        foreach (collect($groups->get('multi_days', [])) as $group) {
+            $firstDay = $group->first();
+            $lastDay = $group->last();
             $result[] = "{$firstDay->dayString} - {$lastDay->dayString} {$firstDay->timeString}";
         }
 
-        // grouping by day what's left
         // Mon 10:00 AM - 11:00 AM / 11:30 AM - 12:45 PM
-        $remainingCourseTimes = $courseTimes->diff(Arr::flatten($daySequences))
-            ->groupBy('day');
-        foreach ($remainingCourseTimes as $timeSequence) {
-            $firstDay = $timeSequence->first();
-            $times = $timeSequence->pluck('timeString');
-            $result[] = "{$firstDay->dayString} " . implode(' / ', $times->all());
+        foreach (collect($groups->get('multi_times', []))->flatten()->groupBy('day') as $group) {
+            $firstDay = $group->first();
+            $result[] = "{$firstDay->dayString} {$group->pluck('timeString')->join(' / ')}";
         }
 
         return implode(' | ', $result);