по умолчанию возврат на текущую неделю

app/Filters/TimetableFilter.php

@@ -30,11 +30,12 @@ class TimetableFilter extends QueryFilter
 
     protected function date($value)
     {
-        $start_date = str_replace('/', '-', $value);
-        $end_date = Carbon::parse($start_date)
+        $formatValue = str_replace('/', '-', $value);
+        $weekStartDate = Carbon::parse($formatValue)->startOfWeek()->format('Y-m-d');
+        $weekEndDate = Carbon::parse($weekStartDate)
             ->addDays(5)
             ->format('Y-m-d');
-        $this->builder = $this->builder->whereBetween('date', [$start_date, $end_date]);
+        $this->builder = $this->builder->whereBetween('date', [$weekStartDate, $weekEndDate]);
     }
 
 }

app/Http/Controllers/TimetableController.php

@@ -20,6 +20,15 @@ class TimetableController extends Controller
         ]);
         $builder = Timetable::all()->sortBy('timeStart');
         $timetables = (new TimetableFilter($builder, $request))->apply()->values();
+        if (!$request->filled('date')) {
+            $now = Carbon::now();
+            $weekStartDate = $now->startOfWeek()->format('Y-m-d');
+            $weekEndDate = Carbon::parse($weekStartDate)
+                ->addDays(5)
+                ->format('Y-m-d');
+            $timetables = $timetables->whereBetween('date', [$weekStartDate, $weekEndDate]);
+        }
+
         $filterTimetables = collect([]);
         foreach ($timetables as $timetable) {
             $subject = $timetable->subject->name;
@@ -36,13 +45,17 @@ class TimetableController extends Controller
                 'class' => $class,
             ]);
         }
+
         $dateTimetables = [];
+        if (!$filterTimetables->isEmpty()) {
             for ($i = 0; $i < 6; $i++) {
                 $date = Carbon::parse($request->input('date'))
+                    ->startOfWeek()
                     ->addDays($i)
                     ->format('Y-m-d');
                 array_push($dateTimetables, [$date => $filterTimetables->where('date', $date)->values()]);
             }
+        }
         return response()->json($dateTimetables, 200);
     }