Demo follow-ups: editable policy name, one-page signup, group classes in upcoming lessons, deletion cleanup
CI / Tests (PHP 8.1) (pull_request) Successful in 1m0s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m0s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 3m8s
CI / Build Plugin Zip (pull_request) Skipped
CI / PHPStan (pull_request) Successful in 2m49s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m44s
CI / Tests (PHP 8.1) (pull_request) Successful in 1m0s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m0s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 3m8s
CI / Build Plugin Zip (pull_request) Skipped
CI / PHPStan (pull_request) Successful in 2m49s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m44s
Five items from the latest demo pass: - A policy's title can be edited from the Policies screen. Only the title moves; the slug is what the gates resolve policies by, so a rename can never detach a policy from acceptances already recorded against it. - Signup is one page again. The studio's registration questions move from a second step behind "Next" onto the main form, in an "About you" panel above the students being added, and that panel also asks an adult student for their birth year (the same us_birth_year meta a child's uses). register.js disables and hides the whole panel for a pure guardian, since the questions describe a student. - The password is re-scored on submit, not only as it is typed. zxcvbn's dictionary arrives after page load, so a password typed straight away was never scored at all and the first the student heard of it was the server rejecting the whole form. - Group-class sessions appear alongside lessons wherever upcoming lessons are listed: the [us_scheduler] panel (students and instructors) and the admin student detail page. GroupClass\SessionSchedule derives them from Offering::sessionWindows(), the same derivation the billing scan uses. They carry kind = 'group_class' and no Cancel action - a session is one date in a term, not a booked slot. - Deleting a user releases what the account was holding: each upcoming lesson is cancelled, its slot freed for rebooking, its pending payment voided, and active class enrolments cancelled. Past lessons and paid history are left alone. Tests: composer test (851), composer lint, composer cs all pass. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
@@ -11,6 +11,7 @@ use Unsupervised\Schedular\Booking\BookingEndpoint;
|
||||
use Unsupervised\Schedular\Booking\BookingRepository;
|
||||
use Unsupervised\Schedular\Booking\CancellationPolicy;
|
||||
use Unsupervised\Schedular\Booking\Lesson;
|
||||
use Unsupervised\Schedular\GroupClass\SessionSchedule;
|
||||
use Unsupervised\Schedular\Guardian\GuardianService;
|
||||
use Unsupervised\Schedular\Offering\Offering;
|
||||
use Unsupervised\Schedular\Offering\OfferingRepository;
|
||||
@@ -30,6 +31,7 @@ class BookingEndpointTest extends TestCase
|
||||
private RegistrationGate $gate;
|
||||
private PaymentService $payments;
|
||||
private StudioSettings $settings;
|
||||
private SessionSchedule&Mockery\MockInterface $sessions;
|
||||
private BookingEndpoint $endpoint;
|
||||
|
||||
protected function setUp(): void
|
||||
@@ -63,6 +65,11 @@ class BookingEndpointTest extends TestCase
|
||||
$this->guardians->shouldReceive('householdIds')->andReturnUsing(static fn (int $id): array => [$id])->byDefault();
|
||||
$this->guardians->shouldReceive('studentName')->andReturn('Ada')->byDefault();
|
||||
|
||||
$this->sessions = Mockery::mock(SessionSchedule::class);
|
||||
// Most tests are about one-to-one lessons; the group-class ones say so.
|
||||
$this->sessions->shouldReceive('upcomingForStudent')->andReturn([])->byDefault();
|
||||
$this->sessions->shouldReceive('upcomingForInstructor')->andReturn([])->byDefault();
|
||||
|
||||
$this->endpoint = new BookingEndpoint(
|
||||
$this->availability,
|
||||
$this->bookings,
|
||||
@@ -71,6 +78,7 @@ class BookingEndpointTest extends TestCase
|
||||
$this->payments,
|
||||
new CancellationPolicy($this->settings),
|
||||
$this->guardians,
|
||||
$this->sessions,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -796,4 +804,93 @@ class BookingEndpointTest extends TestCase
|
||||
self::assertSame([77, 78], array_column($data, 'id'));
|
||||
self::assertSame(['Ada', 'Grace'], array_column($data, 'student_name'));
|
||||
}
|
||||
|
||||
/**
|
||||
* A group class has no availability slot behind it, so it never appeared in
|
||||
* this list at all — a student whose whole term was a group class saw an
|
||||
* empty schedule. Its sessions now sort in among the booked lessons.
|
||||
*/
|
||||
public function testMyLessonsInterleavesGroupClassSessionsWithLessons(): void
|
||||
{
|
||||
Functions\when('current_user_can')->justReturn(false);
|
||||
|
||||
$this->guardians->shouldReceive('householdIds')->with(5)->andReturn([5]);
|
||||
$this->guardians->shouldReceive('studentName')->with(5)->andReturn('Grace');
|
||||
|
||||
// Slot 10 starts 2026-07-01 10:00 (the fixture), so the class on
|
||||
// 2026-06-30 comes first and the one on 2026-07-07 last.
|
||||
$lesson = new Lesson(slotId: 10, studentId: 5, instructorId: 3, status: Lesson::STATUS_CONFIRMED, id: 78);
|
||||
$this->bookings->shouldReceive('findUpcomingForStudent')->with(5)->andReturn([$lesson]);
|
||||
$this->availability->shouldReceive('findById')->with(10)->andReturn($this->slot(10, 3, null));
|
||||
|
||||
$this->sessions->shouldReceive('upcomingForStudent')->with(5, '2026-06-01 10:00:00')->andReturn([
|
||||
[
|
||||
'enrollment_id' => 40,
|
||||
'offering_id' => 8,
|
||||
'offering_title' => 'Choir',
|
||||
'instructor_id' => 3,
|
||||
'status' => 'active',
|
||||
'start_dt' => '2026-06-30 16:00:00',
|
||||
'end_dt' => '2026-06-30 17:00:00',
|
||||
'duration_minutes' => 60,
|
||||
],
|
||||
[
|
||||
'enrollment_id' => 40,
|
||||
'offering_id' => 8,
|
||||
'offering_title' => 'Choir',
|
||||
'instructor_id' => 3,
|
||||
'status' => 'active',
|
||||
'start_dt' => '2026-07-07 16:00:00',
|
||||
'end_dt' => '2026-07-07 17:00:00',
|
||||
'duration_minutes' => 60,
|
||||
],
|
||||
]);
|
||||
|
||||
$data = $this->endpoint->myLessons(new \WP_REST_Request([]))->get_data();
|
||||
|
||||
self::assertSame(
|
||||
['2026-06-30 16:00:00', '2026-07-01 10:00:00', '2026-07-07 16:00:00'],
|
||||
array_column($data, 'start_dt')
|
||||
);
|
||||
|
||||
// `kind` is what lets the panel withhold a Cancel button from a session
|
||||
// that is a date in a term rather than a booked slot. A lesson carries no
|
||||
// `kind` at all, which is the absence the panel reads as "cancellable".
|
||||
self::assertSame('group_class', $data[0]['kind']);
|
||||
self::assertSame('group_class', $data[2]['kind']);
|
||||
self::assertSame('Choir', $data[0]['offering_title']);
|
||||
self::assertSame('Grace', $data[0]['student_name']);
|
||||
self::assertArrayNotHasKey('kind', $data[1]);
|
||||
}
|
||||
|
||||
/**
|
||||
* An instructor's own group classes join their schedule the same way, and
|
||||
* one session is one row however many students are enrolled in it.
|
||||
*/
|
||||
public function testMyLessonsAddsAnInstructorsOwnGroupClassSessions(): void
|
||||
{
|
||||
Functions\when('current_user_can')->justReturn(true);
|
||||
|
||||
$this->bookings->shouldReceive('findUpcomingForInstructor')->with(5)->andReturn([]);
|
||||
$this->sessions->shouldReceive('upcomingForInstructor')->with(5, '2026-06-01 10:00:00')->andReturn([
|
||||
[
|
||||
'enrollment_id' => 0,
|
||||
'offering_id' => 8,
|
||||
'offering_title' => 'Choir',
|
||||
'instructor_id' => 5,
|
||||
'status' => 'active',
|
||||
'start_dt' => '2026-06-30 16:00:00',
|
||||
'end_dt' => '2026-06-30 17:00:00',
|
||||
'duration_minutes' => 60,
|
||||
],
|
||||
]);
|
||||
|
||||
$data = $this->endpoint->myLessons(new \WP_REST_Request([]))->get_data();
|
||||
|
||||
self::assertCount(1, $data);
|
||||
self::assertSame('group_class', $data[0]['kind']);
|
||||
self::assertSame('Choir', $data[0]['offering_title']);
|
||||
// Nobody's name: the row is the class, not one student's place in it.
|
||||
self::assertArrayNotHasKey('student_name', $data[0]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user