Add group-class scheduling, instructor assignment, and details/invite management

Group classes now carry a specific class time (alongside date and duration) and an assigned instructor: - Schema: add `class_time` (TIME) to `us_offerings`; `Offering` gains `normalizeTime`/`sessionWindows`. (Rides the pending 1.0.0->1.1.0 dbDelta upgrade, so no version bump.) - Offering form: class-time field, plus a studio-admin instructor picker (plain instructors always own their own classes). - `ClassSlotReconciler`: assigning an instructor clears their open booking slots overlapping each session and flags already-booked lessons that clash (a booked lesson is never deleted). Uses new `AvailabilityRepository::findOverlapping`. - Front end: `GET /offerings` exposes `instructor_name`; the enrolment page shows who teaches each class and when it meets. Back-office group-class views redesigned: - Instructor **My Group Classes** and studio-admin **Group Classes** are now per-class summaries with enrolment counts, not flat student lists. - Each links through (`?class_id=<id>`) to a per-class **details page** (schedule panel, roster with payment status, and — for invite-only classes — the add/make-available/invite-by-email controls). Invite-only membership is managed entirely from this page. - Invite actions are allowed for the class's owning instructor or any `view_all_lessons` studio admin, so an owner-operator (studio admin who also teaches) can reach every class's roster and invites from the Group Classes page. Tests: composer test (508), composer lint, composer cs all pass. Co-Authored-By: Claude Opus 4.8 <[email protected]>
2026-07-23 17:29:48 -03:00
parent bba24566a6
commit b066bef353
23 changed files with 1355 additions and 207 deletions
@@ -343,4 +343,37 @@ class AvailabilityRepositoryTest extends TestCase
        self::assertCount(1, $slots);
        self::assertInstanceOf(AvailabilitySlot::class, $slots[0]);
    }
+
+    public function testFindOverlappingQueriesTheInstructorAndWindow(): void
+    {
+        $row = (object) [
+            'id'               => '5',
+            'instructor_id'    => '3',
+            'offering_id'      => null,
+            'start_dt'         => '2026-09-08 16:00:00',
+            'end_dt'           => '2026-09-08 17:00:00',
+            'duration_minutes' => '60',
+            'is_booked'        => '0',
+            'recurrence_group' => null,
+        ];
+
+        // Half-open overlap: start_dt < window end AND end_dt > window start, with
+        // the window bounds bound in that order.
+        $this->db->shouldReceive('prepare')
+            ->once()
+            ->with(
+                Mockery::pattern('/start_dt < %s AND end_dt > %s/'),
+                'wp_us_availability',
+                3,
+                '2026-09-08 17:00:00',
+                '2026-09-08 16:00:00'
+            )
+            ->andReturn('SELECT ...');
+        $this->db->shouldReceive('get_results')->andReturn([$row]);
+
+        $slots = $this->repo->findOverlapping(3, '2026-09-08 16:00:00', '2026-09-08 17:00:00');
+
+        self::assertCount(1, $slots);
+        self::assertInstanceOf(AvailabilitySlot::class, $slots[0]);
+    }
 }
@@ -55,6 +55,18 @@ class GroupClassControllerTest extends TestCase
        Functions\when('get_users')->justReturn([]);
        Functions\when('esc_attr')->returnArg();
        Functions\when('esc_attr_e')->returnArg();
+        Functions\when('esc_url')->returnArg();
+        Functions\when('admin_url')->justReturn('admin.php?page=us-my-group-classes');
+        Functions\when('add_query_arg')->alias(
+            static fn ($key, $value, $url) => $url . '&' . $key . '=' . $value
+        );
+        Functions\when('absint')->alias(static fn ($v) => abs((int) $v));
+        Functions\when('mysql2date')->alias(
+            static fn (string $format, string $date) => date($format, (int) strtotime($date))
+        );
+        Functions\when('wp_nonce_field')->justReturn('');
+
+        $_GET = [];
    }

    private function offering(int $id, string $title, ?int $capacity): Offering
@@ -76,9 +88,29 @@ class GroupClassControllerTest extends TestCase
        return (string) ob_get_clean();
    }

