mirror of
https://github.com/Dvorinka/Bookra.git
synced 2026-10-29 07:54:44 +00:00
feat: series-aware schedule edits + waitlist ledger removal (M32)
PATCH /v1/catalog/class-schedules/:id patches a recurring rule and, with applyToFuture, retimes materialized future sessions to the new local start time on their existing dates — moving confirmed and waitlisted bookings with them and re-arming reminders. Zones-page schedule rows gain an inline editor (CS/EN). Also drops the vestigial waitlist_entries table (migration 00020): positions derive from bookings.created_at, so the ledger was written but never read. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
55fc0d06e3
commit
65a693cf38
17 files changed
+840
-230
No files matched your search
@@ -50,7 +50,7 @@ func PromoteWaitlist(ctx context.Context, repo db.Repository, tenantID, sessionI
|
||||
if session.Capacity > 0 && confirmed >= int(session.Capacity) {
|
||||
break
|
||||
}
|
||||
if err := confirmWaitlistedBooking(ctx, repo, tenantID, sessionID, booking); err != nil {
|
||||
if err := confirmWaitlistedBooking(ctx, repo, tenantID, booking); err != nil {
|
||||
return promoted, err
|
||||
}
|
||||
confirmed++
|
||||
@@ -104,24 +104,30 @@ func PromoteBooking(ctx context.Context, repo db.Repository, tenantID, bookingID
|
||||
}
|
||||
}
|
||||
|
||||
if err := confirmWaitlistedBooking(ctx, repo, tenantID, sessionID, booking); err != nil {
|
||||
if err := confirmWaitlistedBooking(ctx, repo, tenantID, booking); err != nil {
|
||||
return db.BookingRecord{}, err
|
||||
}
|
||||
booking.Status = "confirmed"
|
||||
return booking, nil
|
||||
}
|
||||
|
||||
// confirmWaitlistedBooking flips a waitlisted booking to confirmed, resolves
|
||||
// the ledger entry, and re-arms reminder jobs — a booking promoted after its
|
||||
// reminder already dispatched-as-skipped would otherwise go unreminded.
|
||||
func confirmWaitlistedBooking(ctx context.Context, repo db.Repository, tenantID, sessionID string, booking db.BookingRecord) error {
|
||||
// confirmWaitlistedBooking flips a waitlisted booking to confirmed and
|
||||
// re-arms reminder jobs — a booking promoted after its reminder already
|
||||
// dispatched-as-skipped would otherwise go unreminded.
|
||||
func confirmWaitlistedBooking(ctx context.Context, repo db.Repository, tenantID string, booking db.BookingRecord) error {
|
||||
if err := repo.UpdateBookingStatus(ctx, booking.ID, "confirmed"); err != nil {
|
||||
return err
|
||||
}
|
||||
_ = repo.ResolveWaitlistEntry(ctx, tenantID, sessionID, booking.CustomerEmail)
|
||||
RearmReminderJobs(ctx, repo, tenantID, booking)
|
||||
return nil
|
||||
}
|
||||
|
||||
// RearmReminderJobs clears pending reminders for a booking and re-arms them
|
||||
// for its (possibly new) start time. Used after promotion, session moves, and
|
||||
// schedule retimes so reminders always match the booking's live window.
|
||||
func RearmReminderJobs(ctx context.Context, repo db.Repository, tenantID string, booking db.BookingRecord) {
|
||||
_ = repo.DeletePendingReminderJobsForBooking(ctx, booking.ID)
|
||||
_ = armReminderJobs(ctx, repo, tenantID, booking.ID, booking.StartsAt, booking.CustomerPhone)
|
||||
return nil
|
||||
}
|
||||
|
||||
// armReminderJobs schedules the email reminder — and the SMS reminder when the
|
||||
|
||||
Reference in new issue
Block a user