CI / Tests (PHP 8.1) (pull_request) Successful in 47s
CI / Tests (PHP 8.2) (pull_request) Successful in 46s
CI / No Debug Code (pull_request) Successful in 3s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m37s
CI / PHPStan (pull_request) Successful in 2m52s
CI / Coding Standards (pull_request) Successful in 3m6s
CI / Build Plugin Zip (pull_request) Skipped
Three registration fixes reported from live use:
- Accepting an invite now keeps the student signed in. The form was
processed inside render() during the_content, so wp_set_auth_cookie()
ran after headers were sent and the cookie never persisted — the new
student was bounced back to the logged-out registration page. The
submission is now handled on template_redirect (before output) with a
post/redirect/get, so the cookie sticks and the student lands logged in.
- The "registration is by invitation only" message is now customisable via
a new block attribute (inviteOnlyMessage / shortcode invite_only_message),
falling back to the default wording when blank.
- Account-registration questions save again. dbDelta does not reliably
relax a column from NOT NULL to NULL, so sites created before account-
scope questions kept us_questions.offering_id NOT NULL and rejected
account inserts ("Column 'offering_id' cannot be null"). A one-time,
self-healing migration (guarded by its own option, not the version gate)
re-applies the nullable definition on next load.
composer test, composer lint, composer cs all pass.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
132 lines
3.6 KiB
PHP
132 lines
3.6 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular\Registration;
|
|
|
|
class QuestionRepository {
|
|
|
|
private string $table;
|
|
|
|
public function __construct( private \wpdb $db ) {
|
|
$this->table = $db->prefix . 'us_questions';
|
|
}
|
|
|
|
public function insert( Question $question ): int {
|
|
$this->db->insert(
|
|
$this->table,
|
|
$this->columns( $question ) + [ 'created_at' => current_time( 'mysql' ) ],
|
|
[ '%d', '%s', '%s', '%s', '%s', '%d', '%d', '%d', '%s' ]
|
|
);
|
|
|
|
return $this->db->insert_id;
|
|
}
|
|
|
|
public function update( int $id, Question $question ): bool {
|
|
return false !== $this->db->update(
|
|
$this->table,
|
|
$this->columns( $question ),
|
|
[ 'id' => $id ],
|
|
[ '%d', '%s', '%s', '%s', '%s', '%d', '%d', '%d' ],
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Column values shared by insert and update (excludes created_at).
|
|
*
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function columns( Question $question ): array {
|
|
return [
|
|
'offering_id' => $question->offeringId,
|
|
'scope' => $question->scope,
|
|
'label' => $question->label,
|
|
'field_type' => $question->fieldType,
|
|
'options' => null === $question->options ? null : (string) wp_json_encode( $question->options ),
|
|
'is_required' => $question->isRequired ? 1 : 0,
|
|
'sort_order' => $question->sortOrder,
|
|
'is_active' => $question->isActive ? 1 : 0,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Find questions for an offering, ordered for display.
|
|
*
|
|
* @return list<Question>
|
|
*/
|
|
public function findByOffering( int $offeringId, bool $activeOnly = false ): array {
|
|
$sql = 'SELECT * FROM %i WHERE offering_id = %d';
|
|
$params = [ $this->table, $offeringId ];
|
|
|
|
if ( $activeOnly ) {
|
|
$sql .= ' AND is_active = %d';
|
|
$params[] = 1;
|
|
}
|
|
|
|
$sql .= ' ORDER BY sort_order ASC, id ASC';
|
|
|
|
$rows = $this->db->get_results( $this->db->prepare( $sql, $params ) );
|
|
|
|
return array_map( Question::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
/**
|
|
* Find questions for a scope (e.g. account-signup), ordered for display.
|
|
*
|
|
* @return list<Question>
|
|
*/
|
|
public function findByScope( string $scope, bool $activeOnly = false ): array {
|
|
$sql = 'SELECT * FROM %i WHERE scope = %s';
|
|
$params = [ $this->table, $scope ];
|
|
|
|
if ( $activeOnly ) {
|
|
$sql .= ' AND is_active = %d';
|
|
$params[] = 1;
|
|
}
|
|
|
|
$sql .= ' ORDER BY sort_order ASC, id ASC';
|
|
|
|
$rows = $this->db->get_results( $this->db->prepare( $sql, $params ) );
|
|
|
|
return array_map( Question::fromRow( ... ), $rows ?? [] );
|
|
}
|
|
|
|
public function findById( int $id ): ?Question {
|
|
$row = $this->db->get_row(
|
|
$this->db->prepare( 'SELECT * FROM %i WHERE id = %d', $this->table, $id )
|
|
);
|
|
|
|
return $row ? Question::fromRow( $row ) : null;
|
|
}
|
|
|
|
public function delete( int $id ): bool {
|
|
return (bool) $this->db->delete(
|
|
$this->table,
|
|
[ 'id' => $id ],
|
|
[ '%d' ]
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Relax `offering_id` to allow NULL for account-scope questions (which are
|
|
* not tied to an offering).
|
|
*
|
|
* The account-questions feature (v1.1.0) made the column nullable in the
|
|
* schema, but dbDelta does not reliably change a column from NOT NULL to
|
|
* NULL, so sites created before then keep the old NOT NULL column and reject
|
|
* account-scope inserts with "Column 'offering_id' cannot be null". This
|
|
* MODIFY is idempotent — re-applying the nullable definition is a no-op.
|
|
*
|
|
* @return bool True when the statement ran (or was already applied), false
|
|
* if it could not be prepared or the query failed.
|
|
*/
|
|
public function ensureOfferingNullable(): bool {
|
|
$sql = $this->db->prepare(
|
|
'ALTER TABLE %i MODIFY offering_id BIGINT UNSIGNED NULL DEFAULT NULL',
|
|
$this->table
|
|
);
|
|
|
|
return null !== $sql && false !== $this->db->query( $sql );
|
|
}
|
|
}
|