Part 1 of Booking System — Dynamic Calendar, UTC Logic & Test Coverage

.nvmrc

@@ -0,0 +1 @@
+24

app/Http/Controllers/Site/BookingsPagesController.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Controllers\Site;
+
+use App\Models\Cts\Booking;
+use App\Repositories\Cts\BookingRepository;
+use Carbon\Carbon;
+
+class BookingsPagesController extends \App\Http\Controllers\BaseController
+{
+    protected BookingRepository $bookingRepo;
+
+    public function __construct(BookingRepository $bookingRepo)
+    {
+        $this->bookingRepo = $bookingRepo;
+    }
+
+    public function show($id)
+    {
+        $booking = Booking::findOrFail($id);
+
+        return response()->json([
+            'id' => $booking->id,
+            'position' => $booking->position,
+            'controller_name' => $booking->member->name ?? 'Unknown',
+            'from' => $booking->from,
+            'to' => $booking->to,
+        ]);
+    }
+
+    /**
+     * Display the bookings calendar for a given month and year.
+     *
+     * @param  int|null  $year
+     * @param  int|null  $month
+     * @return \Illuminate\View\View
+     */
+    public function index($year = null, $month = null)
+    {
+        $date = Carbon::createFromDate($year ?? now()->year, $month ?? now()->month, 1)->startOfMonth();
+
+        $start = $date->copy()->startOfWeek();
+        $end = $date->copy()->endOfMonth()->endOfWeek();
+
+        $calendar = [];
+        $current = $start->copy();
+
+        // Fetch Bookings for the entire Calendar Range
+        $bookings = $this->bookingRepo->getBookingsBetween($start, $end);
+
+        while ($current <= $end) {
+            $week = [];
+            for ($i = 0; $i < 7; $i++) {
+                $dayBookings = $bookings->filter(function ($booking) use ($current) {
+                    return $booking->date->isSameDay($current);
+                });
+
+                $week[] = [
+                    'date' => $current->copy(),
+                    'bookings' => $dayBookings,
+                ];
+                $current->addDay();
+            }
+            $calendar[] = $week;
+        }
+
+        $prevMonth = $date->copy()->subMonth();
+        $nextMonth = $date->copy()->addMonth();
+
+        return view('site.bookings.index', compact('calendar', 'date', 'prevMonth', 'nextMonth'));
+    }
+}

app/Libraries/Bookings.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Libraries;
+
+use Carbon\Carbon;
+
+class Bookings
+{
+    /**
+     * Determine if a booking should be considered past (ended) in UTC.
+     */
+    public static function isPastUtc(Carbon $dayDate, string $bookingEnd, Carbon $nowUtc): bool
+    {
+        // Ensure both dates are compared in UTC
+        $dayDate = $dayDate->copy()->setTimezone('UTC');
+        $endUtc = Carbon::parse($bookingEnd, 'UTC')->setTimezone('UTC');
+
+        // 1️⃣ If the booking date is before today (UTC), it’s past
+        if ($dayDate->lt($nowUtc->copy()->startOfDay())) {
+            return true;
+        }
+
+        // 2️⃣ If the booking is today and has already ended, it’s past
+        if ($dayDate->isSameDay($nowUtc)) {
+            return $endUtc->lessThanOrEqualTo($nowUtc);
+        }
+
+        // 3️⃣ Otherwise it’s upcoming
+        return false;
+    }
+}

app/Models/Cts/Booking.php

@@ -64,4 +64,19 @@ public function isMentoring()
     {
         return $this->type == 'ME';
     }
+
+    public function isSeminar()
+    {
+        return $this->type == 'GS';
+    }
+
+    public function session()
+    {
+        return $this->belongsTo(\App\Models\Cts\Session::class, 'type_id', 'id');
+    }
+
+    public function exams()
+    {
+        return $this->belongsTo(\App\Models\Cts\Exams::class, 'type_id', 'id');
+    }
 }