-    public function testInstructorPageListsClassWithCapacityAndRoster(): void
+    public function testInstructorSummaryListsClassWithEnrolmentCountAndRosterLink(): void
+    {
+        $offering = $this->offering(8, 'Choir', 10);
+        $active   = new Enrollment(offeringId: 8, studentId: 5, instructorId: 3, paymentId: 42, id: 1);
+
+        $this->offerings->shouldReceive('findAll')->once()
+            ->with(3, Offering::KIND_GROUP_CLASS)->andReturn([$offering]);
+        $this->enrollments->shouldReceive('findByInstructor')->once()->with(3)->andReturn([$active]);
+        // The summary must not resolve individual students — it is a class list.
+        $this->payments->shouldReceive('findById')->never();
+
+        $html = $this->renderInstructor();
+
+        self::assertStringContainsString('Choir', $html);
+        self::assertStringContainsString('1 / 10', $html);
+        self::assertStringContainsString('View details', $html);
+        self::assertStringContainsString('class_id=8', $html);
+    }
+
+    public function testClassDetailListsRosterWithPaymentStatus(): void
    {
        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);
+        $_GET = ['class_id' => '8'];

        $offering   = $this->offering(8, 'Choir', 10);
        $enrollment = new Enrollment(offeringId: 8, studentId: 5, instructorId: 3, paymentId: 42, id: 1);
@@ -92,15 +124,51 @@ class GroupClassControllerTest extends TestCase

        $html = $this->renderInstructor();

-        self::assertStringContainsString('Choir', $html);
-        self::assertStringContainsString('(1 / 10 enrolled)', $html);
+        self::assertStringContainsString('1 / 10 enrolled', $html);
        self::assertStringContainsString('Ada Lovelace', $html);
        self::assertStringContainsString('paid', $html);
    }

-    public function testEnrolmentCountExcludesCancelledButRosterKeepsThem(): void
+    public function testClassDetailShowsClassSettingsAndInviteControlsForInviteOnly(): void
+    {
+        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);
+        $_GET = ['class_id' => '8'];
+
+        $offering = new Offering(
+            instructorId: 3,
+            kind:         Offering::KIND_GROUP_CLASS,
+            title:        'Private Choir',
+            price:        120.0,
+            description:  'A year of choir.',
+            durationMinutes: 60,
+            termStart:    '2026-09-08',
+            termEnd:      '2026-09-08',
+            classTime:    '16:00:00',
+            accessMode:   Offering::ACCESS_INVITE_ONLY,
+            id:           8,
+        );
+
+        $this->offerings->shouldReceive('findAll')->once()
+            ->with(3, Offering::KIND_GROUP_CLASS)->andReturn([$offering]);
+        $this->enrollments->shouldReceive('findByInstructor')->once()->with(3)->andReturn([]);
+        $this->access->shouldReceive('findByOffering')->once()->with(8)->andReturn([]);
+
+        $html = $this->renderInstructor();
+
+        // The details section.
+        self::assertStringContainsString('Class details', $html);
+        self::assertStringContainsString('Ada Lovelace', $html);
+        self::assertStringContainsString('120.00', $html);
+        self::assertStringContainsString('A year of choir.', $html);
+        // The invite/add controls are reached from this page.
+        self::assertStringContainsString('Add students directly', $html);
+        self::assertStringContainsString('Invite by email', $html);
+    }
+
+    public function testClassDetailEnrolmentCountExcludesCancelledButRosterKeepsThem(): void
    {
        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Grace Hopper']);
+        $_GET = ['class_id' => '8'];

        $offering  = $this->offering(8, 'Band', null);
        $active    = new Enrollment(offeringId: 8, studentId: 5, instructorId: 3, id: 1);
@@ -112,14 +180,15 @@ class GroupClassControllerTest extends TestCase
        $html = $this->renderInstructor();

        // Unlimited capacity offering counts only the active enrolment.
-        self::assertStringContainsString('(1 enrolled)', $html);
+        self::assertStringContainsString('1 enrolled', $html);
        // But the roster still shows the cancelled row.
        self::assertStringContainsString('cancelled', $html);
    }

