5d711bd13e
Implements the facility-classes-booking-dashboard plan (backend): - Facility.BookingMode (single Scheduled/AdHoc choice) replaced with independent SupportsClasses/SupportsBooking flags, so one facility can run a class and accept walk-in bookings; a running class now blocks walk-in booking for its window on both create and reschedule. - CustomerPlan.GrantsGymAccess + CustomerPlanClass join table let a customer hold one gym-access plan plus any number of class-only plans. Replaced the old single-subscription resolution (GetActiveSubscriptionByCustomerId/HasAnyActiveSubscriptionAsync) with gym-access-aware and class-aware resolvers across booking creation/cancellation, plan assignment, and customer self-service. Fixed ChangeMembershipPlan/renewal plan-changes, which resolved "the subscription to replace" by most-recent-created and would have deactivated a member's class subscription instead of their gym one. - New FacilityClass model: recurring class definitions (Daily/Weekly/ Monthly/Custom) with lazy occurrence generation (8-week horizon, race-safe via a unique index) and proper unlimited-capacity handling. "Mark not held" replaces the old bare-cancel: cascades to cancel and refund every confirmed booking on the occurrence through the same core CancelBooking uses, and frees the slot for walk-in booking. Scheduling conflicts (a walk-in booking now overlapping a class) are surfaced for staff to resolve via the existing Reschedule flow. - Renamed the pre-existing "AdHoc" booking-mode terminology to "WalkIn" throughout (routes, methods, DTOs, the stored BookingMode value) for a clearer, simpler name. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
231 lines
10 KiB
C#
231 lines
10 KiB
C#
using Fitness_core_BE.DTOs.Booking;
|
|
using Fitness_core_BE.Helpers;
|
|
using Fitness_core_BE.Interfaces.Services;
|
|
using Fitness_core_BE.Models.IOs;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using static Fitness_core_BE.Helpers.JwtMiddleware;
|
|
using static Fitness_core_BE.Helpers.ApiResponseHelper;
|
|
|
|
namespace Fitness_core_BE.Controllers
|
|
{
|
|
// Booking spans three audiences with very different auth needs, so routes are absolute
|
|
// per-action rather than grouped under one controller-level [Route] prefix: "api/app/..."
|
|
// for logged-in members (same convention as CustomerController), "api/public/..." for a
|
|
// non-member's anonymous guest booking, "api/client/..." for staff (check-in, cancel,
|
|
// session roster, manual payment recording).
|
|
[ApiController]
|
|
public class BookingController : ControllerBase
|
|
{
|
|
private readonly IBookingService _bookingService;
|
|
|
|
public BookingController(IBookingService bookingService)
|
|
{
|
|
_bookingService = bookingService;
|
|
}
|
|
|
|
// ---------- Member (logged-in) ----------
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[HttpPost("api/app/bookings")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CreateMemberBooking([FromBody] CreateMemberBookingRequest request)
|
|
=> Response(await _bookingService.CreateMemberBooking(new { facilitySessionId = request.FacilitySessionId }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[HttpPost("api/app/bookings/walkin")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CreateMemberWalkInBooking([FromBody] CreateWalkInBookingRequest request)
|
|
=> Response(await _bookingService.CreateMemberWalkInBooking(new
|
|
{
|
|
facilityId = request.FacilityId,
|
|
startTime = request.StartTime.ToString("o"),
|
|
durationMinutes = request.DurationMinutes,
|
|
partySize = request.PartySize
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[HttpGet("api/app/bookings/mine")]
|
|
public async Task<ActionResult<ApiResponse<object>>> GetMyBookings()
|
|
=> Response(await _bookingService.GetMyBookings(new { }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[HttpPost("api/app/bookings/{id:guid}/cancel")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CancelMyBooking(Guid id)
|
|
=> Response(await _bookingService.CancelBooking(new { bookingId = id }, HttpContext));
|
|
|
|
// ---------- Guest (no account at all) ----------
|
|
|
|
[AllowAnonymous]
|
|
[HttpPost("api/public/bookings/guest")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CreateGuestBooking([FromBody] CreateGuestBookingRequest request)
|
|
=> Response(await _bookingService.CreateGuestBooking(new
|
|
{
|
|
facilitySessionId = request.FacilitySessionId,
|
|
guestName = request.GuestName,
|
|
guestPhone = request.GuestPhone,
|
|
customerId = request.CustomerId
|
|
}, HttpContext));
|
|
|
|
[AllowAnonymous]
|
|
[HttpPost("api/public/bookings/guest/walkin")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CreateGuestWalkInBooking([FromBody] CreateGuestWalkInBookingRequest request)
|
|
=> Response(await _bookingService.CreateGuestWalkInBooking(new
|
|
{
|
|
facilityId = request.FacilityId,
|
|
startTime = request.StartTime.ToString("o"),
|
|
durationMinutes = request.DurationMinutes,
|
|
guestName = request.GuestName,
|
|
guestPhone = request.GuestPhone,
|
|
partySize = request.PartySize,
|
|
pricePerHour = request.PricePerHour,
|
|
customerId = request.CustomerId
|
|
}, HttpContext));
|
|
|
|
// The actual "copy the link and share it" page -- BookingDto.ShareUrl points here.
|
|
// Plain HTML, not the JSON ApiResponse envelope, since this is meant to be opened
|
|
// directly in a browser (or a chat app's link preview), not consumed by a client SDK.
|
|
[AllowAnonymous]
|
|
[HttpGet("api/public/bookings/{id:guid}/view")]
|
|
public async Task<ContentResult> ViewBooking(Guid id)
|
|
{
|
|
var booking = await _bookingService.GetBookingView(new { bookingId = id }) as BookingDto;
|
|
if (booking == null)
|
|
return Content(BookingViewHtml.NotFound(), "text/html");
|
|
|
|
return Content(BookingViewHtml.Render(booking), "text/html");
|
|
}
|
|
|
|
// ---------- Staff ----------
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpGet("api/client/bookings")]
|
|
public async Task<ActionResult<ApiResponse<object>>> GetBookings(
|
|
[FromQuery] Guid? facilityId, [FromQuery] Guid? facilitySessionId,
|
|
[FromQuery] DateTime? fromDate, [FromQuery] DateTime? toDate, [FromQuery] string? status)
|
|
=> Response(await _bookingService.GetBookings(new
|
|
{
|
|
facilityId,
|
|
facilitySessionId,
|
|
fromDate = fromDate?.ToString("o"),
|
|
toDate = toDate?.ToString("o"),
|
|
status
|
|
}, HttpContext));
|
|
|
|
// Kept as a thin backward-compat wrapper around the unified GetBookings above --
|
|
// prefer GET api/client/bookings?facilitySessionId= going forward.
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpGet("api/client/bookings/session/{facilitySessionId:guid}")]
|
|
public async Task<ActionResult<ApiResponse<object>>> GetSessionBookings(Guid facilitySessionId)
|
|
=> Response(await _bookingService.GetSessionBookings(new { facilitySessionId }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPost("api/client/bookings/check-in")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CheckInBooking([FromBody] CheckInBookingRequest request)
|
|
=> Response(await _bookingService.CheckInBooking(new { otpCode = request.OtpCode, rfidTagId = request.RfidTagId }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPost("api/client/bookings/{id:guid}/mark-paid")]
|
|
public async Task<ActionResult<ApiResponse<object>>> MarkGuestBookingPaid(Guid id, [FromBody] MarkGuestBookingPaidRequest request)
|
|
=> Response(await _bookingService.MarkGuestBookingPaid(new
|
|
{
|
|
bookingId = id,
|
|
amountCharged = request.AmountCharged,
|
|
paymentMethod = request.PaymentMethod
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPost("api/client/bookings/{id:guid}/cancel")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CancelBooking(Guid id)
|
|
=> Response(await _bookingService.CancelBooking(new { bookingId = id }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPut("api/client/bookings/{id:guid}/reassign")]
|
|
public async Task<ActionResult<ApiResponse<object>>> ReassignBooking(Guid id, [FromBody] ReassignBookingRequest request)
|
|
=> Response(await _bookingService.ReassignBooking(new
|
|
{
|
|
bookingId = id,
|
|
guestName = request.GuestName,
|
|
guestPhone = request.GuestPhone
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPut("api/client/bookings/{id:guid}/reschedule")]
|
|
public async Task<ActionResult<ApiResponse<object>>> RescheduleBooking(Guid id, [FromBody] RescheduleBookingRequest request)
|
|
=> Response(await _bookingService.RescheduleBooking(new
|
|
{
|
|
bookingId = id,
|
|
startTime = request.StartTime?.ToString("o"),
|
|
durationMinutes = request.DurationMinutes,
|
|
facilitySessionId = request.FacilitySessionId
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPost("api/client/bookings/{id:guid}/no-show")]
|
|
public async Task<ActionResult<ApiResponse<object>>> MarkNoShow(Guid id)
|
|
=> Response(await _bookingService.MarkNoShow(new { bookingId = id }, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpPost("api/client/bookings/{id:guid}/complete")]
|
|
public async Task<ActionResult<ApiResponse<object>>> CompleteBooking(Guid id, [FromBody] CompleteBookingRequest? request)
|
|
=> Response(await _bookingService.CompleteBooking(new
|
|
{
|
|
bookingId = id,
|
|
markPaid = request?.MarkPaid,
|
|
amountCollected = request?.AmountCollected,
|
|
paymentMethod = request?.PaymentMethod
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpGet("api/client/bookings/invoices")]
|
|
public async Task<ActionResult<ApiResponse<object>>> GetBookingInvoices([FromQuery] DateTime? fromDate, [FromQuery] DateTime? toDate)
|
|
=> Response(await _bookingService.GetBookingInvoices(new
|
|
{
|
|
fromDate = fromDate?.ToString("o"),
|
|
toDate = toDate?.ToString("o")
|
|
}, HttpContext));
|
|
|
|
[CustomMiddleware]
|
|
[TenantResolution]
|
|
[RequiresPermission("bookings")]
|
|
[HttpGet("api/client/bookings/dashboard-summary")]
|
|
public async Task<ActionResult<ApiResponse<object>>> GetBookingDashboardSummary()
|
|
=> Response(await _bookingService.GetBookingDashboardSummary(new { }, HttpContext));
|
|
|
|
// Public, unguessable-GUID receipt page -- same "public but the link IS the credential"
|
|
// model as ViewBooking above.
|
|
[AllowAnonymous]
|
|
[HttpGet("api/public/booking-invoices/{id:guid}/view")]
|
|
public async Task<ContentResult> ViewBookingInvoice(Guid id)
|
|
{
|
|
var invoice = await _bookingService.GetBookingInvoiceView(new { bookingInvoiceId = id }) as BookingInvoiceDto;
|
|
if (invoice == null)
|
|
return Content(BookingInvoiceHtml.NotFound(), "text/html");
|
|
|
|
return Content(BookingInvoiceHtml.Render(invoice), "text/html");
|
|
}
|
|
}
|
|
}
|