app/Models/Cts/Exams.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models\Cts;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Exams extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'cts';
+
+    protected $table = 'exam_book';
+
+    public $timestamps = false;
+
+    public $incrementing = false;
+
+    public function examiner()
+    {
+        return $this->belongsTo(Member::class, 'exmr_id', 'id');
+    }
+}

app/Repositories/Cts/BookingRepository.php

@@ -8,10 +8,19 @@
 
 class BookingRepository
 {
+    public function getBookingsBetween($startDate, $endDate)
+    {
+        return Booking::with(['member', 'session.mentor'])
+            ->whereBetween('date', [$startDate->toDateString(), $endDate->toDateString()])
+            ->get()->each(function ($booking) {
+                $booking->date = Carbon::parse($booking->date);
+            });
+    }
+
     public function getBookings(Carbon $date)
     {
         $bookings = Booking::where('date', '=', $date->toDateString())
-            ->with('member')
+            ->with(['member', 'session.mentor'])
             ->orderBy('from')
             ->get();
 
@@ -21,7 +30,7 @@ public function getBookings(Carbon $date)
     public function getTodaysBookings()
     {
         $bookings = Booking::where('date', '=', Carbon::now()->toDateString())
-            ->with('member')
+            ->with(['member', 'session.mentor'])
             ->orderBy('from')
             ->get();
 
@@ -32,7 +41,7 @@ public function getTodaysLiveAtcBookings()
     {
         $bookings = Booking::where('date', '=', Carbon::now()->toDateString())
             ->networkAtc()
-            ->with('member')
+            ->with(['member', 'session.mentor'])
             ->orderBy('from')
             ->get();
 
@@ -44,7 +53,7 @@ public function getTodaysLiveAtcBookingsWithoutEvents()
         $bookings = Booking::where('date', '=', Carbon::now()->toDateString())
             ->notEvent()
             ->networkAtc()
-            ->with('member')
+            ->with(['member', 'session.mentor'])
             ->orderBy('from')
             ->get();
 
@@ -60,6 +69,50 @@ private function formatBookings(Collection $bookings)
             $booking->member = $this->formatMember($booking);
             $booking->unsetRelation('member');
 
+            if ($booking->type === 'ME' && $booking->session) {
+                $mentorName = 'Unknown';
+
+                // Safely get mentor name and ID
+                if ($booking->session->mentor) {
+                    $mentorName = $booking->session->mentor->name.' ('.$booking->session->mentor->cid.')';
+                }
+
+                $booking->session_details = [
+                    'id' => $booking->session->id,
+                    'position' => $booking->session->position,
+                    'student_id' => $booking->session->student_id,
+                    'mentor_id' => $booking->session->mentor_id,
+                    'mentor' => $mentorName,
+                    'date' => $booking->session->date_1,
+                    'from' => $booking->session->from_1,
+                    'to' => $booking->session->to_1,
+                    'request_time' => $booking->session->request_time,
+                    'taken_time' => $booking->session->taken_time,
+                ];
+            }
+
+            if ($booking->type === 'EX' && $booking->exams) {
+                $examinerName = 'Unknown';
+
+                // Safely get mentor name and ID
+                if ($booking->exams->mentor) {
+                    $examinerName = $booking->exams->examiner->name.' ('.$booking->exams->examiner->cid.')';
+                }
+
+                $booking->exams_details = [
+                    'id' => $booking->exams->id,
+                    'position' => $booking->exams->position,
+                    'student_id' => $booking->exams->student_id,
+                    'exmr_id' => $booking->exams->exmr_id,
+                    'examiner' => $examinerName,
+                    'date' => $booking->exams->date_1,
+                    'from' => $booking->exams->from_1,
+                    'to' => $booking->exams->to_1,
+                    'time_book' => $booking->exams->time_book,
+                    'taken_time' => $booking->exams->time_taken,
+                ];
+            }
+
             return $booking;
         });