CI / Tests (PHP 8.1) (pull_request) Successful in 6m39s
CI / Tests (PHP 8.2) (pull_request) Successful in 57s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m59s
CI / Tests (PHP 8.5) (pull_request) Successful in 3m31s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards & Static Analysis (pull_request) Successful in 3m28s
CI / Build Plugin Zip (pull_request) Skipped
Two related gaps, closed together because the second is created by the first. A private lesson could only be booked by the student or their guardian, so a booking taken over the phone had no way in — where group classes have had "Add students directly" all along. "Book a lesson for a student" is now a panel on Scheduler and My Lessons: student, open time, lesson type, with weekly term reservations and a no-charge option for make-up lessons. The booking core is extracted to Booking\LessonBooker and shared with POST /bookings, so the two paths cannot drift on offering rules, slot claiming, or billing. That leaves a registration with no intake answers and no policy acceptances, because nobody was at a keyboard to give them — already true of every directly added group-class student. Ticking the boxes on a student's behalf would be an audit trail that says something untrue, so instead the answers are collected another way and recorded afterwards, from a lesson's or an enrolment's detail page. Every recording must say how it was collected, which is stamped on each row along with who typed it and shown in a new "How it was given" column: a policy ticked online and one transcribed from paper must never look alike. Only staff-made registrations qualify (us_lessons.booked_by, us_group_enrollments.enrolled_by) — one the student made already holds their own answers. Only what is still missing can be recorded, re-checked at write time, so a stale or double-posted form cannot duplicate or overwrite. No IP is stored for a transcription, and accepted_by stays the student while recorded_by names the staff member. Intake is now generic over Registration\IntakeSubject, which Lesson and Enrollment both implement; LessonDetail became Registration\IntakeAudit and is shared by both detail views rather than duplicated. Closes #182 Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01QfHt6CyJHz6KkA4RuaS7WK
193 lines
4.7 KiB
PHP
193 lines
4.7 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular\GroupClass;
|
|
|
|
class EnrollmentRepository {
|
|
|
|
private string $table;
|
|
|
|
public function __construct( private \wpdb $db ) {
|
|
$this->table = $db->prefix . 'us_group_enrollments';
|
|
}
|
|
|
|
public function insert( Enrollment $enrollment ): int {
|
|
$this->db->insert(
|
|
$this->table,
|
|
[
|
|
'offering_id' => $enrollment->offeringId,
|
|
'student_id' => $enrollment->studentId,
|
|
'instructor_id' => $enrollment->instructorId,
|
|
'status' => $enrollment->status,
|
|
'payment_id' => $enrollment->paymentId,
|
|
'enrolled_by' => $enrollment->enrolledBy,
|
|
'enrolled_at' => current_time( 'mysql' ),
|
|
],
|
|
[ '%d', '%d', '%d', '%s', '%d', '%d', '%s' ]
|
|
);
|
|
|
|
return $this->db->insert_id;
|
|
}
|
|
|
|
public function findById( int $id ): ?Enrollment {
|
|
$row = $this->db->get_row(
|
|
$this->db->prepare( 'SELECT * FROM %i WHERE id = %d', $this->table, $id )
|
|
);
|
|
|
|
return $row ? Enrollment::fromRow( $row ) : null;
|
|
}
|
|
|
|
/**
|
|
* Count active enrolments for an offering (capacity check).
|
|
*/
|
|
public function countActiveForOffering( int $offeringId ): int {
|
|
return (int) $this->db->get_var(
|
|
$this->db->prepare(
|
|
'SELECT COUNT(*) FROM %i WHERE offering_id = %d AND status = %s',
|
|
$this->table,
|
|
$offeringId,
|
|
Enrollment::STATUS_ACTIVE
|
|
)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Count a student's active group-class enrolments.
|
|
*/
|
|
public function countActiveForStudent( int $studentId ): int {
|
|
return (int) $this->db->get_var(
|
|
$this->db->prepare(
|
|
'SELECT COUNT(*) FROM %i WHERE student_id = %d AND status = %s',
|
|
$this->table,
|
|
$studentId,
|
|
Enrollment::STATUS_ACTIVE
|
|
)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Whether a student already holds an active enrolment in an offering.
|
|
*/
|
|
public function hasActiveEnrollment( int $offeringId, int $studentId ): bool {
|
|
$count = (int) $this->db->get_var(
|
|
$this->db->prepare(
|
|
'SELECT COUNT(*) FROM %i WHERE offering_id = %d AND student_id = %d AND status = %s',
|
|
$this->table,
|
|
$offeringId,
|
|
$studentId,
|
|
Enrollment::STATUS_ACTIVE
|
|
)
|
|
);
|
|
|
|
return $count > 0;
|
|
}
|
|
|
|
/**
|
|
* A student's enrolments, newest first.
|
|
*
|
|
* @return list<Enrollment>
|
|
*/
|
|
public function findByStudent( int $studentId ): array {
|
|
$rows = $this->db->get_results(
|
|
$this->db->prepare(
|
|
'SELECT * FROM %i WHERE student_id = %d ORDER BY enrolled_at DESC',
|
|
$this->table,
|
|
$studentId
|
|
)
|
|
);
|
|
|
|
return array_map( Enrollment::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
/**
|
|
* Enrolments in an instructor's group classes, newest first.
|
|
*
|
|
* @return list<Enrollment>
|
|
*/
|
|
public function findByInstructor( int $instructorId ): array {
|
|
$rows = $this->db->get_results(
|
|
$this->db->prepare(
|
|
'SELECT * FROM %i WHERE instructor_id = %d ORDER BY enrolled_at DESC',
|
|
$this->table,
|
|
$instructorId
|
|
)
|
|
);
|
|
|
|
return array_map( Enrollment::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
/**
|
|
* All active enrolments across instructors (studio-admin view).
|
|
*
|
|
* @return list<Enrollment>
|
|
*/
|
|
public function findAllActive(): array {
|
|
$rows = $this->db->get_results(
|
|
$this->db->prepare(
|
|
'SELECT * FROM %i WHERE status = %s ORDER BY enrolled_at DESC',
|
|
$this->table,
|
|
Enrollment::STATUS_ACTIVE
|
|
)
|
|
);
|
|
|
|
return array_map( Enrollment::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
/**
|
|
* Active enrolments whose group class bills on a scheduled mode (weekly /
|
|
* monthly) — the source rows for the daily billing scan. Filtered by joining
|
|
* the offering so only classes actually on a scheduled plan are returned.
|
|
*
|
|
* @param list<string> $modes Billing modes to include (e.g. weekly, monthly).
|
|
* @return list<Enrollment>
|
|
*/
|
|
public function findActiveByBillingModes( array $modes ): array {
|
|
if ( [] === $modes ) {
|
|
return [];
|
|
}
|
|
|
|
$offTable = str_replace( 'us_group_enrollments', 'us_offerings', $this->table );
|
|
$placeholders = implode( ', ', array_fill( 0, count( $modes ), '%s' ) );
|
|
|
|
$rows = $this->db->get_results(
|
|
$this->db->prepare(
|
|
"SELECT e.* FROM %i e
|
|
JOIN %i o ON o.id = e.offering_id
|
|
WHERE e.status = %s
|
|
AND o.billing_mode IN ( {$placeholders} )
|
|
ORDER BY e.student_id ASC, e.offering_id ASC",
|
|
$this->table,
|
|
$offTable,
|
|
Enrollment::STATUS_ACTIVE,
|
|
...$modes
|
|
)
|
|
);
|
|
|
|
return array_map( Enrollment::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
public function setPaymentId( int $id, int $paymentId ): bool {
|
|
return false !== $this->db->update(
|
|
$this->table,
|
|
[ 'payment_id' => $paymentId ],
|
|
[ 'id' => $id ],
|
|
[ '%d' ],
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
|
|
public function updateStatus( int $id, string $status ): bool {
|
|
if ( ! in_array( $status, Enrollment::VALID_STATUSES, true ) ) {
|
|
return false;
|
|
}
|
|
|
|
return (bool) $this->db->update(
|
|
$this->table,
|
|
[ 'status' => $status ],
|
|
[ 'id' => $id ],
|
|
[ '%s' ],
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
}
|