thatguygriffandClaude Opus 4.8
b066bef353
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]>
123 lines
4.3 KiB
PHP
123 lines
4.3 KiB
PHP
<?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);
|
|
}
|
|
}
|