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>
75 lines
2.6 KiB
C#
75 lines
2.6 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
|
|
namespace Fitness_core_BE.DTOs.Facility
|
|
{
|
|
public class CustomOccurrenceRequest
|
|
{
|
|
[Required]
|
|
public DateTime StartTime { get; set; }
|
|
|
|
[Required, Range(1, int.MaxValue, ErrorMessage = "DurationMinutes must be at least 1")]
|
|
public int DurationMinutes { get; set; }
|
|
}
|
|
|
|
public class CreateFacilityClassRequest
|
|
{
|
|
[Required]
|
|
public Guid FacilityId { get; set; }
|
|
|
|
[Required]
|
|
public string Name { get; set; } = string.Empty;
|
|
|
|
public string? Description { get; set; }
|
|
|
|
/// <summary>"Daily" | "Weekly" | "Monthly" | "Custom".</summary>
|
|
[Required]
|
|
public string RecurrenceType { get; set; } = "Weekly";
|
|
|
|
/// <summary>"HH:mm" local time -- required unless RecurrenceType == "Custom".</summary>
|
|
public string? StartTimeOfDay { get; set; }
|
|
|
|
[Range(1, int.MaxValue, ErrorMessage = "DurationMinutes must be at least 1")]
|
|
public int DurationMinutes { get; set; } = 60;
|
|
|
|
/// <summary>Weekly only. Bit flags, Sunday = 1 through Saturday = 64.</summary>
|
|
public int WeekDaysMask { get; set; }
|
|
|
|
/// <summary>Monthly only. Comma-separated day-of-month list, e.g. "1,15".</summary>
|
|
public string? MonthDays { get; set; }
|
|
|
|
public DateTime? SeriesStartDate { get; set; }
|
|
public DateTime? SeriesEndDate { get; set; }
|
|
|
|
public int? Capacity { get; set; }
|
|
public bool IsUnlimitedCapacity { get; set; }
|
|
|
|
/// <summary>RecurrenceType == "Custom" only -- explicit occurrence windows.</summary>
|
|
public List<CustomOccurrenceRequest>? CustomOccurrences { get; set; }
|
|
}
|
|
|
|
public class UpdateFacilityClassRequest
|
|
{
|
|
public string? Name { get; set; }
|
|
public string? Description { get; set; }
|
|
public string? RecurrenceType { get; set; }
|
|
public string? StartTimeOfDay { get; set; }
|
|
public int? DurationMinutes { get; set; }
|
|
public int? WeekDaysMask { get; set; }
|
|
public string? MonthDays { get; set; }
|
|
public DateTime? SeriesStartDate { get; set; }
|
|
public DateTime? SeriesEndDate { get; set; }
|
|
public int? Capacity { get; set; }
|
|
public bool? IsUnlimitedCapacity { get; set; }
|
|
public bool? IsActive { get; set; }
|
|
|
|
/// <summary>RecurrenceType == "Custom" only -- adds more explicit occurrences without
|
|
/// touching existing ones (Custom has no rule to regenerate from).</summary>
|
|
public List<CustomOccurrenceRequest>? AddCustomOccurrences { get; set; }
|
|
}
|
|
|
|
public class MarkNotHeldRequest
|
|
{
|
|
public string? Reason { get; set; }
|
|
}
|
|
}
|