-    public function testFreeEnrolmentShowsDashForPayment(): void
+    public function testClassDetailFreeEnrolmentShowsDashForPayment(): void
    {
        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Alan Turing']);
+        $_GET = ['class_id' => '8'];

        $offering   = $this->offering(8, 'Theory', 5);
        $enrollment = new Enrollment(offeringId: 8, studentId: 5, instructorId: 3, paymentId: null, id: 1);
@@ -135,8 +204,6 @@ class GroupClassControllerTest extends TestCase

    public function testEnrolmentsForOtherClassesAreNotMixedIn(): void
    {
-        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Katherine Johnson']);
-
        $offering = $this->offering(8, 'Choir', 5);
        $mine     = new Enrollment(offeringId: 8, studentId: 5, instructorId: 3, id: 1);
        $other    = new Enrollment(offeringId: 9, studentId: 6, instructorId: 3, id: 2);
@@ -146,11 +213,14 @@ class GroupClassControllerTest extends TestCase

        $html = $this->renderInstructor();

-        self::assertStringContainsString('(1 / 5 enrolled)', $html);
+        self::assertStringContainsString('1 / 5', $html);
    }

-    public function testClassWithNoEnrolmentsShowsEmptyMessage(): void
+    public function testClassDetailWithNoEnrolmentsShowsEmptyMessage(): void
    {
+        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);
+        $_GET = ['class_id' => '8'];
+
        $offering = $this->offering(8, 'Jazz', 5);

        $this->offerings->shouldReceive('findAll')->once()->andReturn([$offering]);
@@ -171,6 +241,64 @@ class GroupClassControllerTest extends TestCase
        self::assertStringContainsString('You have no group classes.', $html);
    }

+    public function testStudioAdminPageSummarisesClassesNotStudents(): void
+    {
+        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);
+
+        $offering = new Offering(
+            instructorId: 3,
+            kind: Offering::KIND_GROUP_CLASS,
+            title: 'Choir',
+            capacity: 10,
+            termStart: '2026-09-08',
+            termEnd: '2026-09-08',
+            classTime: '16:00:00',
+            id: 8,
+        );
+
+        $this->offerings->shouldReceive('findAll')->once()
+            ->with(0, Offering::KIND_GROUP_CLASS)->andReturn([$offering]);
+        $this->enrollments->shouldReceive('countActiveForOffering')->once()->with(8)->andReturn(4);
+
+        ob_start();
+        $this->controller->renderPage();
+        $html = (string) ob_get_clean();
+
+        self::assertStringContainsString('Choir', $html);
+        self::assertStringContainsString('Ada Lovelace', $html);
+        self::assertStringContainsString('4 / 10', $html);
+    }
+
+    public function testStudioAdminCanOpenClassDetailWithInviteControls(): void
+    {
+        // A studio admin (view_all_lessons) opens a class taught by instructor 7.
+        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);
+        $_GET = ['class_id' => '8'];
+
+        $offering = new Offering(
+            instructorId: 7,
+            kind:         Offering::KIND_GROUP_CLASS,
+            title:        'Private Choir',
+            price:        120.0,
+            accessMode:   Offering::ACCESS_INVITE_ONLY,
+            id:           8,
+        );
+
+        $this->offerings->shouldReceive('findAll')->once()
+            ->with(0, Offering::KIND_GROUP_CLASS)->andReturn([$offering]);
+        // Detail rosters are looked up by the class's own instructor (7).
+        $this->enrollments->shouldReceive('findByInstructor')->once()->with(7)->andReturn([]);
+        $this->access->shouldReceive('findByOffering')->once()->with(8)->andReturn([]);
+
+        ob_start();
+        $this->controller->renderPage();
+        $html = (string) ob_get_clean();
+
+        self::assertStringContainsString('Class details', $html);
+        self::assertStringContainsString('Add students directly', $html);
+        self::assertStringContainsString('Invite by email', $html);
+    }
+
    public function testDeniesUsersWithoutViewLessonsCapability(): void
    {
        Functions\when('current_user_can')->justReturn(false);
@@ -184,6 +312,7 @@ class GroupClassControllerTest extends TestCase
    protected function tearDown(): void
    {
        $_POST = [];
+        $_GET  = [];
        parent::tearDown();
    }

@@ -332,8 +461,13 @@ class GroupClassControllerTest extends TestCase
        self::assertStringContainsString('1 student(s) granted access.', $html);
    }

