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]>
118 lines
4.9 KiB
PHP
118 lines
4.9 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular\Tests\Unit\Offering;
|
|
|
|
use Brain\Monkey\Functions;
|
|
use Mockery;
|
|
use Unsupervised\Schedular\GroupClass\GroupAccessRepository;
|
|
use Unsupervised\Schedular\Offering\Offering;
|
|
use Unsupervised\Schedular\Offering\OfferingEndpoint;
|
|
use Unsupervised\Schedular\Offering\OfferingRepository;
|
|
use Unsupervised\Schedular\Tests\Unit\TestCase;
|
|
|
|
class OfferingEndpointTest extends TestCase
|
|
{
|
|
private OfferingRepository&Mockery\MockInterface $repository;
|
|
private GroupAccessRepository&Mockery\MockInterface $access;
|
|
private OfferingEndpoint $endpoint;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
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);
|
|
$this->endpoint = new OfferingEndpoint($this->repository, $this->access);
|
|
}
|
|
|
|
private function group(int $id, string $access): Offering
|
|
{
|
|
return new Offering(instructorId: 3, kind: Offering::KIND_GROUP_CLASS, title: "Class $id", accessMode: $access, id: $id);
|
|
}
|
|
|
|
public function testIndexReturnsPublicOfferingsOnlyWhenNoGrants(): void
|
|
{
|
|
$this->repository->shouldReceive('findAll')
|
|
->once()
|
|
->with(0, '', Mockery::on(static fn ($v): bool => true === $v), Offering::ACCESS_PUBLIC)
|
|
->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::assertCount(1, $data);
|
|
self::assertSame(1, $data[0]['id']);
|
|
}
|
|
|
|
public function testIndexMergesGrantedInviteOnlyOfferings(): void
|
|
{
|
|
$this->repository->shouldReceive('findAll')
|
|
->once()
|
|
->with(0, '', Mockery::any(), Offering::ACCESS_PUBLIC)
|
|
->andReturn([$this->group(1, Offering::ACCESS_PUBLIC)]);
|
|
$this->access->shouldReceive('findGrantedOfferingIds')->with(5)->andReturn([8]);
|
|
$this->repository->shouldReceive('findById')->with(8)->andReturn($this->group(8, Offering::ACCESS_INVITE_ONLY));
|
|
|
|
$data = $this->endpoint->index(new \WP_REST_Request())->get_data();
|
|
|
|
self::assertSame([1, 8], array_column($data, 'id'));
|
|
}
|
|
|
|
public function testIndexOmitsGrantedOfferingThatIsNoLongerInviteOnly(): void
|
|
{
|
|
$this->repository->shouldReceive('findAll')->andReturn([]);
|
|
$this->access->shouldReceive('findGrantedOfferingIds')->with(5)->andReturn([8]);
|
|
// Grant persists but the class was flipped back to public — it is already
|
|
// in the public list, so it must not be appended a second time.
|
|
$this->repository->shouldReceive('findById')->with(8)->andReturn($this->group(8, Offering::ACCESS_PUBLIC));
|
|
|
|
$data = $this->endpoint->index(new \WP_REST_Request())->get_data();
|
|
|
|
self::assertSame([], $data);
|
|
}
|
|
|
|
public function testIndexRespectsKindFilterForGrantedOfferings(): void
|
|
{
|
|
$this->repository->shouldReceive('findAll')
|
|
->with(0, Offering::KIND_PRIVATE_LESSON, Mockery::any(), Offering::ACCESS_PUBLIC)
|
|
->andReturn([]);
|
|
$this->access->shouldReceive('findGrantedOfferingIds')->with(5)->andReturn([8]);
|
|
// Granted class is a group class; the request filters to private lessons.
|
|
$this->repository->shouldReceive('findById')->with(8)->andReturn($this->group(8, Offering::ACCESS_INVITE_ONLY));
|
|
|
|
$data = $this->endpoint->index(new \WP_REST_Request(['kind' => Offering::KIND_PRIVATE_LESSON]))->get_data();
|
|
|
|
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([
|
|
new Offering(instructorId: 3, kind: Offering::KIND_GROUP_CLASS, title: 'Choir', etransferEmail: '[email protected]', id: 1),
|
|
]);
|
|
$this->access->shouldReceive('findGrantedOfferingIds')->with(5)->andReturn([]);
|
|
|
|
$data = $this->endpoint->index(new \WP_REST_Request())->get_data();
|
|
|
|
self::assertArrayNotHasKey('etransfer_email', $data[0]);
|
|
}
|
|
}
|