Add group-class scheduling, instructor assignment, and details/invite management
CI / Tests (PHP 8.2) (pull_request) Successful in 39s
CI / Tests (PHP 8.1) (pull_request) Successful in 46s
CI / No Debug Code (pull_request) Successful in 2s
CI / Coding Standards (pull_request) Successful in 2m52s
CI / PHPStan (pull_request) Successful in 2m50s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m36s
CI / Build Plugin Zip (pull_request) Skipped
CI / Tests (PHP 8.2) (pull_request) Successful in 39s
CI / Tests (PHP 8.1) (pull_request) Successful in 46s
CI / No Debug Code (pull_request) Successful in 2s
CI / Coding Standards (pull_request) Successful in 2m52s
CI / PHPStan (pull_request) Successful in 2m50s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m36s
CI / Build Plugin Zip (pull_request) Skipped
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]>
This commit is contained in:
@@ -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]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user