-    public function testActionRejectedForClassNotOwnedByInstructor(): void
+    public function testActionRejectedForClassNotOwnedByPlainInstructor(): void
    {
+        // A plain instructor (no view_all_lessons) may only manage their own classes.
+        Functions\when('current_user_can')->alias(
+            static fn (string $cap) => 'view_all_lessons' !== $cap
+        );
+
        $_POST = ['usc_action' => 'add_direct', 'offering_id' => 8, 'student_ids' => [5]];
        $this->stubActionContext();

@@ -346,4 +480,36 @@ class GroupClassControllerTest extends TestCase

        self::assertStringContainsString('That group class was not found.', $html);
    }
+
+    public function testStudioAdminCanManageInviteForAnotherInstructorsClass(): void
+    {
+        // current_user_can returns true for everything (incl. view_all_lessons),
+        // so the studio admin may add students to a class they do not own.
+        $_POST = ['usc_action' => 'add_direct', 'offering_id' => 8, 'student_ids' => [5]];
+        $this->stubActionContext();
+
+        $foreign = new Offering(instructorId: 7, kind: Offering::KIND_GROUP_CLASS, title: 'Other', price: 100.0, accessMode: Offering::ACCESS_INVITE_ONLY, id: 8);
+        $this->offerings->shouldReceive('findById')->with(8)->andReturn($foreign);
+        $this->enrollments->shouldReceive('hasActiveEnrollment')->with(8, 5)->andReturn(false);
+        $this->enrollments->shouldReceive('insert')->once()->andReturn(44);
+
+        // The enrolment and payment use the class's own instructor (7), not the admin.
+        $payment = new Payment(
+            studentId:        5,
+            instructorId:     7,
+            registrationType: Payment::REG_ENROLLMENT,
+            registrationId:   44,
+            amount:           100.0,
+            status:           Payment::STATUS_PENDING,
+            id:               12,
+        );
+        $this->paymentService->shouldReceive('createForRegistration')
+            ->once()->with(Payment::REG_ENROLLMENT, 44, 5, 7, 100.0, 'CAD', null)->andReturn($payment);
+        $this->enrollments->shouldReceive('setPaymentId')->once()->with(44, 12)->andReturn(true);
+        $this->access->shouldReceive('markEnrolled')->once()->with(8, 5);
+
+        $html = $this->renderInstructor();
+
+        self::assertStringContainsString('1 student(s) added to the class.', $html);
+    }
 }
