Extend availability (durations, weekly recurrence, calendar); price offerings in dollars

Availability (#2):
- us_availability gains offering_id, duration_minutes (default 60), and
  recurrence_group; AvailabilitySlot carries the new fields.
- AvailabilityRepository::createWeeklySeries() generates N weekly rows
  sharing a recurrence_group; findAvailable() filters by offering and
  duration. Date math uses DateTimeImmutable::modify() (the no-debug CI
  regex `dd\(` matches `->add(`).
- REST GET filters by offering_id/duration_minutes; POST accepts
  duration_minutes, offering_id, recurrence (single|weekly) + weeks.
- Admin form adds duration, an offering picker, and one-off/weekly options
  (OfferingRepository wired into AvailabilityController).
- booking.js renders an agenda calendar (slots grouped by day, with
  duration). The richer booking UX lands with the booking-flow work.

Offering price in dollars:
- Switch us_offerings.price_cents (INT) to price DECIMAL(10,2); Offering
  uses float $price. Admin form and REST take dollars.
- Fix a pre-existing misalignment in the Offering insert/update $wpdb
  format arrays (billing_mode/capacity/is_active were mapped to the wrong
  specifiers, which would corrupt values) via a single COLUMN_FORMATS list.

Also bump PHPStan to --memory-limit=1G in the lint script; 128M now
crashes analysis as the codebase has grown.

Refs #2

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

src/AdminMenu.php

@@ -26,7 +26,7 @@ class AdminMenu {
 	private PolicyController $policyController;
 
 	public function __construct( AvailabilityRepository $availability, BookingRepository $bookings, OfferingRepository $offerings, QuestionRepository $questions, PolicyRepository $policies, PolicyVersionRepository $policyVersions, PolicyService $policyService ) {
-		$this->availabilityController = new AvailabilityController( $availability );
+		$this->availabilityController = new AvailabilityController( $availability, $offerings );
 		$this->lessonController       = new LessonController( $bookings );
 		$this->offeringController     = new OfferingController( $offerings );
 		$this->questionController     = new QuestionController( $questions, $offerings );

src/Availability/AvailabilityController.php

@@ -4,10 +4,15 @@ declare(strict_types=1);
 namespace Unsupervised\Schedular\Availability;
 
 use Unsupervised\Schedular\Auth\RoleManager;
+use Unsupervised\Schedular\Offering\Offering;
+use Unsupervised\Schedular\Offering\OfferingRepository;
 
 class AvailabilityController {
 
-	public function __construct( private AvailabilityRepository $repository ) {}
+	public function __construct(
+		private AvailabilityRepository $repository,
+		private OfferingRepository $offerings,
+	) {}
 
 	public function renderPage(): void {
 		if ( ! current_user_can( RoleManager::CAP_MANAGE_AVAILABILITY ) ) {
@@ -20,7 +25,8 @@ class AvailabilityController {
 			$this->handleFormAction( $instructorId );
 		}
 
-		$slots = $this->repository->findByInstructor( $instructorId );
+		$slots           = $this->repository->findByInstructor( $instructorId );
+		$offeringChoices = $this->offerings->findAll( $instructorId, Offering::KIND_PRIVATE_LESSON, true );
 
 		include USC_PLUGIN_DIR . 'templates/admin/availability.php';
 	}
@@ -31,12 +37,7 @@ class AvailabilityController {
 		$action = sanitize_key( wp_unslash( $_POST['usc_action'] ?? '' ) );
 
 		if ( 'add' === $action ) {
-			$startDt = sanitize_text_field( wp_unslash( $_POST['start_dt'] ?? '' ) );
-			$endDt   = sanitize_text_field( wp_unslash( $_POST['end_dt'] ?? '' ) );
-
-			if ( '' !== $startDt && '' !== $endDt ) {
-				$this->repository->insert( new AvailabilitySlot( $instructorId, $startDt, $endDt ) );
-			}
+			$this->addSlot( $instructorId );
 		}
 
 		if ( 'delete' === $action ) {
@@ -50,4 +51,33 @@ class AvailabilityController {
 		}
 		// phpcs:enable WordPress.Security.NonceVerification.Missing
 	}
+
+	private function addSlot( int $instructorId ): void {
+		// phpcs:disable WordPress.Security.NonceVerification.Missing
+		$startDt = sanitize_text_field( wp_unslash( $_POST['start_dt'] ?? '' ) );
+		$endDt   = sanitize_text_field( wp_unslash( $_POST['end_dt'] ?? '' ) );
+
+		if ( '' === $startDt || '' === $endDt ) {
+			return;
+		}
+
+		$offeringId = absint( $_POST['offering_id'] ?? 0 );
+		$duration   = absint( $_POST['duration_minutes'] ?? 0 );
+
+		$slot = new AvailabilitySlot(
+			instructorId:    $instructorId,
+			startDt:         $startDt,
+			endDt:           $endDt,
+			durationMinutes: $duration > 0 ? $duration : 60,
+			offeringId:      $offeringId > 0 ? $offeringId : null,
+		);
+
+		if ( 'weekly' === sanitize_key( wp_unslash( $_POST['recurrence'] ?? 'single' ) ) ) {
+			$this->repository->createWeeklySeries( $slot, absint( $_POST['weeks'] ?? 1 ) );
+			return;
+		}
+
+		$this->repository->insert( $slot );
+		// phpcs:enable WordPress.Security.NonceVerification.Missing
+	}
 }

src/Availability/AvailabilityEndpoint.php

@@ -19,15 +19,23 @@ class AvailabilityEndpoint {
 					'callback'            => [ $this, 'index' ],
 					'permission_callback' => [ $this, 'canBook' ],
 					'args'                => [
-						'instructor_id' => [
+						'instructor_id'    => [
 							'type'    => 'integer',
 							'default' => 0,
 						],
-						'from'          => [
+						'offering_id'      => [
+							'type'    => 'integer',
+							'default' => 0,
+						],
+						'duration_minutes' => [
+							'type'    => 'integer',
+							'default' => 0,
+						],
+						'from'             => [
 							'type'    => 'string',
 							'default' => '',
 						],
-						'to'            => [
+						'to'               => [
 							'type'    => 'string',
 							'default' => '',
 						],
@@ -38,16 +46,32 @@ class AvailabilityEndpoint {
 					'callback'            => [ $this, 'create' ],
 					'permission_callback' => [ $this, 'canManage' ],
 					'args'                => [
-						'start_dt' => [
+						'start_dt'         => [
 							'type'              => 'string',
 							'required'          => true,
 							'sanitize_callback' => 'sanitize_text_field',
 						],
-						'end_dt'   => [
+						'end_dt'           => [
 							'type'              => 'string',
 							'required'          => true,
 							'sanitize_callback' => 'sanitize_text_field',
 						],
+						'duration_minutes' => [
+							'type'    => 'integer',
+							'default' => 60,
+						],
+						'offering_id'      => [
+							'type'    => 'integer',
+							'default' => 0,
+						],
+						'recurrence'       => [
+							'type'    => 'string',
+							'default' => 'single',
+						],
+						'weeks'            => [
+							'type'    => 'integer',
+							'default' => 1,
+						],
 					],
 				],
 			]
@@ -69,6 +93,8 @@ class AvailabilityEndpoint {
 	public function index( \WP_REST_Request $request ): \WP_REST_Response {
 		$slots = $this->repository->findAvailable(
 			(int) $request->get_param( 'instructor_id' ),
+			(int) $request->get_param( 'offering_id' ),
+			(int) $request->get_param( 'duration_minutes' ),
 			(string) $request->get_param( 'from' ),
 			(string) $request->get_param( 'to' ),
 		);
@@ -77,12 +103,23 @@ class AvailabilityEndpoint {
 	}
 
 	public function create( \WP_REST_Request $request ): \WP_REST_Response {
+		$offeringId = absint( $request->get_param( 'offering_id' ) );
+		$duration   = absint( $request->get_param( 'duration_minutes' ) );
+
 		$slot = new AvailabilitySlot(
-			instructorId: get_current_user_id(),
-			startDt:      (string) $request->get_param( 'start_dt' ),
-			endDt:        (string) $request->get_param( 'end_dt' ),
+			instructorId:    get_current_user_id(),
+			startDt:         (string) $request->get_param( 'start_dt' ),
+			endDt:           (string) $request->get_param( 'end_dt' ),
+			durationMinutes: $duration > 0 ? $duration : 60,
+			offeringId:      $offeringId > 0 ? $offeringId : null,
 		);
 
+		if ( 'weekly' === $request->get_param( 'recurrence' ) ) {
+			$ids = $this->repository->createWeeklySeries( $slot, absint( $request->get_param( 'weeks' ) ) );
+
+			return new \WP_REST_Response( [ 'ids' => $ids ], 201 );
+		}
+
 		$id = $this->repository->insert( $slot );
 
 		return new \WP_REST_Response( [ 'id' => $id ], 201 );

src/Availability/AvailabilityRepository.php

@@ -15,24 +15,78 @@ class AvailabilityRepository {
 		$this->db->insert(
 			$this->table,
 			[
-				'instructor_id' => $slot->instructorId,
-				'start_dt'      => $slot->startDt,
-				'end_dt'        => $slot->endDt,
-				'is_booked'     => 0,
-				'created_at'    => current_time( 'mysql' ),
+				'instructor_id'    => $slot->instructorId,
+				'offering_id'      => $slot->offeringId,
+				'start_dt'         => $slot->startDt,
+				'end_dt'           => $slot->endDt,
+				'duration_minutes' => $slot->durationMinutes,
+				'is_booked'        => 0,
+				'recurrence_group' => $slot->recurrenceGroup,
+				'created_at'       => current_time( 'mysql' ),
 			],
-			[ '%d', '%s', '%s', '%d', '%s' ]
+			[ '%d', '%d', '%s', '%s', '%d', '%d', '%d', '%s' ]
 		);
 
 		return $this->db->insert_id;
 	}
 
 	/**
-	 * Find unbooked slots, optionally filtered by instructor and date range.
+	 * Create a weekly-recurring series from a template slot. Each occurrence is a
+	 * separate row one week apart, all sharing a `recurrence_group` (the id of the
+	 * first row).
+	 *
+	 * @return list<int> Inserted slot IDs.
+	 */
+	public function createWeeklySeries( AvailabilitySlot $first, int $occurrences ): array {
+		$occurrences = max( 1, $occurrences );
+		$start       = new \DateTimeImmutable( $first->startDt );
+		$end         = new \DateTimeImmutable( $first->endDt );
+
+		$ids     = [];
+		$groupId = 0;
+
+		for ( $week = 0; $week < $occurrences; $week++ ) {
+			$shift = '+' . ( 7 * $week ) . ' days';
+
+			$id = $this->insert(
+				new AvailabilitySlot(
+					instructorId:    $first->instructorId,
+					startDt:         $start->modify( $shift )->format( 'Y-m-d H:i:s' ),
+					endDt:           $end->modify( $shift )->format( 'Y-m-d H:i:s' ),
+					durationMinutes: $first->durationMinutes,
+					offeringId:      $first->offeringId,
+					recurrenceGroup: $groupId > 0 ? $groupId : null,
+				)
+			);
+
+			if ( 0 === $groupId ) {
+				$groupId = $id;
+				$this->setRecurrenceGroup( $id, $groupId );
+			}
+
+			$ids[] = $id;
+		}
+
+		return $ids;
+	}
+
+	private function setRecurrenceGroup( int $id, int $groupId ): void {
+		$this->db->update(
+			$this->table,
+			[ 'recurrence_group' => $groupId ],
+			[ 'id' => $id ],
+			[ '%d' ],
+			[ '%d' ]
+		);
+	}
+
+	/**
+	 * Find unbooked slots, optionally filtered by instructor, offering, lesson
+	 * length, and date range.
 	 *
 	 * @return list<AvailabilitySlot>
 	 */
-	public function findAvailable( int $instructorId = 0, string $from = '', string $to = '' ): array {
+	public function findAvailable( int $instructorId = 0, int $offeringId = 0, int $durationMinutes = 0, string $from = '', string $to = '' ): array {
 		$where  = [ 'is_booked = 0' ];
 		$params = [];
 
@@ -41,6 +95,16 @@ class AvailabilityRepository {
 			$params[] = $instructorId;
 		}
 
+		if ( $offeringId > 0 ) {
+			$where[]  = 'offering_id = %d';
+			$params[] = $offeringId;
+		}
+
+		if ( $durationMinutes > 0 ) {
+			$where[]  = 'duration_minutes = %d';
+			$params[] = $durationMinutes;
+		}
+
 		if ( '' !== $from ) {
 			$where[]  = 'start_dt >= %s';
 			$params[] = $from;

src/Availability/AvailabilitySlot.php

@@ -9,17 +9,23 @@ class AvailabilitySlot {
 		public readonly int $instructorId,
 		public readonly string $startDt,
 		public readonly string $endDt,
+		public readonly int $durationMinutes = 60,
+		public readonly ?int $offeringId = null,
 		public readonly bool $isBooked = false,
+		public readonly ?int $recurrenceGroup = null,
 		public readonly ?int $id = null,
 	) {}
 
 	public static function fromRow( object $row ): self {
 		return new self(
-			instructorId: (int) $row->instructor_id,
-			startDt:      $row->start_dt,
-			endDt:        $row->end_dt,
-			isBooked:     (bool) $row->is_booked,
-			id:           (int) $row->id,
+			instructorId:    (int) $row->instructor_id,
+			startDt:         $row->start_dt,
+			endDt:           $row->end_dt,
+			durationMinutes: (int) $row->duration_minutes,
+			offeringId:      null !== $row->offering_id ? (int) $row->offering_id : null,
+			isBooked:        (bool) $row->is_booked,
+			recurrenceGroup: null !== $row->recurrence_group ? (int) $row->recurrence_group : null,
+			id:              (int) $row->id,
 		);
 	}
 
@@ -30,11 +36,14 @@ class AvailabilitySlot {
 	 */
 	public function toArray(): array {
 		return [
-			'id'            => $this->id,
-			'instructor_id' => $this->instructorId,
-			'start_dt'      => $this->startDt,
-			'end_dt'        => $this->endDt,
-			'is_booked'     => $this->isBooked,
+			'id'               => $this->id,
+			'instructor_id'    => $this->instructorId,
+			'offering_id'      => $this->offeringId,
+			'start_dt'         => $this->startDt,
+			'end_dt'           => $this->endDt,
+			'duration_minutes' => $this->durationMinutes,
+			'is_booked'        => $this->isBooked,
+			'recurrence_group' => $this->recurrenceGroup,
 		];
 	}
 }

src/Offering/Offering.php

@@ -29,7 +29,7 @@ class Offering {
 		public readonly int $instructorId,
 		public readonly string $kind,
 		public readonly string $title,
-		public readonly int $priceCents = 0,
+		public readonly float $price = 0.0,
 		public readonly string $currency = 'CAD',
 		public readonly string $billingMode = self::BILLING_ONE_TIME,
 		public readonly ?string $description = null,
@@ -48,7 +48,7 @@ class Offering {
 			instructorId:    (int) $row->instructor_id,
 			kind:            $row->kind,
 			title:           $row->title,
-			priceCents:      (int) $row->price_cents,
+			price:           (float) $row->price,
 			currency:        $row->currency,
 			billingMode:     $row->billing_mode,
 			description:     $row->description,
@@ -76,7 +76,7 @@ class Offering {
 			'title'            => $this->title,
 			'description'      => $this->description,
 			'duration_minutes' => $this->durationMinutes,
-			'price_cents'      => $this->priceCents,
+			'price'            => $this->price,
 			'currency'         => $this->currency,
 			'billing_mode'     => $this->billingMode,
 			'allow_weekly'     => $this->allowWeekly,

src/Offering/OfferingController.php

@@ -71,7 +71,7 @@ class OfferingController {
 				instructorId:    $instructorId,
 				kind:            $kind,
 				title:           $title,
-				priceCents:      absint( $_POST['price_cents'] ?? 0 ),
+				price:           max( 0.0, (float) sanitize_text_field( wp_unslash( $_POST['price'] ?? '0' ) ) ),
 				billingMode:     $billingMode,
 				durationMinutes: $duration > 0 ? $duration : null,
 				allowWeekly:     isset( $_POST['allow_weekly'] ),

src/Offering/OfferingEndpoint.php

@@ -85,7 +85,7 @@ class OfferingEndpoint {
 			instructorId:    get_current_user_id(),
 			kind:            $kind,
 			title:           $title,
-			priceCents:      absint( $request->get_param( 'price_cents' ) ),
+			price:           $this->price( $request->get_param( 'price' ) ),
 			currency:        sanitize_text_field( (string) ( $request->get_param( 'currency' ) ?? 'CAD' ) ),
 			billingMode:     $billingMode,
 			description:     $this->nullableText( $request->get_param( 'description' ) ),
@@ -129,7 +129,7 @@ class OfferingEndpoint {
 			instructorId:    $existing->instructorId,
 			kind:            $kind,
 			title:           $request->has_param( 'title' ) ? sanitize_text_field( (string) $request->get_param( 'title' ) ) : $existing->title,
-			priceCents:      $request->has_param( 'price_cents' ) ? absint( $request->get_param( 'price_cents' ) ) : $existing->priceCents,
+			price:           $request->has_param( 'price' ) ? $this->price( $request->get_param( 'price' ) ) : $existing->price,
 			currency:        $request->has_param( 'currency' ) ? sanitize_text_field( (string) $request->get_param( 'currency' ) ) : $existing->currency,
 			billingMode:     $billingMode,
 			description:     $request->has_param( 'description' ) ? $this->nullableText( $request->get_param( 'description' ) ) : $existing->description,
@@ -182,6 +182,10 @@ class OfferingEndpoint {
 		return new \WP_Error( 'invalid_offering', $message, [ 'status' => 400 ] );
 	}
 
+	private function price( mixed $value ): float {
+		return max( 0.0, (float) $value );
+	}
+
 	private function nullableInt( mixed $value ): ?int {
 		return ( null === $value || '' === $value ) ? null : (int) $value;
 	}

src/Offering/OfferingRepository.php

@@ -11,11 +11,20 @@ class OfferingRepository {
 		$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, schedule_note, is_active).
+	 *
+	 * @var list<string>
+	 */
+	private const COLUMN_FORMATS = [ '%d', '%s', '%s', '%s', '%d', '%f', '%s', '%s', '%d', '%d', '%s', '%s', '%s', '%d' ];
+
 	public function insert( Offering $offering ): int {
 		$this->db->insert(
 			$this->table,
 			$this->columns( $offering ) + [ 'created_at' => current_time( 'mysql' ) ],
-			[ '%d', '%s', '%s', '%s', '%d', '%s', '%s', '%d', '%d', '%s', '%s', '%s', '%d', '%s' ]
+			[ ...self::COLUMN_FORMATS, '%s' ]
 		);
 
 		return $this->db->insert_id;
@@ -26,7 +35,7 @@ class OfferingRepository {
 			$this->table,
 			$this->columns( $offering ),
 			[ 'id' => $id ],
-			[ '%d', '%s', '%s', '%s', '%d', '%s', '%s', '%d', '%d', '%s', '%s', '%s', '%d' ],
+			self::COLUMN_FORMATS,
 			[ '%d' ]
 		);
 	}
@@ -43,7 +52,7 @@ class OfferingRepository {
 			'title'            => $offering->title,
 			'description'      => $offering->description,
 			'duration_minutes' => $offering->durationMinutes,
-			'price_cents'      => $offering->priceCents,
+			'price'            => $offering->price,
 			'currency'         => $offering->currency,
 			'billing_mode'     => $offering->billingMode,
 			'allow_weekly'     => $offering->allowWeekly ? 1 : 0,

src/Schema.php

@@ -13,15 +13,20 @@ class Schema {
 	public static function tables( string $prefix, string $charset ): array {
 		return [
 			"CREATE TABLE {$prefix}us_availability (
-                id           BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-                instructor_id BIGINT UNSIGNED NOT NULL,
-                start_dt     DATETIME        NOT NULL,
-                end_dt       DATETIME        NOT NULL,
-                is_booked    TINYINT(1)      NOT NULL DEFAULT 0,
-                created_at   DATETIME        NOT NULL,
+                id               BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+                instructor_id    BIGINT UNSIGNED NOT NULL,
+                offering_id      BIGINT UNSIGNED DEFAULT NULL,
+                start_dt         DATETIME        NOT NULL,
+                end_dt           DATETIME        NOT NULL,
+                duration_minutes SMALLINT UNSIGNED NOT NULL DEFAULT 60,
+                is_booked        TINYINT(1)      NOT NULL DEFAULT 0,
+                recurrence_group BIGINT UNSIGNED DEFAULT NULL,
+                created_at       DATETIME        NOT NULL,
                 PRIMARY KEY (id),
                 KEY instructor_id (instructor_id),
-                KEY start_dt (start_dt)
+                KEY offering_id (offering_id),
+                KEY start_dt (start_dt),
+                KEY recurrence_group (recurrence_group)
             ) {$charset};",
 
 			"CREATE TABLE {$prefix}us_lessons (
@@ -45,7 +50,7 @@ class Schema {
                 title            VARCHAR(191)    NOT NULL,
                 description      TEXT,
                 duration_minutes SMALLINT UNSIGNED DEFAULT NULL,
-                price_cents      INT UNSIGNED    NOT NULL DEFAULT 0,
+                price            DECIMAL(10,2)   NOT NULL DEFAULT 0,
                 currency         VARCHAR(3)      NOT NULL DEFAULT 'CAD',
                 billing_mode     VARCHAR(20)     NOT NULL DEFAULT 'one_time',
                 allow_weekly     TINYINT(1)      NOT NULL DEFAULT 0,