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]>
11 KiB
Feature: Group Classes
Overview
Students enrol in a group class — an offering of kind group_class — as a commitment for the year. Enrolment is capacity-enforced and billed full-term upfront. Registration reuses the same flow as private lessons (intake questions + policy acceptance + payment).
A group class can be marked invite-only (us_offerings.access_mode = invite_only, see offerings.md). Invite-only classes are hidden from the public catalog — they never appear in the student booking/group-class list — and can only be enrolled in by students the instructor has let in. See Invite-only access below.
Data Model — {prefix}us_group_enrollments
| Column | Type | Notes |
|---|---|---|
id |
BIGINT UNSIGNED | Primary key |
offering_id |
BIGINT UNSIGNED | FK → us_offerings.id (kind = group_class) |
student_id |
BIGINT UNSIGNED | WordPress user ID |
instructor_id |
BIGINT UNSIGNED | WordPress user ID (denormalised from the offering) |
status |
VARCHAR(20) | active / cancelled / completed |
payment_id |
BIGINT UNSIGNED | Nullable FK → us_payments.id |
enrolled_at |
DATETIME | Insertion time |
Class Dates, Time, and Instructor
A group class offering carries term_start/term_end plus a class_time and an
owning instructor_id (see offerings.md): one-off classes end the day they
start; weekly classes run a set number of sessions, all at class_time. The class
card on the enrolment page shows when the class meets (the date or date range
plus the start time) and who teaches it (the assigned instructor's display
name, surfaced as instructor_name on the GET /offerings response).
Assigning an instructor to a scheduled class removes that instructor's open
booking slots at the class time and flags any already-booked lesson that clashes;
see Instructor assignment in offerings.md.
Enrolment Flow
The class list is loaded together with the student's own enrolments
(GET /enrollments); a class the student already has an active enrolment in
shows "You are enrolled in this class." instead of the Enrol button (the
server would reject the duplicate with 409 already_enrolled regardless — a
cancelled enrolment does not block re-enrolling).
- Student opens a group class from the offering catalog.
- Student answers the offering's questions (
GET /offerings/{id}/questions). - Student accepts the current published policy versions (
GET /policies) — required to continue. - Full-term payment is taken per the student's billing method (card by default;
pendingfor e-transfer; skipped for comp). Seepayments.md. POST /enrollmentscreates the enrolment (status = active), records answers and policy acceptances, and links the payment — but only if the offering'scapacityhas not been reached.- On successful payment (or comp) a receipt is emailed.
Capacity is enforced at enrolment time by counting active rows for the offering;
a class at capacity rejects further enrolments.
REST API
| Method | Endpoint | Permission |
|---|---|---|
GET |
/wp-json/us-scheduler/v1/enrollments |
Any logged-in user |
POST |
/wp-json/us-scheduler/v1/enrollments |
book_lesson |
POST /enrollments body: offering_id, answers[] (question_id → value),
accepted_policy_version_ids[], and payment data (see payments.md). The
response includes id, status, and payment — a {id, method, status}
summary, or null when the class is free (the front end then skips the
payment step).
GET /enrollments returns the caller's own enrolments, or all enrolments for the
instructor's group classes if the caller has view_own_lessons on those offerings.
GET /offerings (the catalog that feeds the group-class list) returns public
offerings plus any invite-only offerings the caller has an access grant for, so a
granted student sees the private class alongside public ones. Ungranted students never
receive it. Enrolling in an invite-only class requires a grant: POST /enrollments
rejects an ungranted student with 403 invite_required, and a successful enrolment
flips their grant from invited to enrolled.
Invite-only access
Access to an invite-only class is recorded in {prefix}us_group_access — a grant per
person, separate from the enrolment itself. The instructor manages access from
My Lessons → My Group Classes, which renders three controls under each invite-only
class:
- Add students directly — the selected registered students are enrolled immediately
(
status = active) with a pending payment at the class price (comp students are settled at once byPaymentService). No access grant is needed — this writes straight tous_group_enrollments+us_payments. - Make available — the selected registered students get an
invitedgrant so the class appears in their own group-class list; they then self-enrol through the normal paid flow. Each is emailed a "you've been added" notice. - Invite by email — for an address with no account yet: a tokenised personal invite
(
us_invites, carryingoffering_id) is created and the registration link emailed, alongside aninvitedgrant keyed byemail+invite_id. If the address already has a pending invite, the grant is attached to that invite and no second link is sent. An address that already has an account is treated as Make available instead.
When an email-invited person completes registration, RegistrationPage links their new
account to the grant (GroupAccessRepository::linkStudentByEmail), so the invite-only
class becomes enrollable for them — they choose whether to enrol.
Data Model — {prefix}us_group_access
| Column | Type | Notes |
|---|---|---|
id |
BIGINT UNSIGNED | Primary key |
offering_id |
BIGINT UNSIGNED | FK → us_offerings.id (an invite-only group class) |
student_id |
BIGINT UNSIGNED | WordPress user ID; NULL until an email invitee registers |
email |
VARCHAR(191) | Email-invite grants only; used to link the account once it registers |
invite_id |
BIGINT UNSIGNED | FK → us_invites.id for email-invite grants; NULL otherwise |
status |
VARCHAR(20) | invited / enrolled / revoked |
invited_by |
BIGINT UNSIGNED | Instructor who granted access |
created_at |
DATETIME | Insertion time |
Admin Interface
- Group Classes (
view_all_lessons/ studio admin): a per-class summary across instructors — each class with its instructor, when it meets, and its active-enrolment count against capacity (not a flat list of individual student enrolments). Selecting a class (?class_id=<id>) opens the same per-class details page described below, so a studio admin — including an owner-operator who also teaches, for whom the instructor My Group Classes menu is hidden — can view any class's roster and manage invite-only membership from here. Invite actions are permitted for the class's own instructor or anyview_all_lessonsstudio admin. - My Lessons → My Group Classes (
view_own_lessons/ instructor): a summary of the instructor's own group classes — each with when it meets and its active-enrolment count against capacity, plus a View details link (View & invite for invite-only classes). Selecting a class (?class_id=<id>, scoped to the owning instructor) opens its details page: a class-details panel (when, instructor, enrolled/capacity, duration, price, schedule note, description, status), the roster of enrolled students with enrolment and payment status, and — for invite-only classes — an Invite & enrol students section listing who has been invited but not yet enrolled alongside the add/make-available/ invite-by-email controls (nonce-checkedusc_actionPOSTs, scoped to the owning instructor). Managing who is in an invite-only class is therefore done entirely from this page. The summary (templates/admin/my-group-classes.php) and the details page (templates/admin/my-group-class-detail.php) are separate templates.
Implementation
- Repository:
Unsupervised\Schedular\GroupClass\EnrollmentRepository(countActiveForOffering/hasActiveEnrollmentenforce capacity and prevent duplicates) - Access grants:
Unsupervised\Schedular\GroupClass\GroupAccess+GroupAccessRepository(hasGrant,findGrantedOfferingIds,markEnrolled,linkStudentByEmail) - Model:
Unsupervised\Schedular\GroupClass\Enrollment - Admin controller:
Unsupervised\Schedular\GroupClass\GroupClassController—renderPage(studio admin per-class summary,view_all_lessons) andrenderInstructorPage(instructor summary +?class_idroster detail,view_own_lessons) - REST endpoint:
Unsupervised\Schedular\GroupClass\EnrollmentEndpoint - Frontend:
Unsupervised\Schedular\GroupClass\GroupClassPage([us_group_classes]shortcode;offering="…"restricts it to a single class for embedding on a dedicated page — the block equivalent is theofferingIdattribute) - Reuses
Registration\RegistrationGate(intake answers + booking-scoped policy acceptance, typeenrollment)
Payment: a priced enrolment creates a payment via
Payment\PaymentService(registration_type = enrollment) and links it aspayment_id; unpriced enrolments returnpayment: nulland skip the payment step. Seepayments.mdfor the card/e-transfer/comp flows.
Tests
tests/Unit/GroupClass/GroupClassControllerTest.php(roster + add/make-available/invite actions)tests/Unit/GroupClass/EnrollmentTest.phptests/Unit/GroupClass/EnrollmentRepositoryTest.phptests/Unit/GroupClass/EnrollmentEndpointTest.php(invite-only gating)tests/Unit/GroupClass/GroupAccessTest.phptests/Unit/GroupClass/GroupAccessRepositoryTest.phptests/Unit/GroupClass/GroupClassPageTest.phptests/Unit/Offering/OfferingEndpointTest.php(catalog merges granted invite-only classes)