Merge pull request 'Show booked lesson info on upcoming lists and add admin booking detail' (#104) from feature/lesson-booking-detail into main

Reviewed-on: #104

src/AdminMenu.php

@@ -17,6 +17,7 @@ use Unsupervised\Schedular\Auth\StudentController;
 use Unsupervised\Schedular\Auth\StudentHistory;
 use Unsupervised\Schedular\Booking\BookingRepository;
 use Unsupervised\Schedular\Booking\LessonController;
+use Unsupervised\Schedular\Booking\LessonDetail;
 use Unsupervised\Schedular\GroupClass\EnrollmentRepository;
 use Unsupervised\Schedular\GroupClass\GroupAccessRepository;
 use Unsupervised\Schedular\GroupClass\GroupClassController;
@@ -57,7 +58,7 @@ class AdminMenu {
 
 	public function __construct( AvailabilityRepository $availability, BookingRepository $bookings, OfferingRepository $offerings, QuestionRepository $questions, AnswerRepository $answers, PolicyRepository $policies, PolicyVersionRepository $policyVersions, PolicyService $policyService, AcceptanceRepository $acceptances, InviteRepository $invites, EnrollmentRepository $enrollments, GroupAccessRepository $groupAccess, StudioSettings $settings, PaymentRepository $payments, PaymentService $paymentService, BillingMethodResolver $resolver, RegistrationMailer $registrationMailer ) {
 		$this->availabilityController         = new AvailabilityController( $availability, $offerings );
-		$this->lessonController               = new LessonController( $bookings, $payments, $availability );
+		$this->lessonController               = new LessonController( $bookings, $payments, $availability, $offerings, new LessonDetail( $answers, $questions, $acceptances, $policies, $policyVersions ) );
 		$this->offeringController             = new OfferingController( $offerings, new ClassSlotReconciler( $availability ) );
 		$this->questionController             = new QuestionController( $questions, $offerings );
 		$this->policyController               = new PolicyController( $policies, $policyVersions, $policyService );

src/Booking/BookingEndpoint.php

@@ -123,17 +123,27 @@ class BookingEndpoint {
 	}
 
 	/**
-	 * A lesson's array form plus its slot's start/end times, so front-end lists
-	 * can show when the session happens without a second request.
+	 * A lesson's array form plus its slot's start/end times and the booked
+	 * offering's name, so front-end lists can show what the session is and when
+	 * it happens without a second request.
 	 *
 	 * @return array<string, mixed>
 	 */
 	private function lessonWithTimes( Lesson $lesson ): array {
-		$slot = $this->availability->findById( $lesson->slotId );
+		$slot     = $this->availability->findById( $lesson->slotId );
+		$offering = null !== $lesson->offeringId ? $this->offerings->findById( $lesson->offeringId ) : null;
+
+		// Prefer the offering's own length; fall back to the slot's when the
+		// offering has none (a generic, duration-less type).
+		$duration = null !== $offering && null !== $offering->durationMinutes
+			? $offering->durationMinutes
+			: $slot?->durationMinutes;
 
 		return $lesson->toArray() + [
-			'start_dt' => $slot?->startDt,
-			'end_dt'   => $slot?->endDt,
+			'start_dt'         => $slot?->startDt,
+			'end_dt'           => $slot?->endDt,
+			'offering_title'   => $offering?->title,
+			'duration_minutes' => $duration,
 		];
 	}
 

src/Booking/LessonController.php

@@ -7,6 +7,7 @@ use Unsupervised\Schedular\Auth\RoleManager;
 use Unsupervised\Schedular\Availability\AvailabilityRepository;
 use Unsupervised\Schedular\Availability\AvailabilitySlot;
 use Unsupervised\Schedular\Availability\WeekCalendar;
+use Unsupervised\Schedular\Offering\OfferingRepository;
 use Unsupervised\Schedular\Payment\Payment;
 use Unsupervised\Schedular\Payment\PaymentRepository;
 use Unsupervised\Schedular\Val;
@@ -17,6 +18,8 @@ class LessonController {
 		private BookingRepository $repository,
 		private PaymentRepository $payments,
 		private AvailabilityRepository $availability,
+		private OfferingRepository $offerings,
+		private LessonDetail $detail,
 	) {}
 
 	public function renderAdminDashboard(): void {
@@ -24,6 +27,10 @@ class LessonController {
 			wp_die( esc_html__( 'You do not have permission to view this page.', 'unsupervised-schedular' ) );
 		}
 
+		if ( $this->maybeRenderDetail( 'us-scheduler', false ) ) {
+			return;
+		}
+
 		$this->handleEtransferUpdate( false );
 
 		$rows = array_map( fn( Lesson $lesson ): array => $this->row( $lesson ), $this->repository->findAllUpcoming() );
@@ -36,6 +43,10 @@ class LessonController {
 			wp_die( esc_html__( 'You do not have permission to view lessons.', 'unsupervised-schedular' ) );
 		}
 
+		if ( $this->maybeRenderDetail( 'us-my-lessons', true ) ) {
+			return;
+		}
+
 		$this->handleEtransferUpdate( true );
 
 		$rows = array_map( fn( Lesson $lesson ): array => $this->row( $lesson ), $this->repository->findUpcomingForInstructor( get_current_user_id() ) );
@@ -43,6 +54,36 @@ class LessonController {
 		$this->renderLessonsPage( $rows, 'us-my-lessons' );
 	}
 
+	/**
+	 * When the request targets a single lesson (`?lesson_id=`), render its detail
+	 * view and report that the page has been handled. Instructors may only open
+	 * their own lessons; the studio dashboard ($onlyOwn = false) may open any.
+	 */
+	private function maybeRenderDetail( string $pageSlug, bool $onlyOwn ): bool {
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only lesson selector.
+		$lessonId = absint( Val::int( $_GET['lesson_id'] ?? 0 ) );
+		if ( $lessonId <= 0 ) {
+			return false;
+		}
+
+		$lesson  = $this->repository->findById( $lessonId );
+		$backUrl = admin_url( 'admin.php?page=' . $pageSlug );
+
+		if ( null === $lesson || ( $onlyOwn && get_current_user_id() !== $lesson->instructorId ) ) {
+			$row     = null;
+			$answers = [];
+			$accepts = [];
+		} else {
+			$row     = $this->row( $lesson );
+			$answers = $this->detail->answers( $lessonId );
+			$accepts = $this->detail->acceptances( $lessonId );
+		}
+
+		include USC_PLUGIN_DIR . 'templates/admin/lesson-detail.php';
+
+		return true;
+	}
+
 	/**
 	 * Render the lessons template with its calendar view state: week (default)
 	 * or list, plus which week the week view shows.
@@ -111,10 +152,15 @@ class LessonController {
 		$instructor = get_userdata( $lesson->instructorId );
 		$payment    = null !== $lesson->paymentId ? $this->payments->findById( $lesson->paymentId ) : null;
 		$slot       = $this->availability->findById( $lesson->slotId );
+		$offering   = null !== $lesson->offeringId ? $this->offerings->findById( $lesson->offeringId ) : null;
 
 		return [
+			'lesson_id'          => (int) $lesson->id,
 			'student'            => $student ? $student->display_name : (string) $lesson->studentId,
 			'instructor'         => $instructor ? $instructor->display_name : (string) $lesson->instructorId,
+			'offering'           => $offering ? $offering->title : '—',
+			'duration'           => null !== $offering && null !== $offering->durationMinutes ? $offering->durationMinutes : 0,
+			'recurrence'         => $lesson->recurrence,
 			'time'               => $slot ? $this->formatSlotTime( $slot ) : '—',
 			'day'                => $slot ? substr( $slot->startDt, 0, 10 ) : '',
 			'time_short'         => $slot ? Val::string( mysql2date( 'g:i A', $slot->startDt ) ) : '—',

src/Booking/LessonDetail.php

@@ -0,0 +1,73 @@
+<?php
+declare(strict_types=1);
+
+namespace Unsupervised\Schedular\Booking;
+
+use Unsupervised\Schedular\Policy\AcceptanceRepository;
+use Unsupervised\Schedular\Policy\PolicyAcceptance;
+use Unsupervised\Schedular\Policy\PolicyRepository;
+use Unsupervised\Schedular\Policy\PolicyVersionRepository;
+use Unsupervised\Schedular\Registration\Answer;
+use Unsupervised\Schedular\Registration\AnswerRepository;
+use Unsupervised\Schedular\Registration\QuestionRepository;
+
+/**
+ * Builds the display rows for the admin lesson detail view: the intake answers
+ * the student submitted and the policy versions they accepted when booking.
+ *
+ * Scoped to a single lesson (the `lesson` registration type), mirroring the
+ * per-student history in {@see \Unsupervised\Schedular\Auth\StudentHistory}.
+ */
+class LessonDetail {
+
+	public function __construct(
+		private AnswerRepository $answers,
+		private QuestionRepository $questions,
+		private AcceptanceRepository $acceptances,
+		private PolicyRepository $policies,
+		private PolicyVersionRepository $versions,
+	) {}
+
+	/**
+	 * The intake-question answers recorded for this lesson, in submission order.
+	 *
+	 * @return list<array{question: string, answer: string}>
+	 */
+	public function answers( int $lessonId ): array {
+		return array_map(
+			function ( Answer $answer ): array {
+				$question = $this->questions->findById( $answer->questionId );
+				$value    = $answer->answerValue ?? '';
+
+				return [
+					'question' => $question ? $question->label : sprintf( '#%d', $answer->questionId ),
+					'answer'   => '' === $value ? '—' : $value,
+				];
+			},
+			$this->answers->findByRegistration( Answer::REG_LESSON, $lessonId )
+		);
+	}
+
+	/**
+	 * The policy versions the student accepted when booking this lesson, with the
+	 * captured acceptance time and IP for the audit trail.
+	 *
+	 * @return list<array{policy: string, version: string, accepted_at: string, ip: string}>
+	 */
+	public function acceptances( int $lessonId ): array {
+		return array_map(
+			function ( PolicyAcceptance $acceptance ): array {
+				$version = $this->versions->findById( $acceptance->policyVersionId );
+				$policy  = $version ? $this->policies->findById( $version->policyId ) : null;
+
+				return [
+					'policy'      => $policy ? $policy->title : sprintf( '#%d', $acceptance->policyVersionId ),
+					'version'     => $version ? sprintf( 'v%d', $version->versionNumber ) : '—',
+					'accepted_at' => $acceptance->acceptedAt ?? '',
+					'ip'          => $acceptance->ipAddress ?? '',
+				];
+			},
+			$this->acceptances->findByRegistration( PolicyAcceptance::REG_LESSON, $lessonId )
+		);
+	}
+}