@@ -0,0 +1,122 @@
+<?php
+declare(strict_types=1);
+
+namespace Unsupervised\Schedular\Tests\Unit\Offering;
+
+use Mockery;
+use Unsupervised\Schedular\Availability\AvailabilityRepository;
+use Unsupervised\Schedular\Availability\AvailabilitySlot;
+use Unsupervised\Schedular\Offering\ClassSlotReconciler;
+use Unsupervised\Schedular\Offering\Offering;
+use Unsupervised\Schedular\Tests\Unit\TestCase;
+
+class ClassSlotReconcilerTest extends TestCase
+{
+    private AvailabilityRepository&Mockery\MockInterface $availability;
+    private ClassSlotReconciler $reconciler;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->availability = Mockery::mock(AvailabilityRepository::class);
+        $this->reconciler   = new ClassSlotReconciler($this->availability);
+    }
+
+    private function groupClass(?string $termEnd = null): Offering
+    {
+        return new Offering(
+            instructorId:    3,
+            kind:            Offering::KIND_GROUP_CLASS,
+            title:           'Choir',
+            durationMinutes: 60,
+            termStart:       '2026-09-08',
+            termEnd:         $termEnd ?? '2026-09-08',
+            classTime:       '16:00:00',
+            id:              8,
+        );
+    }
+
+    public function testRemovesOpenSlotsOverlappingASession(): void
+    {
+        $open = new AvailabilitySlot(3, '2026-09-08 16:00:00', '2026-09-08 17:00:00', 60, id: 12);
+
+        $this->availability->shouldReceive('findOverlapping')
+            ->once()->with(3, '2026-09-08 16:00:00', '2026-09-08 17:00:00')
+            ->andReturn([$open]);
+        $this->availability->shouldReceive('delete')->once()->with(12)->andReturn(true);
+
+        $result = $this->reconciler->reconcile($this->groupClass());
+
+        self::assertSame(1, $result['removed']);
+        self::assertSame([], $result['conflicts']);
+    }
+
+    public function testReportsBookedSlotAsConflictWithoutDeleting(): void
+    {
+        $booked = new AvailabilitySlot(3, '2026-09-08 16:00:00', '2026-09-08 17:00:00', 60, isBooked: true, id: 12);
+
+        $this->availability->shouldReceive('findOverlapping')->once()->andReturn([$booked]);
+        // A booked lesson is never deleted.
+        $this->availability->shouldReceive('delete')->never();
+
+        $result = $this->reconciler->reconcile($this->groupClass());
+
+        self::assertSame(0, $result['removed']);
+        self::assertSame(['2026-09-08 16:00:00'], $result['conflicts']);
+    }
+
+    public function testWeeklyClassReconcilesEverySession(): void
+    {
+        // Three weekly sessions from Sep 8 to Sep 22.
+        $this->availability->shouldReceive('findOverlapping')
+            ->once()->with(3, '2026-09-08 16:00:00', '2026-09-08 17:00:00')->andReturn([]);
+        $this->availability->shouldReceive('findOverlapping')
+            ->once()->with(3, '2026-09-15 16:00:00', '2026-09-15 17:00:00')->andReturn([]);
+        $this->availability->shouldReceive('findOverlapping')
+            ->once()->with(3, '2026-09-22 16:00:00', '2026-09-22 17:00:00')->andReturn([]);
+
+        $result = $this->reconciler->reconcile($this->groupClass('2026-09-22'));
+
+        self::assertSame(0, $result['removed']);
+    }
+
+    public function testUnscheduledClassIsSkipped(): void
+    {
+        // No class time set — nothing to reconcile.
+        $offering = new Offering(
+            instructorId:    3,
+            kind:            Offering::KIND_GROUP_CLASS,
+            title:           'Choir',
+            durationMinutes: 60,
+            termStart:       '2026-09-08',
+            id:              8,
+        );
+
+        $this->availability->shouldReceive('findOverlapping')->never();
+
+        $result = $this->reconciler->reconcile($offering);
+
+        self::assertSame(['removed' => 0, 'conflicts' => []], $result);
+    }
+
+    public function testPrivateLessonOfferingIsSkipped(): void
+    {
+        $offering = new Offering(
+            instructorId:    3,
+            kind:            Offering::KIND_PRIVATE_LESSON,
+            title:           '30 min',
+            durationMinutes: 30,
+            termStart:       '2026-09-08',
+            termEnd:         '2026-09-08',
+            classTime:       '16:00:00',
+            id:              8,
+        );
+
+        $this->availability->shouldReceive('findOverlapping')->never();
+
+        $result = $this->reconciler->reconcile($offering);
+
+        self::assertSame(['removed' => 0, 'conflicts' => []], $result);
+    }
+}
@@ -5,6 +5,7 @@ namespace Unsupervised\Schedular\Tests\Unit\Offering;

 use Brain\Monkey\Functions;
 use Mockery;
+use Unsupervised\Schedular\Offering\ClassSlotReconciler;
 use Unsupervised\Schedular\Offering\Offering;
 use Unsupervised\Schedular\Offering\OfferingController;
 use Unsupervised\Schedular\Offering\OfferingRepository;
