CI / Tests (PHP 8.1) (pull_request) Successful in 44s
CI / Tests (PHP 8.2) (pull_request) Successful in 59s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 2m53s
CI / PHPStan (pull_request) Successful in 2m55s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m41s
CI / Build Plugin Zip (pull_request) Skipped
Group classes now carry an optional per-class withdrawal deadline. Up to
that day a student may withdraw themselves from the class; the withdrawal
frees the seat and voids any pending payment but never issues an account
credit. After the deadline self-withdrawal closes and a studio admin must
withdraw the student by hand (the admin path is never subject to the
deadline). A blank deadline keeps self-withdrawal open indefinitely.
Also make the Add/Edit Offering form show only the fields relevant to the
selected kind: group settings for group classes, weekly reservation for
private lessons. Progressive enhancement — without JS every field renders.
- New nullable us_offerings.withdrawal_deadline column; Offering model gains
$withdrawalDeadline + isWithdrawalOpen().
- New student endpoint POST /enrollments/{id}/withdraw, gated by the deadline
(403 withdrawal_closed), ownership-checked, idempotent.
- Front-end group-class page shows a Withdraw button while open.
- No USC_VERSION bump: 1.2.0 is unreleased and accumulates schema changes
under its section, matching the scheduled-billing and credit features.
Tests: composer test (596), composer lint, composer cs all pass.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
132 lines
3.9 KiB
PHP
132 lines
3.9 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular\Offering;
|
|
|
|
class OfferingRepository {
|
|
|
|
private string $table;
|
|
|
|
public function __construct( private \wpdb $db ) {
|
|
$this->table = $db->prefix . 'us_offerings';
|
|
}
|
|
|
|
/**
|
|
* Column formats aligned to {@see columns()} (instructor_id, kind, title,
|
|
* description, duration_minutes, price, currency, billing_mode, allow_weekly,
|
|
* capacity, term_start, term_end, class_time, enrollment_deadline,
|
|
* withdrawal_deadline, schedule_note, etransfer_email,
|
|
* cancellation_cutoff_hours, access_mode, is_active).
|
|
*
|
|
* @var list<string>
|
|
*/
|
|
private const COLUMN_FORMATS = [ '%d', '%s', '%s', '%s', '%d', '%f', '%s', '%s', '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%s', '%d' ];
|
|
|
|
public function insert( Offering $offering ): int {
|
|
$this->db->insert(
|
|
$this->table,
|
|
$this->columns( $offering ) + [ 'created_at' => current_time( 'mysql' ) ],
|
|
[ ...self::COLUMN_FORMATS, '%s' ]
|
|
);
|
|
|
|
return $this->db->insert_id;
|
|
}
|
|
|
|
public function update( int $id, Offering $offering ): bool {
|
|
return false !== $this->db->update(
|
|
$this->table,
|
|
$this->columns( $offering ),
|
|
[ 'id' => $id ],
|
|
self::COLUMN_FORMATS,
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Column values shared by insert and update (excludes created_at).
|
|
*
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function columns( Offering $offering ): array {
|
|
return [
|
|
'instructor_id' => $offering->instructorId,
|
|
'kind' => $offering->kind,
|
|
'title' => $offering->title,
|
|
'description' => $offering->description,
|
|
'duration_minutes' => $offering->durationMinutes,
|
|
'price' => $offering->price,
|
|
'currency' => $offering->currency,
|
|
'billing_mode' => $offering->billingMode,
|
|
'allow_weekly' => $offering->allowWeekly ? 1 : 0,
|
|
'capacity' => $offering->capacity,
|
|
'term_start' => $offering->termStart,
|
|
'term_end' => $offering->termEnd,
|
|
'class_time' => $offering->classTime,
|
|
'enrollment_deadline' => $offering->enrollmentDeadline,
|
|
'withdrawal_deadline' => $offering->withdrawalDeadline,
|
|
'schedule_note' => $offering->scheduleNote,
|
|
'etransfer_email' => $offering->etransferEmail,
|
|
'cancellation_cutoff_hours' => $offering->cancellationCutoffHours,
|
|
'access_mode' => $offering->accessMode,
|
|
'is_active' => $offering->isActive ? 1 : 0,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Find offerings, optionally filtered by instructor, kind, active state, and
|
|
* access mode (e.g. `Offering::ACCESS_PUBLIC` to exclude invite-only classes
|
|
* from the public catalogue).
|
|
*
|
|
* @return list<Offering>
|
|
*/
|
|
public function findAll( int $instructorId = 0, string $kind = '', ?bool $activeOnly = null, ?string $accessMode = null ): array {
|
|
$where = [ '1 = 1' ];
|
|
$params = [];
|
|
|
|
if ( $instructorId > 0 ) {
|
|
$where[] = 'instructor_id = %d';
|
|
$params[] = $instructorId;
|
|
}
|
|
|
|
if ( '' !== $kind ) {
|
|
$where[] = 'kind = %s';
|
|
$params[] = $kind;
|
|
}
|
|
|
|
if ( null !== $activeOnly ) {
|
|
$where[] = 'is_active = %d';
|
|
$params[] = $activeOnly ? 1 : 0;
|
|
}
|
|
|
|
if ( null !== $accessMode ) {
|
|
$where[] = 'access_mode = %s';
|
|
$params[] = $accessMode;
|
|
}
|
|
|
|
$whereClause = implode( ' AND ', $where );
|
|
$sql = "SELECT * FROM %i WHERE {$whereClause} ORDER BY title ASC";
|
|
|
|
$rows = $this->db->get_results(
|
|
$this->db->prepare( $sql, array_merge( [ $this->table ], $params ) )
|
|
);
|
|
|
|
return array_map( Offering::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
public function findById( int $id ): ?Offering {
|
|
$row = $this->db->get_row(
|
|
$this->db->prepare( 'SELECT * FROM %i WHERE id = %d', $this->table, $id )
|
|
);
|
|
|
|
return $row ? Offering::fromRow( $row ) : null;
|
|
}
|
|
|
|
public function delete( int $id ): bool {
|
|
return (bool) $this->db->delete(
|
|
$this->table,
|
|
[ 'id' => $id ],
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
}
|