@@ -13,6 +14,7 @@ use Unsupervised\Schedular\Tests\Unit\TestCase;
 class OfferingControllerTest extends TestCase
 {
    private OfferingRepository&Mockery\MockInterface $repository;
+    private ClassSlotReconciler&Mockery\MockInterface $reconciler;
    private OfferingController $controller;

    protected function setUp(): void
@@ -20,13 +22,16 @@ class OfferingControllerTest extends TestCase
        parent::setUp();

        $this->repository = Mockery::mock(OfferingRepository::class);
-        $this->controller = new OfferingController($this->repository);
+        $this->reconciler = Mockery::mock(ClassSlotReconciler::class);
+        $this->reconciler->shouldReceive('reconcile')->andReturn(['removed' => 0, 'conflicts' => []])->byDefault();
+        $this->controller = new OfferingController($this->repository, $this->reconciler);

        $_POST = [];
        $_GET  = [];

        Functions\when('current_user_can')->justReturn(true);
        Functions\when('get_current_user_id')->justReturn(3);
+        Functions\when('get_users')->justReturn([]);
        Functions\when('check_admin_referer')->justReturn(true);
        Functions\when('admin_url')->justReturn('admin.php?page=us-offerings');
        Functions\when('add_query_arg')->alias(
@@ -70,6 +75,90 @@ class OfferingControllerTest extends TestCase
        $this->render();
    }

+    public function testAddGroupClassStoresClassTimeAndReconcilesSlots(): void
+    {
+        $_POST = [
+            'usc_action'  => 'add',
+            'title'       => 'Ballet Beginners',
+            'kind'        => Offering::KIND_GROUP_CLASS,
+            'term_start'  => '2026-09-08',
+            'class_time'  => '16:30',
+            'duration_minutes' => '60',
+        ];
+
+        $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+            static fn (Offering $o) => '16:30:00' === $o->classTime
+        ))->andReturn(1);
+        $this->repository->shouldReceive('findAll')->andReturn([]);
+
+        // A scheduled class is reconciled against the instructor's availability,
+        // and the resulting notice is surfaced to the admin.
+        $this->reconciler->shouldReceive('reconcile')->once()->with(Mockery::on(
+            static fn (Offering $o) => '16:30:00' === $o->classTime
+        ))->andReturn(['removed' => 2, 'conflicts' => []]);
+
+        $html = $this->render();
+
+        self::assertStringContainsString('2 open booking slots were removed', $html);
+    }
+
+    public function testGarbageClassTimeIsRejected(): void
+    {
+        $_POST = [
+            'usc_action' => 'add',
+            'title'      => 'Choir',
+            'kind'       => Offering::KIND_GROUP_CLASS,
+            'class_time' => 'not-a-time',
+        ];
+
+        $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+            static fn (Offering $o) => null === $o->classTime
+        ))->andReturn(1);
+        $this->repository->shouldReceive('findAll')->andReturn([]);
+
+        $this->render();
+    }
+
+    public function testStudioAdminAssignsClassToChosenInstructor(): void
+    {
+        $_POST = [
+            'usc_action'          => 'add',
+            'title'               => 'Choir',
+            'kind'                => Offering::KIND_GROUP_CLASS,
+            'class_instructor_id' => '7',
+        ];
+
+        $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+            static fn (Offering $o) => 7 === $o->instructorId
+        ))->andReturn(1);
+        $this->repository->shouldReceive('findAll')->andReturn([]);
+
+        $this->render();
+    }
+
+    public function testInstructorCannotReassignClassToAnotherInstructor(): void
+    {
+        // A plain instructor (no manage_instructors) — the posted instructor id
+        // must be ignored so the class stays theirs.
+        Functions\when('current_user_can')->alias(
+            static fn (string $cap) => 'manage_instructors' !== $cap
+        );
+
+        $_POST = [
+            'usc_action'          => 'add',
+            'title'               => 'Choir',
+            'kind'                => Offering::KIND_GROUP_CLASS,
+            'class_instructor_id' => '7',
+        ];
+
+        $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+            static fn (Offering $o) => 3 === $o->instructorId
+        ))->andReturn(1);
+        $this->repository->shouldReceive('findAll')->andReturn([]);
+
+        $this->render();
+    }
+
    public function testAddInviteOnlyGroupClassStoresInviteOnlyAccess(): void
    {
        $_POST = [
@@ -22,6 +22,7 @@ class OfferingEndpointTest extends TestCase
        parent::setUp();

        Functions\when('get_current_user_id')->justReturn(5);
+        Functions\when('get_userdata')->justReturn((object) ['display_name' => 'Ada Lovelace']);

        $this->repository = Mockery::mock(OfferingRepository::class);
        $this->access     = Mockery::mock(GroupAccessRepository::class);
@@ -88,6 +89,20 @@ class OfferingEndpointTest extends TestCase
        self::assertSame([], $data);
    }

+    public function testIndexIncludesInstructorNameForEachOffering(): void
+    {
+        $instructor = Mockery::mock(\WP_User::class);
+        $instructor->display_name = 'Ada Lovelace';
+        Functions\when('get_userdata')->justReturn($instructor);
+
+        $this->repository->shouldReceive('findAll')->andReturn([$this->group(1, Offering::ACCESS_PUBLIC)]);
+        $this->access->shouldReceive('findGrantedOfferingIds')->with(5)->andReturn([]);
+
+        $data = $this->endpoint->index(new \WP_REST_Request())->get_data();
+
+        self::assertSame('Ada Lovelace', $data[0]['instructor_name']);
+    }
+
    public function testIndexOmitsEtransferEmailFromPublicListing(): void
    {
        $this->repository->shouldReceive('findAll')->andReturn([
@@ -52,6 +52,82 @@ class OfferingTest extends TestCase
        self::assertSame('2026-09-08', Offering::weeklyTermEnd('2026-09-08', 0));
    }

+    public function testNormalizeTimeAcceptsHtmlTimeInput(): void
+    {
+        self::assertSame('16:30:00', Offering::normalizeTime('16:30'));
+        self::assertSame('09:00:00', Offering::normalizeTime('09:00:00'));
+    }
+
+    public function testNormalizeTimeRejectsGarbage(): void
+    {
+        self::assertNull(Offering::normalizeTime(''));
+        self::assertNull(Offering::normalizeTime('25:00'));
+        self::assertNull(Offering::normalizeTime('not-a-time'));
+    }
+
+    public function testSessionWindowsForOneOffClass(): void
+    {
+        $offering = new Offering(
+            instructorId: 3,
+            kind: Offering::KIND_GROUP_CLASS,
+            title: 'Recital',
+            durationMinutes: 90,
+            termStart: '2026-09-08',
+            termEnd: '2026-09-08',
+            classTime: '16:00:00',
+        );
+
+        self::assertSame(
+            [['start' => '2026-09-08 16:00:00', 'end' => '2026-09-08 17:30:00']],
+            $offering->sessionWindows()
+        );
+    }
+
+    public function testSessionWindowsWalksWeeklyTerm(): void
+    {
+        $offering = new Offering(
+            instructorId: 3,
+            kind: Offering::KIND_GROUP_CLASS,
+            title: 'Choir',
+            durationMinutes: 60,
+            termStart: '2026-09-08',
+            termEnd: '2026-09-22',
+            classTime: '16:00:00',
+        );
+
+        $windows = $offering->sessionWindows();
+
+        self::assertCount(3, $windows);
+        self::assertSame('2026-09-08 16:00:00', $windows[0]['start']);
+        self::assertSame('2026-09-22 16:00:00', $windows[2]['start']);
+        self::assertSame('2026-09-22 17:00:00', $windows[2]['end']);
+    }
+
+    public function testSessionWindowsEmptyWhenScheduleIncomplete(): void
+    {
+        // No class time.
+        $noTime = new Offering(
+            instructorId: 3,
+            kind: Offering::KIND_GROUP_CLASS,
+            title: 'Choir',
+            durationMinutes: 60,
+            termStart: '2026-09-08',
+            termEnd: '2026-09-08',
+        );
+        self::assertSame([], $noTime->sessionWindows());
+
+        // No duration.
+        $noDuration = new Offering(
+            instructorId: 3,
+            kind: Offering::KIND_GROUP_CLASS,
+            title: 'Choir',
+            termStart: '2026-09-08',
+            termEnd: '2026-09-08',
+            classTime: '16:00:00',
+        );
+        self::assertSame([], $noDuration->sessionWindows());
+    }
+
    public function testDefaults(): void
    {
        $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir');