feat(admin): implement full day-by-day schedule editor with live preview
## Features ### Admin Schedule Page (`packages/app/src/pages/admin/schedule.vue`) - Interactive date-based slot editor for managing daily schedules - Real-time slot editing: start/end times, capacity adjustments - Slot deletion with conflict warnings when bookings exist - Add new slots with modal dialog - Live booking status display (booked count, people names) - Publish/Save changes with sync feedback - Revert unsaved changes with confirmation - Skeleton loading states and empty state handling - Responsive design with optimized mobile UX ### Backend Enhancements - **New DTO** (`PublishDaySlotsDto`): Structured slot publishing with validation - Date string validation - Slot array with existing slot IDs for updates - Time and capacity validation per slot - **Schedule Preview API** (`getSchedulePreview`): - Check for existing published slots - Fallback to active WeekTemplates for unpublished dates - Unified response format with isPublished flag - **Publish Slots API** (`publishDaySlots`): - Atomic transaction for consistency - Update existing slots with new times/capacity - Create new slots from template data - Delete unpublished slots or set to CLOSED if bookings exist - Prevent capacity reduction below existing bookings - Returns all published slots for feedback ### State Management - Enhanced admin store with schedule state - Support for pending/unsaved slot changes - Optimistic UI updates with server sync ### Documentation - Comprehensive scheduling system architecture docs - Quick reference for admin workflows - Flow diagrams and state transitions - Implementation guide for future maintenance ## Breaking Changes None ## Testing Recommendations - Create slots for future dates via schedule editor - Verify booking prevention for locked/full slots - Test capacity adjustments with existing bookings - Confirm template-based schedule generation - Verify transaction rollback on publish failures Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
803
ADMIN_SCHEDULING_EXPLORATION.md
Normal file
803
ADMIN_SCHEDULING_EXPLORATION.md
Normal file
@@ -0,0 +1,803 @@
|
||||
# WeChat Mini-Program Admin Scheduling/排课设置 - Complete Exploration Report
|
||||
|
||||
**Date**: 2026-04-05
|
||||
**Project**: mp-pilates (WeChat mini-program for pilates studio bookings)
|
||||
|
||||
---
|
||||
|
||||
## 📋 Executive Summary
|
||||
|
||||
This is a **Pilates studio booking management system** with a comprehensive admin scheduling UI. The "排课设置" (Schedule Setup) feature allows admins to:
|
||||
1. Define recurring weekly class templates (时间模板)
|
||||
2. Manually add time slots for specific dates
|
||||
3. Close slots (临时调整 → 关闭时段)
|
||||
4. Batch generate slots from templates
|
||||
|
||||
The architecture uses:
|
||||
- **Frontend**: Vue 3 + TypeScript (WeChat mini-program with Taro/UNI framework)
|
||||
- **Backend**: NestJS + Prisma ORM
|
||||
- **State Management**: Pinia (Vue state management)
|
||||
- **Database**: Likely PostgreSQL/MySQL with Prisma
|
||||
|
||||
---
|
||||
|
||||
## 🗂️ File Structure
|
||||
|
||||
### Frontend Admin Pages
|
||||
```
|
||||
packages/app/src/pages/admin/
|
||||
├── index.vue # Admin dashboard with nav grid
|
||||
├── week-template.vue # 📅 Scheduling/排课设置 - Main feature
|
||||
├── slot-adjust.vue # 🔧 Temporary adjustments (3 tabs)
|
||||
├── members.vue # 👥 Member management
|
||||
├── orders.vue # 📋 Order management
|
||||
├── card-types.vue # 💳 Card type management
|
||||
└── studio.vue # 🏢 Studio settings
|
||||
```
|
||||
|
||||
### Stores
|
||||
```
|
||||
packages/app/src/stores/
|
||||
└── admin.ts # Pinia store with all admin API calls
|
||||
```
|
||||
|
||||
### Backend API
|
||||
```
|
||||
packages/server/src/
|
||||
├── time-slot/
|
||||
│ ├── time-slot.controller.ts # Admin & member endpoints for slots
|
||||
│ ├── time-slot.service.ts # Business logic for slots
|
||||
│ ├── slot-generator.service.ts # Template-based slot generation
|
||||
│ └── dto/
|
||||
│ ├── week-template.dto.ts # Input validation
|
||||
│ ├── create-manual-slot.dto.ts
|
||||
│ └── query-slots.dto.ts
|
||||
├── studio/
|
||||
│ └── studio.controller.ts # Studio config (admin endpoints)
|
||||
└── scheduler/ # Cron scheduler for auto-generation
|
||||
```
|
||||
|
||||
### Shared Types
|
||||
```
|
||||
packages/shared/src/types/
|
||||
├── week-template.ts # WeekTemplate interface
|
||||
├── time-slot.ts # TimeSlot interface
|
||||
└── constants.ts # WEEKDAY_LABELS, SLOT_GENERATION_DAYS
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔑 Key Components
|
||||
|
||||
### 1. **Admin Dashboard (index.vue)**
|
||||
|
||||
**File**: `packages/app/src/pages/admin/index.vue`
|
||||
|
||||
**Features**:
|
||||
- Display stats: today's bookings, total orders, total bookings
|
||||
- Navigation grid to 6 admin modules:
|
||||
- 📅 **排课设置** → `/pages/admin/week-template`
|
||||
- 🔧 **临时调整** → `/pages/admin/slot-adjust`
|
||||
- 👥 **会员管理** → `/pages/admin/members`
|
||||
- 📋 **订单管理** → `/pages/admin/orders`
|
||||
- 💳 **卡种管理** → `/pages/admin/card-types`
|
||||
- 🏢 **工作室设置** → `/pages/admin/studio`
|
||||
|
||||
**Key Functions**:
|
||||
```typescript
|
||||
- navigate(path): Navigates to admin pages
|
||||
- loadStats(): Fetches dashboard statistics via adminStore.fetchDashboardStats()
|
||||
```
|
||||
|
||||
**State**:
|
||||
```typescript
|
||||
const stats = ref<AdminStats>({ todayBookings: 0, totalOrders: 0, totalBookings: 0 })
|
||||
const statsLoading = ref(false)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2. **Week Template Management (week-template.vue)** ✨ MAIN SCHEDULING UI
|
||||
|
||||
**File**: `packages/app/src/pages/admin/week-template.vue`
|
||||
**Route**: `/pages/admin/week-template`
|
||||
|
||||
#### Purpose
|
||||
Manage recurring weekly schedule templates. These are used to **auto-generate** time slots for future weeks.
|
||||
|
||||
#### Data Structure
|
||||
```typescript
|
||||
interface WeekTemplate {
|
||||
readonly id: string
|
||||
readonly dayOfWeek: number // 1=Mon, 2=Tue, ..., 7=Sun (ISO format)
|
||||
readonly startTime: string // HH:MM format
|
||||
readonly endTime: string // HH:MM format
|
||||
readonly capacity: number // Max bookings per slot
|
||||
readonly isActive: boolean // Enable/disable template
|
||||
readonly createdAt: string
|
||||
readonly updatedAt: string
|
||||
}
|
||||
```
|
||||
|
||||
#### UI Sections
|
||||
1. **Toolbar**
|
||||
- Display template count: "共 N 条模板"
|
||||
- "+ 新增时段" (Add new slot) button
|
||||
|
||||
2. **Template List** (Grouped by weekday)
|
||||
- Days are sorted (Monday → Sunday)
|
||||
- Each day shows count: "3 个时段"
|
||||
- Each template row displays:
|
||||
- Time range: "09:00 – 10:00"
|
||||
- Capacity: "10 人"
|
||||
- Actions:
|
||||
- Toggle button: "启用"/"停用" (Enable/Disable)
|
||||
- "编辑" (Edit)
|
||||
- "删除" (Delete)
|
||||
- Inactive templates are grayed out (opacity: 0.5)
|
||||
|
||||
3. **Modal for Add/Edit**
|
||||
- Star date picker (1-7 for weekday)
|
||||
- Start time picker
|
||||
- End time picker
|
||||
- Capacity input (number)
|
||||
- Validation: time and capacity required
|
||||
- Cancel/Confirm buttons
|
||||
|
||||
4. **Save Bar** (Fixed at bottom)
|
||||
- Only shows when `isDirty` flag is true
|
||||
- "保存全部更改" button with loading state
|
||||
|
||||
#### Key Functions
|
||||
|
||||
```typescript
|
||||
async fetchTemplates()
|
||||
- Fetches all templates from backend
|
||||
- Groups by dayOfWeek for display
|
||||
- Clears isDirty flag
|
||||
|
||||
async handleSave()
|
||||
- Maps local template state to API payload
|
||||
- Calls adminStore.saveWeekTemplates(payload)
|
||||
- Refreshes templates after save
|
||||
- Shows success/error toast
|
||||
|
||||
function openAdd()
|
||||
- Opens modal for creating new template
|
||||
- Clears form
|
||||
|
||||
function openEdit(tpl)
|
||||
- Opens modal in edit mode
|
||||
- Populates form with existing values
|
||||
|
||||
function submitForm()
|
||||
- Validates form (time and capacity required)
|
||||
- Creates or updates template in memory
|
||||
- Sets isDirty = true (triggers save bar)
|
||||
|
||||
function toggleTemplate(tpl)
|
||||
- Toggles isActive flag
|
||||
- Sets isDirty = true
|
||||
|
||||
function deleteTemplate(tpl)
|
||||
- Shows confirmation modal
|
||||
- Removes from array
|
||||
- Sets isDirty = true
|
||||
```
|
||||
|
||||
#### Local State Management
|
||||
```typescript
|
||||
const templates = ref<LocalTemplate[]>([])
|
||||
const loading = ref(false)
|
||||
const saving = ref(false)
|
||||
const isDirty = ref(false) // Tracks unsaved changes
|
||||
const showModal = ref(false)
|
||||
const editTarget = ref<LocalTemplate | null>(null)
|
||||
|
||||
const form = ref({
|
||||
dayIdx: 0, // Selected day index (0-6)
|
||||
startTime: '09:00',
|
||||
endTime: '10:00',
|
||||
capacityStr: '10',
|
||||
})
|
||||
|
||||
const grouped = computed(() => {
|
||||
// Groups templates by dayOfWeek for rendering
|
||||
return Object.fromEntries(
|
||||
Object.entries(map).sort(([a], [b]) => Number(a) - Number(b))
|
||||
)
|
||||
})
|
||||
```
|
||||
|
||||
#### Example: Adding a Monday 9AM-10AM class
|
||||
1. User taps "+ 新增时段"
|
||||
2. Modal opens, form is reset to defaults
|
||||
3. User selects "周一" (Monday) from picker
|
||||
4. User confirms times and capacity
|
||||
5. New template object is pushed to `templates` array
|
||||
6. `isDirty` is set to true → save bar appears
|
||||
7. User taps "保存全部更改"
|
||||
8. Store calls `PUT /admin/week-template` with all templates
|
||||
9. Backend deletes all old templates and creates new ones
|
||||
10. Frontend refetches and displays updated list
|
||||
|
||||
---
|
||||
|
||||
### 3. **Slot Adjustment (slot-adjust.vue)** - Temporary Slot Management
|
||||
|
||||
**File**: `packages/app/src/pages/admin/slot-adjust.vue`
|
||||
**Route**: `/pages/admin/slot-adjust`
|
||||
|
||||
#### Purpose
|
||||
Handle temporary/manual time slot operations:
|
||||
1. Add one-off slots for specific dates
|
||||
2. Close available slots
|
||||
3. Batch-generate slots from templates
|
||||
|
||||
#### UI Structure (3 Tabs)
|
||||
|
||||
##### Tab 0: "新增时段" (Add Manual Slot)
|
||||
- Date picker (defaults to today)
|
||||
- Start/End time pickers
|
||||
- Capacity input
|
||||
- Submit button: "新增时段"
|
||||
- **Endpoint**: `POST /admin/time-slot/manual`
|
||||
|
||||
```typescript
|
||||
interface CreateManualSlotDto {
|
||||
date: string // YYYY-MM-DD
|
||||
startTime: string // HH:MM
|
||||
endTime: string // HH:MM
|
||||
capacity?: number // Defaults to DEFAULT_SLOT_CAPACITY (1)
|
||||
}
|
||||
```
|
||||
|
||||
##### Tab 1: "关闭时段" (Close Slots)
|
||||
- Date picker (defaults to today)
|
||||
- Loads all slots for selected date
|
||||
- Displays slot list with:
|
||||
- Time range
|
||||
- Status badge (OPEN/FULL/CLOSED)
|
||||
- Booked count: "X/Y"
|
||||
- Close button (if not already closed)
|
||||
- Confirmation modal when closing
|
||||
- **Endpoint**: `PUT /admin/time-slot/:id/close`
|
||||
|
||||
**Slot Status Colors**:
|
||||
```
|
||||
OPEN → Green badge #27ae60
|
||||
FULL → Orange badge #e67e22
|
||||
CLOSED → Gray badge #999
|
||||
```
|
||||
|
||||
##### Tab 2: "批量生成" (Batch Generate)
|
||||
- Start date picker
|
||||
- End date picker (defaults to +7 days)
|
||||
- Hint: "将根据排课模板,自动生成所选日期范围内的时段"
|
||||
- *"Will auto-generate slots for selected date range based on schedule template"*
|
||||
- Submit button: "批量生成"
|
||||
- **Endpoint**: `POST /admin/generate-slots`
|
||||
|
||||
**How it works**:
|
||||
1. Frontend sends date range to backend
|
||||
2. Backend fetches all **active** WeekTemplates
|
||||
3. For each day in range, finds matching templates by weekday
|
||||
4. Creates TimeSlot records with `source: TEMPLATE`
|
||||
5. Uses `skipDuplicates: true` to avoid re-generating existing slots
|
||||
|
||||
```typescript
|
||||
// Backend example: If templates include:
|
||||
// - Monday: 09:00-10:00, 18:00-19:00 (2 templates)
|
||||
// - Wednesday: 10:00-11:00 (1 template)
|
||||
//
|
||||
// And user selects 2026-04-05 to 2026-04-11:
|
||||
// - Mon 04-06: 2 slots generated
|
||||
// - Wed 04-08: 1 slot generated
|
||||
// Total: 3 slots (if these dates fall in range)
|
||||
```
|
||||
|
||||
#### Key Functions
|
||||
```typescript
|
||||
async submitAddSlot()
|
||||
- POST /admin/time-slot/manual
|
||||
- Shows success/error toast
|
||||
|
||||
async loadSlotsForClose()
|
||||
- Fetches slots for closeDate via adminStore.fetchSlotsByDate(date)
|
||||
- Sets slotsLoading flag
|
||||
|
||||
async closeSlot(slot)
|
||||
- Confirmation modal
|
||||
- PUT /admin/time-slot/:id/close
|
||||
- Reloads slot list
|
||||
|
||||
async submitGenerate()
|
||||
- POST /admin/generate-slots with date range
|
||||
- Shows toast with count of generated slots
|
||||
```
|
||||
|
||||
#### Local State
|
||||
```typescript
|
||||
const activeTab = ref(0) // 0=Add, 1=Close, 2=Generate
|
||||
const submitting = ref(false)
|
||||
const slotsLoading = ref(false)
|
||||
|
||||
// Tab 0: Add form
|
||||
const addForm = ref({
|
||||
date: formatDate(new Date()),
|
||||
startTime: '09:00',
|
||||
endTime: '10:00',
|
||||
capacityStr: '10',
|
||||
})
|
||||
|
||||
// Tab 1: Close slots
|
||||
const closeDate = ref(formatDate(new Date()))
|
||||
const daySlots = ref<TimeSlot[]>([])
|
||||
|
||||
// Tab 2: Generate form
|
||||
const genForm = ref({
|
||||
startDate: formatDate(new Date()),
|
||||
endDate: formatDate(new Date(Date.now() + 7 * 86400000)), // +7 days
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 4. **Admin Store (Pinia)**
|
||||
|
||||
**File**: `packages/app/src/stores/admin.ts`
|
||||
|
||||
#### API Methods Related to Scheduling
|
||||
|
||||
```typescript
|
||||
// ── Week templates ───────────────────────────────────────────────
|
||||
|
||||
async fetchWeekTemplates(): Promise<WeekTemplate[]>
|
||||
// GET /admin/week-template
|
||||
// Returns all templates for current studio
|
||||
// Usage: Gets templates for display in week-template.vue
|
||||
|
||||
async saveWeekTemplates(templates: WeekTemplateInput[]): Promise<WeekTemplate[]>
|
||||
// PUT /admin/week-template
|
||||
// Body: { templates: [...] }
|
||||
// Replaces ALL templates with new set (delete all, create new)
|
||||
// Note: Backend uses transaction for atomicity
|
||||
|
||||
// ── Time slots ───────────────────────────────────────────────────
|
||||
|
||||
async fetchSlotsByDate(date: string): Promise<TimeSlot[]>
|
||||
// GET /admin/time-slots?date=YYYY-MM-DD
|
||||
// Returns all slots for a specific date
|
||||
// Used in slot-adjust.vue Tab 1 (close slots)
|
||||
|
||||
async createManualSlot(dto: CreateManualSlotDto): Promise<TimeSlot>
|
||||
// POST /admin/time-slot/manual
|
||||
// Creates a one-off time slot
|
||||
// Used in slot-adjust.vue Tab 0
|
||||
|
||||
async closeSlot(id: string): Promise<TimeSlot>
|
||||
// PUT /admin/time-slot/:id/close
|
||||
// Changes slot status from OPEN to CLOSED
|
||||
// Used in slot-adjust.vue Tab 1
|
||||
|
||||
async generateSlots(startDate: string, endDate: string): Promise<{ count: number }>
|
||||
// POST /admin/generate-slots
|
||||
// Generates slots from active templates for date range
|
||||
// Used in slot-adjust.vue Tab 2
|
||||
// Returns: { count: number of newly created slots }
|
||||
|
||||
// ── Dashboard ────────────────────────────────────────────────────
|
||||
|
||||
async fetchDashboardStats(): Promise<AdminStats>
|
||||
// GET /admin/stats
|
||||
// Returns: { todayBookings, totalOrders, totalBookings }
|
||||
// Used in index.vue
|
||||
```
|
||||
|
||||
#### API Response Types
|
||||
```typescript
|
||||
interface AdminStats {
|
||||
todayBookings: number
|
||||
totalOrders: number
|
||||
totalBookings: number
|
||||
}
|
||||
|
||||
interface WeekTemplate {
|
||||
id: string
|
||||
dayOfWeek: number // 1-7 (ISO weekday)
|
||||
startTime: string // HH:MM
|
||||
endTime: string // HH:MM
|
||||
capacity: number
|
||||
isActive: boolean
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
}
|
||||
|
||||
interface TimeSlot {
|
||||
id: string
|
||||
date: string // YYYY-MM-DD
|
||||
startTime: string
|
||||
endTime: string
|
||||
capacity: number
|
||||
bookedCount: number
|
||||
status: TimeSlotStatus // OPEN | FULL | CLOSED
|
||||
source: TimeSlotSource // TEMPLATE | MANUAL
|
||||
templateId: string | null
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔌 Backend Architecture
|
||||
|
||||
### Time Slot Controller
|
||||
**File**: `packages/server/src/time-slot/time-slot.controller.ts`
|
||||
|
||||
#### Member Endpoints (Public)
|
||||
```
|
||||
GET /time-slot/available?date=YYYY-MM-DD
|
||||
- Get available slots for a date
|
||||
- Include booking status for current user
|
||||
|
||||
GET /time-slot/:id
|
||||
- Get specific slot details
|
||||
```
|
||||
|
||||
#### Admin Endpoints (Requires JWT + ADMIN role)
|
||||
```
|
||||
GET /admin/week-template
|
||||
- Returns all WeekTemplates
|
||||
- Ordered by: dayOfWeek ASC, startTime ASC
|
||||
|
||||
PUT /admin/week-template
|
||||
- Request body: { templates: [...] }
|
||||
- Replaces all templates (transaction-based)
|
||||
- Validation: dayOfWeek 1-7, startTime/endTime strings
|
||||
|
||||
POST /admin/time-slot/manual
|
||||
- Request body: { date, startTime, endTime, capacity? }
|
||||
- Creates manual slot with source=MANUAL
|
||||
- Capacity defaults to DEFAULT_SLOT_CAPACITY
|
||||
|
||||
PUT /admin/time-slot/:id/close
|
||||
- Changes slot status to CLOSED
|
||||
- Returns updated slot
|
||||
|
||||
POST /admin/generate-slots
|
||||
- Generates slots from active templates
|
||||
- Fetches templates where isActive=true
|
||||
- Creates slots for next SLOT_GENERATION_DAYS (14 days by default)
|
||||
- Uses skipDuplicates to make re-runs safe
|
||||
- Returns: { count: number }
|
||||
```
|
||||
|
||||
### Time Slot Service
|
||||
**File**: `packages/server/src/time-slot/time-slot.service.ts`
|
||||
|
||||
Key methods:
|
||||
```typescript
|
||||
async getWeekTemplates(): Promise<WeekTemplate[]>
|
||||
// Returns all templates sorted by day/time
|
||||
|
||||
async replaceWeekTemplates(items: Array<{...}>): Promise<any>
|
||||
// Transaction-based replacement:
|
||||
// 1. Delete all existing templates
|
||||
// 2. Create new ones from items array
|
||||
// 3. Return count of created
|
||||
|
||||
async createManualSlot(dto): Promise<TimeSlot>
|
||||
// Creates slot with source=MANUAL, status=OPEN
|
||||
|
||||
async closeSlot(id: string): Promise<TimeSlot>
|
||||
// Updates status to CLOSED
|
||||
```
|
||||
|
||||
### Slot Generator Service
|
||||
**File**: `packages/server/src/time-slot/slot-generator.service.ts`
|
||||
|
||||
Key method:
|
||||
```typescript
|
||||
async generateSlots(daysAhead: number = 14): Promise<number>
|
||||
// 1. Fetches all WeekTemplates where isActive=true
|
||||
// 2. For each of next N days:
|
||||
// - Calculate ISO weekday (1=Mon, 7=Sun)
|
||||
// - Find matching templates by dayOfWeek
|
||||
// - Create TimeSlot records with source=TEMPLATE, templateId=id
|
||||
// 3. Uses createMany with skipDuplicates=true
|
||||
// 4. Returns count of newly created slots
|
||||
//
|
||||
// Key: Converts JS getDay() (0=Sun) to ISO weekday (1=Mon, 7=Sun)
|
||||
|
||||
async cleanupExpiredSlots(): Promise<number>
|
||||
// Called by scheduler
|
||||
// Closes all OPEN slots with date < today
|
||||
|
||||
async checkExpiredMemberships(): Promise<number>
|
||||
// Called by scheduler
|
||||
// Expires memberships past end date or with 0 sessions left
|
||||
|
||||
async completeBookings(): Promise<number>
|
||||
// Called by scheduler
|
||||
// Marks CONFIRMED bookings as COMPLETED if slot date passed
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Data Flow: "排课设置" User Journey
|
||||
|
||||
### Scenario: Admin sets up class schedule for next week
|
||||
|
||||
1. **Admin opens dashboard** → `index.vue`
|
||||
- Taps "排课设置" nav item
|
||||
|
||||
2. **Admin navigates to Week Template page** → `week-template.vue`
|
||||
- `onMounted()` → `fetchTemplates()`
|
||||
- Frontend: `GET /admin/week-template`
|
||||
- Shows existing templates grouped by day
|
||||
- Example display:
|
||||
```
|
||||
周一
|
||||
09:00-10:00 10人 [启用] [编辑] [删除]
|
||||
18:00-19:00 8人 [启用] [编辑] [删除]
|
||||
周三
|
||||
10:00-11:00 12人 [启用] [编辑] [删除]
|
||||
```
|
||||
|
||||
3. **Admin adds a new class** → Click "+ 新增时段"
|
||||
- Modal opens
|
||||
- Select day, time, capacity
|
||||
- Click "确认"
|
||||
- Template added to local `templates` array
|
||||
- **Save bar appears** at bottom
|
||||
|
||||
4. **Admin edits existing template** → Click "编辑"
|
||||
- Modal opens with existing values
|
||||
- Modify time/capacity
|
||||
- Click "确认"
|
||||
- Updated in local array
|
||||
- Save bar shows if changed
|
||||
|
||||
5. **Admin disables a template** → Click "停用"
|
||||
- `isActive` flipped to false
|
||||
- Template grayed out
|
||||
- Save bar shows
|
||||
|
||||
6. **Admin saves all changes** → Click "保存全部更改"
|
||||
- Loading state
|
||||
- Frontend: `PUT /admin/week-template` with all templates
|
||||
- Backend transaction:
|
||||
```
|
||||
BEGIN TRANSACTION
|
||||
DELETE FROM week_template
|
||||
INSERT INTO week_template (day_of_week, start_time, end_time, capacity, is_active) VALUES (...)
|
||||
COMMIT TRANSACTION
|
||||
```
|
||||
- Success toast
|
||||
- Frontend refetches templates
|
||||
- Save bar disappears
|
||||
|
||||
7. **Backend scheduler auto-generates slots**
|
||||
- Nightly cron (scheduler module)
|
||||
- Calls `SlotGeneratorService.generateSlots(14)`
|
||||
- Queries active WeekTemplates
|
||||
- For each day in next 14 days:
|
||||
- Checks what templates apply (by ISO weekday)
|
||||
- Creates TimeSlot records
|
||||
- Uses `skipDuplicates` to avoid duplicates on re-run
|
||||
- Example output:
|
||||
```
|
||||
date: 2026-04-06 (Monday)
|
||||
09:00-10:00 source=TEMPLATE templateId=abc123
|
||||
18:00-19:00 source=TEMPLATE templateId=def456
|
||||
date: 2026-04-08 (Wednesday)
|
||||
10:00-11:00 source=TEMPLATE templateId=ghi789
|
||||
```
|
||||
|
||||
8. **Members can see and book the generated slots**
|
||||
- Frontend: `GET /time-slot/available?date=2026-04-06`
|
||||
- Members choose a slot and confirm booking
|
||||
|
||||
---
|
||||
|
||||
## 📅 Constants & Utilities
|
||||
|
||||
### Shared Constants
|
||||
**File**: `packages/shared/src/constants.ts`
|
||||
|
||||
```typescript
|
||||
export const SLOT_GENERATION_DAYS = 14
|
||||
// Number of days ahead to generate slots for
|
||||
|
||||
export const DEFAULT_SLOT_CAPACITY = 1
|
||||
// Default capacity if not specified (for private lessons)
|
||||
|
||||
export const WEEKDAY_LABELS = ['', '周一', '周二', '周三', '周四', '周五', '周六', '周日']
|
||||
// Index 0 is unused, 1-7 map to weekdays
|
||||
// Used in dropdowns and display
|
||||
|
||||
export const DEFAULT_CANCEL_HOURS_LIMIT = 2
|
||||
// Hours before slot to allow free cancellation
|
||||
|
||||
export const TIME_PERIODS = {
|
||||
MORNING: { label: '上午', start: '06:00', end: '12:00' },
|
||||
AFTERNOON: { label: '下午', start: '12:00', end: '18:00' },
|
||||
EVENING: { label: '晚上', start: '18:00', end: '22:00' }
|
||||
}
|
||||
|
||||
export const DATE_SELECTOR_DAYS = 7
|
||||
```
|
||||
|
||||
### Format Utilities
|
||||
**File**: `packages/app/src/utils/format.ts`
|
||||
|
||||
```typescript
|
||||
formatDate(date: Date | string): string
|
||||
// Converts to YYYY-MM-DD format
|
||||
// Used for date pickers and API calls
|
||||
|
||||
getWeekdayLabel(date: Date | string): string
|
||||
// Returns Chinese weekday (周一-周日)
|
||||
|
||||
isToday(date: Date | string): boolean
|
||||
// Checks if date is today
|
||||
|
||||
getDateRange(days: number): Array<{ date, weekday, isToday }>
|
||||
// Generates future N days' dates
|
||||
```
|
||||
|
||||
### Request Utility
|
||||
**File**: `packages/app/src/utils/request.ts`
|
||||
|
||||
```typescript
|
||||
function request<T>(options: RequestOptions): Promise<T>
|
||||
// Makes HTTP request with JWT auth
|
||||
// Auto-refreshes token on 401
|
||||
|
||||
function get<T>(url: string, data?: Record<string, unknown>): Promise<T>
|
||||
function post<T>(url: string, data?: Record<string, unknown>): Promise<T>
|
||||
function put<T>(url: string, data?: Record<string, unknown>): Promise<T>
|
||||
function del<T>(url: string, data?: Record<string, unknown>): Promise<T>
|
||||
|
||||
// Base URL logic:
|
||||
// - Production: https://focus.richarjiang.com/api
|
||||
// - Development: http://localhost:3000/api
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Permission Model
|
||||
|
||||
**Role**: `UserRole.ADMIN`
|
||||
|
||||
### Protected Endpoints
|
||||
All `/admin/*` endpoints require:
|
||||
1. Valid JWT token
|
||||
2. Header: `Authorization: Bearer <token>`
|
||||
3. User role must be `ADMIN`
|
||||
|
||||
Protected by:
|
||||
- `@UseGuards(JwtAuthGuard, RolesGuard)`
|
||||
- `@Roles(UserRole.ADMIN)`
|
||||
|
||||
### Auth Flow
|
||||
1. Admin logs in via auth module
|
||||
2. JWT token returned, stored in `uni.setStorageSync('token')`
|
||||
3. All requests include token in Authorization header
|
||||
4. If 401 response: clear token, show login prompt
|
||||
5. If 4xx/5xx: show error toast
|
||||
|
||||
---
|
||||
|
||||
## 🐛 Current Implementation Notes
|
||||
|
||||
### Implemented Features ✅
|
||||
- [x] Week template CRUD (Create, Read, Update via replace)
|
||||
- [x] Manual slot creation
|
||||
- [x] Close individual slots
|
||||
- [x] Batch slot generation from templates
|
||||
- [x] UI for all three slot adjustment tabs
|
||||
- [x] Local state change tracking (isDirty)
|
||||
- [x] Modal form for adding/editing templates
|
||||
- [x] Grouping templates by weekday
|
||||
- [x] Status badges for slots (OPEN/FULL/CLOSED)
|
||||
|
||||
### Missing/Stub Features ⚠️
|
||||
- [ ] `fetchDashboardStats()` API endpoint appears to be stubbed
|
||||
- `index.vue` calls it but endpoint not found in backend
|
||||
- May need to implement in studio or payment controller
|
||||
- [ ] No client-side validation errors displayed on API failures
|
||||
- [ ] No confirmation before overwriting all templates
|
||||
- [ ] No undo/restore from past template versions
|
||||
|
||||
### Edge Cases to Watch 🔍
|
||||
1. **Timezone handling**: All dates are treated as UTC midnight
|
||||
- Slot generation uses `setUTCHours(0,0,0,0)`
|
||||
- Frontend format displays as YYYY-MM-DD (local string)
|
||||
|
||||
2. **Duplicate slot prevention**:
|
||||
- Backend uses `skipDuplicates: true` in createMany
|
||||
- Assumes date + startTime + endTime forms unique key
|
||||
|
||||
3. **Template replacement is atomic**:
|
||||
- All templates deleted, all new ones created in transaction
|
||||
- If one row fails, entire operation rolls back
|
||||
|
||||
4. **ISO weekday vs JS getDay()**:
|
||||
- Shared code uses ISO: 1=Mon, 7=Sun
|
||||
- Frontend picker displays Chinese labels
|
||||
- Backend slot-generator converts JS getDay() to ISO
|
||||
|
||||
---
|
||||
|
||||
## 📱 UI Design Patterns
|
||||
|
||||
### Colors & Styling
|
||||
- **Primary**: `#1a1a2e` (dark navy)
|
||||
- **Accent**: `#c9a87c` (gold)
|
||||
- **Success**: `#27ae60` (green)
|
||||
- **Warning**: `#e67e22` (orange)
|
||||
- **Danger**: `#c0392b` (red)
|
||||
- **Background**: `#f5f3f0` (light beige)
|
||||
|
||||
### Component Patterns
|
||||
1. **Skeleton loaders**: Shimmer animation for loading states
|
||||
2. **Save bar**: Fixed bottom bar shows only when changes exist
|
||||
3. **Toggle buttons**: Color indicates state (on=green, off=orange)
|
||||
4. **Modals**: Bottom-sheet style with backdrop
|
||||
5. **Pickers**: WeChat native pickers for date/time
|
||||
6. **Badges**: Color-coded status indicators
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Deployment & Configuration
|
||||
|
||||
### Frontend
|
||||
- WeChat mini-program environment
|
||||
- Base URL logic in `packages/app/src/utils/request.ts`:
|
||||
```typescript
|
||||
// Production
|
||||
https://focus.richarjiang.com/api
|
||||
|
||||
// Development
|
||||
http://localhost:3000/api
|
||||
```
|
||||
|
||||
### Backend
|
||||
- NestJS server on port 3000
|
||||
- Prisma ORM with database
|
||||
- JWT authentication
|
||||
- Role-based access control (RBAC)
|
||||
|
||||
---
|
||||
|
||||
## 📚 Related Files Summary
|
||||
|
||||
| File | Purpose | Type |
|
||||
|------|---------|------|
|
||||
| `admin/index.vue` | Admin dashboard | Component |
|
||||
| `admin/week-template.vue` | Schedule templates | Component ⭐ |
|
||||
| `admin/slot-adjust.vue` | Manual slot ops | Component |
|
||||
| `stores/admin.ts` | Admin API calls | Store |
|
||||
| `time-slot.service.ts` | Slot business logic | Service |
|
||||
| `slot-generator.service.ts` | Template-based generation | Service |
|
||||
| `time-slot.controller.ts` | API endpoints | Controller |
|
||||
| `week-template.ts` | Type definitions | Type |
|
||||
| `constants.ts` | Shared constants | Config |
|
||||
| `format.ts` | Date/time utilities | Utility |
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Key Takeaways
|
||||
|
||||
1. **"排课设置"** is the master schedule template management page
|
||||
2. **Templates are ISO-weekday based** (1=Monday, 7=Sunday)
|
||||
3. **Slot generation is automated** via backend scheduler, triggered by:
|
||||
- Nightly cron job
|
||||
- Or manual POST to `/admin/generate-slots` endpoint
|
||||
4. **Save pattern**: Local changes tracked, one "save all" API call with full template array
|
||||
5. **Timezone**: All operations use UTC midnight as boundaries
|
||||
6. **Atomicity**: Backend uses Prisma transactions for template replacement
|
||||
7. **Permissions**: All admin endpoints protected by JWT + ADMIN role guard
|
||||
|
||||
552
BOOKING_ARCHITECTURE_DIAGRAM.md
Normal file
552
BOOKING_ARCHITECTURE_DIAGRAM.md
Normal file
@@ -0,0 +1,552 @@
|
||||
# Booking Page - Architecture Diagram
|
||||
|
||||
## 🏛️ Complete System Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────────────────┐
|
||||
│ WECHAT MINI-PROGRAM │
|
||||
│ │
|
||||
│ ┌──────────────────────────────────────────────────────────────────────┐ │
|
||||
│ │ FRONTEND (Vue 3 + Uni-app) │ │
|
||||
│ │ │ │
|
||||
│ │ ┌────────────────────────────────────────────────────────────────┐ │ │
|
||||
│ │ │ pages/booking/index.vue (Main Page Component) │ │ │
|
||||
│ │ │ ───────────────────────────────────────────────────────────── │ │ │
|
||||
│ │ │ State: │ │ │
|
||||
│ │ │ • selectedDate: string │ │ │
|
||||
│ │ │ • selectedPeriod: PeriodKey | null │ │ │
|
||||
│ │ │ • showConfirmPopup: boolean │ │ │
|
||||
│ │ │ • pendingSlot: TimeSlotWithBookingStatus | null │ │ │
|
||||
│ │ │ • refreshing: boolean │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Computed: │ │ │
|
||||
│ │ │ • scrollHeight (responsive) │ │ │
|
||||
│ │ │ • filteredSlots (depends on period) │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Lifecycle: │ │ │
|
||||
│ │ │ • onMounted() → Load memberships + today's slots │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Event Handlers: │ │ │
|
||||
│ │ │ • onDateSelect() → loadSlots(newDate) │ │ │
|
||||
│ │ │ • onPeriodChange() → Auto-filter via computed │ │ │
|
||||
│ │ │ • onRefresh() → Reload slots │ │ │
|
||||
│ │ │ • onBookTap() → Auth check → Show popup │ │ │
|
||||
│ │ │ • onConfirmBooking() → Create booking → Refresh │ │ │
|
||||
│ │ │ • onCancelTap() → Cancel booking → Refresh │ │ │
|
||||
│ │ └────────────────────────────────────────────────────────────────┘ │ │
|
||||
│ │ ↓ │ │
|
||||
│ │ ┌─────────────────────────────────────────────────────────────────┐ │ │
|
||||
│ │ │ Child Components (All reactive & event-driven) │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ ┌──────────────────┐ ┌──────────────────┐ │ │ │
|
||||
│ │ │ │ DateSelector.vue │ │ TimePeriod...vue │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ [Today] [5] [4] │ │ 全部 上午 下午... │ │ │ │
|
||||
│ │ │ │ Props: modelValue│ │ Props: modelValue│ │ │ │
|
||||
│ │ │ │ Emit: @select │ │ Emit: @change │ │ │ │
|
||||
│ │ │ └──────────────────┘ └──────────────────┘ │ │ │
|
||||
│ │ │ ↓ ↓ │ │ │
|
||||
│ │ │ (Updates selectedDate) (Updates selectedPeriod) │ │ │
|
||||
│ │ │ ↓ ↓ │ │ │
|
||||
│ │ │ (Triggers loadSlots) (Recomputes filteredSlots) │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ ┌──────────────────────────────────────────────────────────┐ │ │ │
|
||||
│ │ │ │ SlotCard.vue (Rendered via v-for over filteredSlots) │ │ │ │
|
||||
│ │ │ │ │ │ │ │
|
||||
│ │ │ │ ┌─────────────────────────────────────────────────────┐ │ │ │ │
|
||||
│ │ │ │ │ [09:00-10:00] [0/1 人] │ │ │ │ │
|
||||
│ │ │ │ │ [可预约] │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ Props: slot (TimeSlotWithBookingStatus) │ │ │ │ │
|
||||
│ │ │ │ │ Emit: @book | @cancel │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ Computed: │ │ │ │ │
|
||||
│ │ │ │ │ • capacityLabel ("0/1 人" | "已关闭") │ │ │ │ │
|
||||
│ │ │ │ │ • capacityClass (cap-open | cap-almost | ...) │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ Button States (4 conditions): │ │ │ │ │
|
||||
│ │ │ │ │ 1. OPEN + not booked → "可预约" │ │ │ │ │
|
||||
│ │ │ │ │ 2. OPEN + booked → "已预约" + "取消" │ │ │ │ │
|
||||
│ │ │ │ │ 3. FULL → "已约满" │ │ │ │ │
|
||||
│ │ │ │ │ 4. CLOSED → "已关闭" │ │ │ │ │
|
||||
│ │ │ │ └─────────────────────────────────────────────────────┘ │ │ │ │
|
||||
│ │ │ │ ↓ ↓ │ │ │ │
|
||||
│ │ │ │ (onBookTap) (onCancelTap) │ │ │ │
|
||||
│ │ │ │ │ │ │ │
|
||||
│ │ │ │ ┌──────────────────────────────────────────────────────┐ │ │ │ │
|
||||
│ │ │ │ │ BookingConfirmPopup.vue (Modal) │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ Props: │ │ │ │ │
|
||||
│ │ │ │ │ • visible: boolean │ │ │ │ │
|
||||
│ │ │ │ │ • slot: TimeSlotWithBookingStatus │ │ │ │ │
|
||||
│ │ │ │ │ • memberships: MembershipWithCardType[] │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ State: │ │ │ │ │
|
||||
│ │ │ │ │ • selectedMembershipId (auto-selected on show) │ │ │ │ │
|
||||
│ │ │ │ │ │ │ │ │ │
|
||||
│ │ │ │ │ Display: │ │ │ │ │
|
||||
│ │ │ │ │ ┌─────────────────────────────────┐ │ │ │ │ │
|
||||
│ │ │ │ │ │ 确认预约 ✕ │ │ │ │ │
|
||||
│ │ │ │ │ ├─────────────────────────────────┤ │ │ │ │ │
|
||||
│ │ │ │ │ │ 日期: 2026-04-05 │ │ │ │ │ │
|
||||
│ │ │ │ │ │ 时间: 09:00 - 10:00 │ │ │ │ │ │
|
||||
│ │ │ │ │ │ 剩余: 1 个名额 │ │ │ │ │ │
|
||||
│ │ │ │ │ ├─────────────────────────────────┤ │ │ │ │ │
|
||||
│ │ │ │ │ │ 💳 私教课程 │ │ │ │ │ │
|
||||
│ │ │ │ │ │ 剩余 10 次 ✓ │ │ │ │ │ │
|
||||
│ │ │ │ │ ├─────────────────────────────────┤ │ │ │ │ │
|
||||
│ │ │ │ │ │ [取消] [确认预约] │ │ │ │ │ │
|
||||
│ │ │ │ │ └─────────────────────────────────┘ │ │ │ │ │
|
||||
│ │ │ │ │ ↓ │ │ │ │ │
|
||||
│ │ │ │ │ Emit: @confirm({timeSlotId, membershipId}) │ │ │ │ │
|
||||
│ │ │ │ │ or @cancel │ │ │ │ │
|
||||
│ │ │ │ └──────────────────────────────────────────────────────┘ │ │ │ │
|
||||
│ │ │ └──────────────────────────────────────────────────────────┘ │ │ │
|
||||
│ │ └────────────────────────────────────────────────────────────────┘ │ │
|
||||
│ │ ↓ │ │
|
||||
│ │ ┌────────────────────────────────────────────────────────────────┐ │ │
|
||||
│ │ │ Pinia Stores (Reactive State Management) │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ stores/booking.ts: │ │ │
|
||||
│ │ │ State: │ │ │
|
||||
│ │ │ • slots: TimeSlotWithBookingStatus[] │ │ │
|
||||
│ │ │ • myBookings: BookingWithDetails[] │ │ │
|
||||
│ │ │ • upcomingBookings: BookingWithDetails[] │ │ │
|
||||
│ │ │ • loadingSlots: boolean │ │ │
|
||||
│ │ │ • loadingBookings: boolean │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Actions: │ │ │
|
||||
│ │ │ • fetchSlots(date) │ │ │
|
||||
│ │ │ • createBooking(dto) │ │ │
|
||||
│ │ │ • cancelBooking(bookingId) │ │ │
|
||||
│ │ │ • fetchMyBookings() │ │ │
|
||||
│ │ │ • fetchUpcomingBookings() │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ stores/user.ts: │ │ │
|
||||
│ │ │ State: │ │ │
|
||||
│ │ │ • user: UserProfileResponse | null │ │ │
|
||||
│ │ │ • memberships: MembershipWithCardType[] │ │ │
|
||||
│ │ │ • token: string (from localStorage) │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Computed: │ │ │
|
||||
│ │ │ • loggedIn: !!token │ │ │
|
||||
│ │ │ • hasValidMembership: activeMemberships.length > 0 │ │ │
|
||||
│ │ │ • activeMemberships: memberships filtered by ACTIVE │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ Actions: │ │ │
|
||||
│ │ │ • login() │ │ │
|
||||
│ │ │ • fetchMemberships() │ │ │
|
||||
│ │ │ • fetchProfile() │ │ │
|
||||
│ │ │ • logout() │ │ │
|
||||
│ │ └────────────────────────────────────────────────────────────────┘ │ │
|
||||
│ │ ↓ │ │
|
||||
│ │ ┌────────────────────────────────────────────────────────────────┐ │ │
|
||||
│ │ │ Utils & Helpers │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ utils/request.ts (HTTP Client): │ │ │
|
||||
│ │ │ • request<T>(options): Promise<T> │ │ │
|
||||
│ │ │ • get<T>(url, data?): Promise<T> │ │ │
|
||||
│ │ │ • post<T>(url, data?): Promise<T> │ │ │
|
||||
│ │ │ • put<T>(url, data?): Promise<T> │ │ │
|
||||
│ │ │ │ │ │
|
||||
│ │ │ utils/format.ts (Date Utilities): │ │ │
|
||||
│ │ │ • formatDate(date): string │ │ │
|
||||
│ │ │ • getWeekdayLabel(date): string │ │ │
|
||||
│ │ │ • isToday(date): boolean │ │ │
|
||||
│ │ │ • getDateRange(days): DateInfo[] │ │ │
|
||||
│ │ └────────────────────────────────────────────────────────────────┘ │ │
|
||||
│ └──────────────────────────────────────────────────────────────────────┘ │
|
||||
│ ↕ │
|
||||
│ HTTP Requests │
|
||||
│ (Bearer Token in Header) │
|
||||
│ ↓ │
|
||||
│ ┌──────────────────────────────────────────────────────────────────────┐ │
|
||||
│ │ BACKEND API │ │
|
||||
│ │ (packages/server/src/time-slot, booking, membership modules) │ │
|
||||
│ │ │ │
|
||||
│ │ GET /api/time-slot/available?date=YYYY-MM-DD │ │
|
||||
│ │ → TimeSlotWithBookingStatus[] │ │
|
||||
│ │ │ │
|
||||
│ │ POST /api/booking │ │
|
||||
│ │ Body: { timeSlotId, membershipId } │ │
|
||||
│ │ → BookingWithDetails │ │
|
||||
│ │ │ │
|
||||
│ │ PUT /api/booking/:bookingId/cancel │ │
|
||||
│ │ → BookingWithDetails (status: CANCELLED) │ │
|
||||
│ │ │ │
|
||||
│ │ GET /api/membership/my │ │
|
||||
│ │ → MembershipWithCardType[] │ │
|
||||
│ └──────────────────────────────────────────────────────────────────────┘ │
|
||||
│ ↕ │
|
||||
│ ┌──────────────────────────────────────────────────────────────────────┐ │
|
||||
│ │ DATABASE │ │
|
||||
│ │ (TimeSlot, Booking, Membership, User tables) │ │
|
||||
│ └──────────────────────────────────────────────────────────────────────┘ │
|
||||
└─────────────────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Data Flow Lifecycle
|
||||
|
||||
```
|
||||
╔══════════════════════════════════════════════════════════════════════════╗
|
||||
║ BOOKING PAGE LIFECYCLE ║
|
||||
╚══════════════════════════════════════════════════════════════════════════╝
|
||||
|
||||
1. PAGE LOAD
|
||||
┌─ onMounted()
|
||||
│ ├─ IF loggedIn AND no memberships
|
||||
│ │ └─ userStore.fetchMemberships()
|
||||
│ │ GET /membership/my
|
||||
│ │ → memberships array
|
||||
│ │
|
||||
│ └─ loadSlots(today)
|
||||
│ → bookingStore.fetchSlots(date)
|
||||
│ GET /time-slot/available?date=YYYY-MM-DD
|
||||
│ → slots array
|
||||
│ → Render SlotCard components
|
||||
│
|
||||
└─ READY ✓
|
||||
|
||||
2. USER SELECTS DATE
|
||||
├─ onDateSelect(newDate)
|
||||
├─ selectedDate.value = newDate
|
||||
└─ loadSlots(newDate)
|
||||
→ bookingStore.fetchSlots(newDate)
|
||||
→ slots array (for new date)
|
||||
→ SlotCard components re-render
|
||||
|
||||
3. USER SELECTS TIME PERIOD
|
||||
├─ onPeriodChange(period)
|
||||
├─ selectedPeriod.value = period
|
||||
└─ filteredSlots computed updates automatically
|
||||
→ Vue watches TIME_PERIODS[period]
|
||||
→ Filters slots by startTime
|
||||
→ SlotCard components re-render (subset)
|
||||
|
||||
4. USER PULLS TO REFRESH
|
||||
├─ onRefresh()
|
||||
├─ refreshing.value = true
|
||||
├─ loadSlots(selectedDate.value)
|
||||
│ → bookingStore.fetchSlots()
|
||||
│ → slots array (refreshed)
|
||||
└─ refreshing.value = false
|
||||
|
||||
5. USER TAPS "可预约" (Book)
|
||||
├─ onBookTap(slot)
|
||||
│
|
||||
├─ CHECK: loggedIn?
|
||||
│ ├─ NO → Show login modal
|
||||
│ │ User clicks confirm
|
||||
│ │ → userStore.login()
|
||||
│ │ POST /auth/wxLogin
|
||||
│ │ → token + user
|
||||
│ │ → userStore.fetchMemberships()
|
||||
│ │ GET /membership/my
|
||||
│ │ → memberships array
|
||||
│ │ → RETRY onBookTap(slot)
|
||||
│ │
|
||||
│ └─ YES → Continue
|
||||
│
|
||||
├─ CHECK: hasValidMembership?
|
||||
│ ├─ NO → Show purchase modal
|
||||
│ │ User clicks confirm
|
||||
│ │ → uni.navigateTo('/pages/store/index')
|
||||
│ │
|
||||
│ └─ YES → Continue
|
||||
│
|
||||
├─ pendingSlot.value = slot
|
||||
├─ showConfirmPopup.value = true
|
||||
│
|
||||
└─ POPUP SHOWN ✓
|
||||
├─ selectedMembershipId auto-selected (first one)
|
||||
├─ Watch on popup visibility + memberships
|
||||
│ → Auto-select first membership when shown
|
||||
│
|
||||
└─ User sees:
|
||||
• Slot date/time
|
||||
• Membership card options
|
||||
• Deduction message
|
||||
|
||||
6. USER CONFIRMS BOOKING
|
||||
├─ onConfirmBooking({timeSlotId, membershipId})
|
||||
├─ showConfirmPopup.value = false
|
||||
├─ uni.showLoading('预约中...')
|
||||
│
|
||||
├─ bookingStore.createBooking(payload)
|
||||
│ └─ POST /booking
|
||||
│ Body: { timeSlotId, membershipId }
|
||||
│ → BookingWithDetails
|
||||
│
|
||||
├─ uni.hideLoading()
|
||||
├─ uni.showToast('预约成功!')
|
||||
│
|
||||
├─ loadSlots(selectedDate.value) // REFRESH
|
||||
│ → bookingStore.fetchSlots()
|
||||
│ GET /time-slot/available?date=
|
||||
│ → slots array (UPDATED)
|
||||
│ • slot.isBookedByMe = true
|
||||
│ • slot.myBookingId = bookingId
|
||||
│ • Button now shows "已预约"
|
||||
│
|
||||
└─ BOOKING COMPLETE ✓
|
||||
|
||||
7. USER TAPS "取消" (Cancel)
|
||||
├─ onCancelTap(slot)
|
||||
├─ Show confirmation modal
|
||||
├─ User confirms
|
||||
│
|
||||
├─ uni.showLoading('取消中...')
|
||||
│
|
||||
├─ bookingStore.cancelBooking(slot.myBookingId)
|
||||
│ └─ PUT /booking/:id/cancel
|
||||
│ → BookingWithDetails (status: CANCELLED)
|
||||
│
|
||||
├─ uni.hideLoading()
|
||||
├─ uni.showToast('已取消预约')
|
||||
│
|
||||
├─ loadSlots(selectedDate.value) // REFRESH
|
||||
│ → bookingStore.fetchSlots()
|
||||
│ GET /time-slot/available?date=
|
||||
│ → slots array (UPDATED)
|
||||
│ • slot.isBookedByMe = false
|
||||
│ • slot.myBookingId = null
|
||||
│ • Button now shows "可预约"
|
||||
│
|
||||
└─ CANCELLATION COMPLETE ✓
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 State Synchronization
|
||||
|
||||
```
|
||||
Component ←→ Pinia Store ←→ API ←→ Database
|
||||
|
||||
┌──────────────────────────────────────────────────────────┐
|
||||
│ Component (Vue Template) │
|
||||
│ │
|
||||
│ {{ bookingStore.slots }} ← Reactive binding │
|
||||
│ {{ filteredSlots }} ← Computed from slots │
|
||||
│ {{ userStore.hasValidMembership }} ← Computed from store │
|
||||
│ │
|
||||
│ @click="onBookTap(slot)" ← User action │
|
||||
│ │
|
||||
└──────────────────────────────────────────────────────────┘
|
||||
↑ ↓
|
||||
│ Read │ Mutate
|
||||
│ ↓
|
||||
┌──────────────────────────────────────────────────────────┐
|
||||
│ Pinia Store State │
|
||||
│ │
|
||||
│ slots: TimeSlotWithBookingStatus[] │
|
||||
│ ↓ Recomputed when: │
|
||||
│ - fetchSlots() returns data │
|
||||
│ - createBooking() succeeds │
|
||||
│ - cancelBooking() succeeds │
|
||||
│ │
|
||||
│ memberships: MembershipWithCardType[] │
|
||||
│ ↓ Set when: │
|
||||
│ - fetchMemberships() returns data │
|
||||
│ │
|
||||
│ loadingSlots: boolean │
|
||||
│ ↓ Set to: │
|
||||
│ - true on fetchSlots() start │
|
||||
│ - false on fetchSlots() end │
|
||||
│ │
|
||||
└──────────────────────────────────────────────────────────┘
|
||||
↑ ↓
|
||||
│ Response │ Request
|
||||
│ ↓
|
||||
┌──────────────────────────────────────────────────────────┐
|
||||
│ API Layer (utils/request.ts) │
|
||||
│ │
|
||||
│ GET /time-slot/available?date=2026-04-05 │
|
||||
│ ↓ Returns ApiResponse<TimeSlotWithBookingStatus[]> │
|
||||
│ { success: true, data: [...], message: null } │
|
||||
│ │
|
||||
│ POST /booking │
|
||||
│ ↓ Body: { timeSlotId, membershipId } │
|
||||
│ ↓ Returns ApiResponse<BookingWithDetails> │
|
||||
│ { success: true, data: {...}, message: null } │
|
||||
│ │
|
||||
│ PUT /booking/:id/cancel │
|
||||
│ ↓ Returns ApiResponse<BookingWithDetails> │
|
||||
│ { success: true, data: {...}, message: null } │
|
||||
│ │
|
||||
└──────────────────────────────────────────────────────────┘
|
||||
↑ ↓
|
||||
│ SELECT/UPDATE │ INSERT/UPDATE
|
||||
│ ↓
|
||||
┌──────────────────────────────────────────────────────────┐
|
||||
│ Database │
|
||||
│ │
|
||||
│ TimeSlot Table │
|
||||
│ id, date, startTime, endTime, capacity, │
|
||||
│ bookedCount, status, source, templateId │
|
||||
│ │
|
||||
│ Booking Table │
|
||||
│ id, userId, timeSlotId, membershipId, │
|
||||
│ status (CONFIRMED/CANCELLED/...), bookedAt │
|
||||
│ │
|
||||
│ Membership Table │
|
||||
│ id, userId, cardTypeId, status, remainingTimes, │
|
||||
│ expireDate, createdAt, updatedAt │
|
||||
│ │
|
||||
└──────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Component Communication
|
||||
|
||||
```
|
||||
Root: pages/booking/index.vue
|
||||
│
|
||||
├─ PROPS DOWN ──→ DateSelector.vue
|
||||
│ └─ modelValue: string (YYYY-MM-DD)
|
||||
│
|
||||
├─ PROPS DOWN ──→ TimePeriodFilter.vue
|
||||
│ └─ modelValue: PeriodKey | null
|
||||
│
|
||||
├─ PROPS DOWN ──→ SlotCard.vue (v-for)
|
||||
│ └─ slot: TimeSlotWithBookingStatus
|
||||
│
|
||||
├─ PROPS DOWN ──→ BookingConfirmPopup.vue
|
||||
│ ├─ visible: boolean
|
||||
│ ├─ slot: TimeSlotWithBookingStatus | null
|
||||
│ └─ memberships: MembershipWithCardType[]
|
||||
│
|
||||
├─ EVENTS UP ←── DateSelector.vue
|
||||
│ ├─ @select(date) → onDateSelect()
|
||||
│ └─ @update:modelValue(date)
|
||||
│
|
||||
├─ EVENTS UP ←── TimePeriodFilter.vue
|
||||
│ ├─ @change(period) → onPeriodChange()
|
||||
│ └─ @update:modelValue(period)
|
||||
│
|
||||
├─ EVENTS UP ←── SlotCard.vue
|
||||
│ ├─ @book(slot) → onBookTap()
|
||||
│ └─ @cancel(slot) → onCancelTap()
|
||||
│
|
||||
└─ EVENTS UP ←── BookingConfirmPopup.vue
|
||||
├─ @confirm({timeSlotId, membershipId}) → onConfirmBooking()
|
||||
└─ @cancel → showConfirmPopup = false
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧬 Reactive Dependency Chain
|
||||
|
||||
```
|
||||
LocalStorage (token)
|
||||
↓
|
||||
userStore.token
|
||||
↓
|
||||
userStore.loggedIn (computed)
|
||||
↓
|
||||
pages/booking → Check login status
|
||||
↓
|
||||
userStore.memberships
|
||||
↓
|
||||
userStore.activeMemberships (computed, filtered by ACTIVE)
|
||||
↓
|
||||
userStore.hasValidMembership (computed)
|
||||
↓
|
||||
pages/booking → Show/hide booking button & membership popup
|
||||
↓
|
||||
BookingConfirmPopup ← receives activeMemberships as props
|
||||
↓
|
||||
selectedMembershipId (auto-selected on popup show)
|
||||
|
||||
|
||||
bookingStore.slots (array)
|
||||
↓
|
||||
pages/booking.selectedPeriod
|
||||
↓
|
||||
pages/booking.filteredSlots (computed, filtered by TIME_PERIODS)
|
||||
↓
|
||||
v-for → SlotCard components render
|
||||
↓
|
||||
Each SlotCard → capacityLabel (computed)
|
||||
→ capacityClass (computed)
|
||||
→ Button state determined
|
||||
|
||||
|
||||
bookingStore.loadingSlots (boolean)
|
||||
↓
|
||||
pages/booking template
|
||||
↓
|
||||
v-if → Show skeleton | Show slots | Show empty state
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📋 API Request/Response Chain
|
||||
|
||||
```
|
||||
USER TAPS DATE
|
||||
↓
|
||||
pages/booking/onDateSelect()
|
||||
↓
|
||||
loadSlots(date)
|
||||
↓
|
||||
bookingStore.fetchSlots(date)
|
||||
↓
|
||||
get('/time-slot/available', { date })
|
||||
↓
|
||||
utils/request.get()
|
||||
↓
|
||||
uni.request({
|
||||
url: 'http://localhost:3000/api/time-slot/available',
|
||||
method: 'GET',
|
||||
data: { date: '2026-04-05' },
|
||||
header: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Bearer <token>'
|
||||
}
|
||||
})
|
||||
↓
|
||||
BACKEND: GET /api/time-slot/available?date=2026-04-05
|
||||
(Queries database for TimeSlot records matching date)
|
||||
(Fetches current user's bookings for those slots)
|
||||
(Enriches response with isBookedByMe, myBookingId)
|
||||
↓
|
||||
Response: {
|
||||
"success": true,
|
||||
"data": [
|
||||
{
|
||||
"id": "...",
|
||||
"date": "2026-04-05",
|
||||
"startTime": "09:00",
|
||||
"endTime": "10:00",
|
||||
"capacity": 1,
|
||||
"bookedCount": 0,
|
||||
"status": "OPEN",
|
||||
"source": "MANUAL",
|
||||
"templateId": null,
|
||||
"isBookedByMe": false,
|
||||
"myBookingId": null
|
||||
},
|
||||
...
|
||||
],
|
||||
"message": null
|
||||
}
|
||||
↓
|
||||
request.ts success callback
|
||||
├─ Check: statusCode < 400 ✓
|
||||
├─ Check: body.success === true ✓
|
||||
├─ Extract: body.data (TimeSlotWithBookingStatus[])
|
||||
└─ Resolve promise with data
|
||||
↓
|
||||
bookingStore.fetchSlots() try block
|
||||
├─ slots.value = data
|
||||
└─ loadingSlots.value = false
|
||||
↓
|
||||
Component template reactivity
|
||||
├─ Re-render with new slots
|
||||
├─ Compute filteredSlots
|
||||
└─ Render SlotCard components
|
||||
```
|
||||
|
||||
894
BOOKING_PAGE_ANALYSIS.md
Normal file
894
BOOKING_PAGE_ANALYSIS.md
Normal file
@@ -0,0 +1,894 @@
|
||||
# WeChat Mini-Program Booking Page Analysis
|
||||
## mp-pilates Project (Uni-app + Vue 3)
|
||||
|
||||
---
|
||||
|
||||
## 📋 Project Structure Overview
|
||||
|
||||
```
|
||||
packages/app/src/
|
||||
├── pages/
|
||||
│ └── booking/
|
||||
│ └── index.vue # 📍 Main booking page
|
||||
├── components/
|
||||
│ ├── DateSelector.vue # Date picker (7 days)
|
||||
│ ├── TimePeriodFilter.vue # Morning/Afternoon/Evening filter
|
||||
│ ├── SlotCard.vue # Individual time slot card
|
||||
│ └── BookingConfirmPopup.vue # Confirmation modal
|
||||
├── stores/
|
||||
│ ├── booking.ts # 📍 Booking state management
|
||||
│ └── user.ts # User/membership state
|
||||
└── utils/
|
||||
├── request.ts # API request utilities
|
||||
└── format.ts # Date/time formatting utilities
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 API Flow
|
||||
|
||||
### Endpoint: `/api/time-slot/available?date=YYYY-MM-DD`
|
||||
|
||||
**Request:**
|
||||
- Method: `GET`
|
||||
- Query params: `date` (YYYY-MM-DD format)
|
||||
- Authentication: Bearer token from localStorage
|
||||
|
||||
**Response Format (from your example):**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": [
|
||||
{
|
||||
"id": "string (UUID)",
|
||||
"date": "2026-04-05",
|
||||
"startTime": "09:00",
|
||||
"endTime": "10:00",
|
||||
"capacity": 1,
|
||||
"bookedCount": 0,
|
||||
"status": "OPEN",
|
||||
"source": "MANUAL",
|
||||
"templateId": null,
|
||||
"isBookedByMe": false,
|
||||
"myBookingId": null
|
||||
}
|
||||
],
|
||||
"message": null
|
||||
}
|
||||
```
|
||||
|
||||
**Status Values:**
|
||||
- `OPEN` - Available to book
|
||||
- `FULL` - All slots booked
|
||||
- `CLOSED` - Time slot closed
|
||||
|
||||
**Source Values:**
|
||||
- `MANUAL` - Manually created
|
||||
- `TEMPLATE` - Generated from template
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Complete Data Flow Diagram
|
||||
|
||||
```
|
||||
User Opens Booking Page
|
||||
↓
|
||||
[onMounted] Lifecycle Hook
|
||||
↓
|
||||
1. Check if logged in + fetch memberships (if needed)
|
||||
2. Load today's slots: bookingStore.fetchSlots(today)
|
||||
↓
|
||||
bookingStore.fetchSlots(date: string)
|
||||
↓
|
||||
request.get<TimeSlotWithBookingStatus[]>(
|
||||
'/time-slot/available',
|
||||
{ date }
|
||||
)
|
||||
↓
|
||||
Sets: bookingStore.slots = [TimeSlotWithBookingStatus[], ...]
|
||||
↓
|
||||
Vue renders via computed: filteredSlots
|
||||
↓
|
||||
User selects date OR filters by time period
|
||||
↓
|
||||
Updates: selectedDate.value or selectedPeriod.value
|
||||
↓
|
||||
Computed filteredSlots re-calculates
|
||||
↓
|
||||
Renders SlotCard components
|
||||
↓
|
||||
User taps "可预约" (Book Button)
|
||||
↓
|
||||
[onBookTap(slot)]
|
||||
- Check login (if not → show login modal)
|
||||
- Check valid membership (if not → show purchase modal)
|
||||
- Show BookingConfirmPopup
|
||||
↓
|
||||
User selects membership + confirms
|
||||
↓
|
||||
[onConfirmBooking(payload)]
|
||||
- bookingStore.createBooking({timeSlotId, membershipId})
|
||||
- POST /api/booking
|
||||
- Refresh slots: loadSlots(selectedDate.value)
|
||||
↓
|
||||
Success/Error Toast
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📄 File-by-File Analysis
|
||||
|
||||
### 1️⃣ **pages/booking/index.vue** (Main Component)
|
||||
|
||||
**Template Structure:**
|
||||
```
|
||||
.booking-page
|
||||
├── .sticky-header (z-index: 100)
|
||||
│ ├── DateSelector (v-model="selectedDate")
|
||||
│ └── TimePeriodFilter (v-model="selectedPeriod")
|
||||
├── scroll-view.slot-scroll
|
||||
│ ├── Loading skeleton (4 cards) - when loadingSlots
|
||||
│ ├── Empty state - when no slots
|
||||
│ └── SlotCard list - main content
|
||||
│ └── SlotCard (v-for="slot in filteredSlots")
|
||||
└── BookingConfirmPopup (conditional)
|
||||
```
|
||||
|
||||
**Script Setup - State Variables:**
|
||||
```typescript
|
||||
selectedDate: ref<string> // YYYY-MM-DD format
|
||||
selectedPeriod: ref<PeriodKey> // 'MORNING'|'AFTERNOON'|'EVENING'|null
|
||||
showConfirmPopup: ref<boolean> // Modal visibility
|
||||
pendingSlot: ref<Slot | null> // Slot being booked
|
||||
refreshing: ref<boolean> // Pull-to-refresh state
|
||||
```
|
||||
|
||||
**Computed Properties:**
|
||||
```typescript
|
||||
scrollHeight: computed(() => {
|
||||
// Calculates scroll area height:
|
||||
// windowHeight - headerHeight (220rpx) - tabbarHeight (100rpx)
|
||||
// Converts rpx to pixels dynamically
|
||||
})
|
||||
|
||||
filteredSlots: computed(() => {
|
||||
// If no period selected: return all slots
|
||||
// If period selected: filter by TIME_PERIODS[selectedPeriod].start/.end
|
||||
// Compares slot.startTime with period.start and period.end
|
||||
})
|
||||
```
|
||||
|
||||
**Key Lifecycle - onMounted():**
|
||||
```typescript
|
||||
1. If logged in but no memberships fetched yet:
|
||||
→ await userStore.fetchMemberships()
|
||||
2. Load today's slots:
|
||||
→ await loadSlots(formatDate(new Date()))
|
||||
```
|
||||
|
||||
**Event Handlers:**
|
||||
|
||||
**onDateSelect(date: string)** → Changes selectedDate, calls loadSlots()
|
||||
|
||||
**onPeriodChange(period)** → Updates selectedPeriod (filtering is automatic via computed)
|
||||
|
||||
**onRefresh()** → Pull-to-refresh handler
|
||||
```typescript
|
||||
refreshing.value = true
|
||||
await loadSlots(selectedDate.value)
|
||||
refreshing.value = false
|
||||
```
|
||||
|
||||
**onBookTap(slot)** → Book button clicked:
|
||||
1. Check login status → show login modal if needed
|
||||
2. Check hasValidMembership → show purchase modal if needed
|
||||
3. Set pendingSlot = slot
|
||||
4. Show BookingConfirmPopup
|
||||
|
||||
**onConfirmBooking(payload)** → User confirms booking:
|
||||
```typescript
|
||||
await bookingStore.createBooking(payload)
|
||||
// payload: { timeSlotId, membershipId }
|
||||
await loadSlots(selectedDate.value) // Refresh
|
||||
```
|
||||
|
||||
**onCancelTap(slot)** → Cancel booking:
|
||||
```typescript
|
||||
if (!slot.myBookingId) return
|
||||
// Show confirmation modal
|
||||
await bookingStore.cancelBooking(slot.myBookingId)
|
||||
await loadSlots(selectedDate.value) // Refresh
|
||||
```
|
||||
|
||||
**Styles:**
|
||||
- Page background: `#f5f3f0` (light beige)
|
||||
- Sticky header with box-shadow
|
||||
- Loading skeleton with shimmer animation
|
||||
- Empty state centered with image
|
||||
|
||||
---
|
||||
|
||||
### 2️⃣ **stores/booking.ts** (State Management)
|
||||
|
||||
**State:**
|
||||
```typescript
|
||||
slots: ref<readonly TimeSlotWithBookingStatus[]>([])
|
||||
myBookings: ref<readonly BookingWithDetails[]>([])
|
||||
upcomingBookings: ref<readonly BookingWithDetails[]>([])
|
||||
loadingSlots: ref<boolean>(false)
|
||||
loadingBookings: ref<boolean>(false)
|
||||
```
|
||||
|
||||
**Actions:**
|
||||
|
||||
**fetchSlots(date: string)**
|
||||
```typescript
|
||||
async function fetchSlots(date: string) {
|
||||
loadingSlots.value = true
|
||||
try {
|
||||
slots.value = await get<TimeSlotWithBookingStatus[]>(
|
||||
'/time-slot/available',
|
||||
{ date } // ← date as query param
|
||||
)
|
||||
} catch (err) {
|
||||
console.error('Fetch slots failed:', err)
|
||||
slots.value = []
|
||||
} finally {
|
||||
loadingSlots.value = false
|
||||
}
|
||||
}
|
||||
```
|
||||
⚠️ **CRITICAL:** If request fails, slots.value becomes empty []
|
||||
|
||||
**createBooking(dto: CreateBookingDto)**
|
||||
```typescript
|
||||
// dto: { timeSlotId: string; membershipId: string }
|
||||
const result = await post<BookingWithDetails>('/booking', dto)
|
||||
return result
|
||||
```
|
||||
|
||||
**cancelBooking(bookingId: string)**
|
||||
```typescript
|
||||
const result = await put<BookingWithDetails>(`/booking/${bookingId}/cancel`)
|
||||
return result
|
||||
```
|
||||
|
||||
**fetchMyBookings(status?: string)**
|
||||
```typescript
|
||||
const params = status ? { status } : {}
|
||||
myBookings.value = await get<BookingWithDetails[]>('/booking/my', params)
|
||||
```
|
||||
|
||||
**fetchUpcomingBookings()**
|
||||
```typescript
|
||||
upcomingBookings.value = await get<BookingWithDetails[]>('/booking/my/upcoming')
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3️⃣ **components/SlotCard.vue** (Individual Slot)
|
||||
|
||||
**Props:**
|
||||
```typescript
|
||||
interface Props {
|
||||
slot: TimeSlotWithBookingStatus
|
||||
}
|
||||
```
|
||||
|
||||
**Emits:**
|
||||
```typescript
|
||||
book: [slot] // User wants to book
|
||||
cancel: [slot] // User wants to cancel
|
||||
```
|
||||
|
||||
**Template Sections:**
|
||||
|
||||
**1. Time & Capacity:**
|
||||
```vue
|
||||
<text>{{ slot.startTime.slice(0, 5) }} - {{ slot.endTime.slice(0, 5) }}</text>
|
||||
<!-- e.g., "09:00 - 10:00" -->
|
||||
|
||||
<view class="slot-capacity" :class="capacityClass">
|
||||
{{ capacityLabel }}
|
||||
</view>
|
||||
```
|
||||
|
||||
**2. Action Buttons (4 States):**
|
||||
|
||||
**State A: OPEN + not booked by me**
|
||||
```vue
|
||||
<view class="btn btn-book">可预约</view>
|
||||
<!-- Tan/brown button, emits: book -->
|
||||
```
|
||||
|
||||
**State B: OPEN + booked by me**
|
||||
```vue
|
||||
<view class="badge-booked">已预约</view>
|
||||
<view class="btn-cancel">取消</view>
|
||||
<!-- Badge + cancel link, emits: cancel -->
|
||||
```
|
||||
|
||||
**State C: FULL**
|
||||
```vue
|
||||
<view class="btn btn-disabled">已约满</view>
|
||||
<!-- Gray disabled button -->
|
||||
```
|
||||
|
||||
**State D: CLOSED**
|
||||
```vue
|
||||
<view class="btn btn-disabled">已关闭</view>
|
||||
<!-- Gray disabled button -->
|
||||
```
|
||||
|
||||
**3. Booked Indicator:**
|
||||
```vue
|
||||
<view v-if="slot.isBookedByMe" class="booked-bar" />
|
||||
<!-- Tan bar on left side of card when booked by me -->
|
||||
```
|
||||
|
||||
**Computed Properties:**
|
||||
|
||||
**capacityLabel:**
|
||||
```typescript
|
||||
if (status === CLOSED) return '已关闭'
|
||||
return `${bookedCount}/${capacity} 人` // e.g., "0/1 人"
|
||||
```
|
||||
|
||||
**capacityClass:** Determines background color
|
||||
```
|
||||
CLOSED → cap-closed (gray)
|
||||
FULL → cap-full (red bg, red text)
|
||||
≥80% → cap-almost (orange bg, orange text)
|
||||
<80% → cap-open (green bg, green text)
|
||||
```
|
||||
|
||||
**Styles:**
|
||||
- Card: white background, 20rpx border-radius, shadow
|
||||
- Time text: 36rpx, bold, dark
|
||||
- Capacity badge: 22rpx, inline-flex, colored backgrounds
|
||||
- Buttons: rounded pills (68rpx height, 34rpx border-radius)
|
||||
- Cancel text: underlined, red (#ef4444)
|
||||
- Booked bar: 6rpx tan bar on left edge
|
||||
|
||||
---
|
||||
|
||||
### 4️⃣ **components/DateSelector.vue** (Date Picker)
|
||||
|
||||
**Props:**
|
||||
```typescript
|
||||
interface Props {
|
||||
modelValue: string // YYYY-MM-DD
|
||||
}
|
||||
```
|
||||
|
||||
**Emits:**
|
||||
- `update:modelValue` - v-model update
|
||||
- `select` - Custom event on selection
|
||||
|
||||
**Data:**
|
||||
```typescript
|
||||
dateRange: computed(() => getDateRange(DATE_SELECTOR_DAYS))
|
||||
// DATE_SELECTOR_DAYS = 7
|
||||
// Returns array of { date, weekday, isToday }
|
||||
```
|
||||
|
||||
**Template:**
|
||||
```vue
|
||||
<scroll-view scroll-x>
|
||||
<view class="track">
|
||||
<view v-for="item in dateRange" class="date-item"
|
||||
:class="{ active: item.date === modelValue, today: item.isToday }">
|
||||
<text class="weekday">{{ item.isToday ? '今天' : item.weekday }}</text>
|
||||
<text class="day">{{ getDayNumber(item.date) }}</text>
|
||||
<text class="month">{{ getMonthNumber(item.date) }}月</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
```
|
||||
|
||||
**Date Display Format:**
|
||||
- Weekday: "周一", "周二", or "今天"
|
||||
- Day: Large bold number (e.g., "5")
|
||||
- Month: Small number (e.g., "4月")
|
||||
|
||||
**Styles:**
|
||||
- Active state: tan background (#c9a87c), white text
|
||||
- Today highlight: tan-colored weekday text (even if not active)
|
||||
- Horizontal scroll, no scrollbar
|
||||
|
||||
---
|
||||
|
||||
### 5️⃣ **components/TimePeriodFilter.vue** (Period Filter)
|
||||
|
||||
**Props:**
|
||||
```typescript
|
||||
type PeriodKey = keyof typeof TIME_PERIODS | null
|
||||
|
||||
interface Props {
|
||||
modelValue: PeriodKey
|
||||
}
|
||||
```
|
||||
|
||||
**Emits:**
|
||||
- `update:modelValue` - v-model update
|
||||
- `change` - Custom event
|
||||
|
||||
**Constants:**
|
||||
```typescript
|
||||
const TIME_PERIODS = {
|
||||
MORNING: { label: '上午', start: '06:00', end: '12:00' },
|
||||
AFTERNOON: { label: '下午', start: '12:00', end: '18:00' },
|
||||
EVENING: { label: '晚上', start: '18:00', end: '22:00' },
|
||||
}
|
||||
```
|
||||
|
||||
**Tabs Generated:**
|
||||
```typescript
|
||||
[
|
||||
{ key: null, label: '全部' },
|
||||
{ key: 'MORNING', label: '上午' },
|
||||
{ key: 'AFTERNOON', label: '下午' },
|
||||
{ key: 'EVENING', label: '晚上' },
|
||||
]
|
||||
```
|
||||
|
||||
**Template:**
|
||||
```vue
|
||||
<view v-for="tab in tabs" :class="{ active: modelValue === tab.key }">
|
||||
{{ tab.label }}
|
||||
</view>
|
||||
```
|
||||
|
||||
**Active State:**
|
||||
- Text color: tan (#c9a87c), weight: 600
|
||||
- Bottom border: 4rpx tan underline (CSS ::after)
|
||||
|
||||
---
|
||||
|
||||
### 6️⃣ **components/BookingConfirmPopup.vue** (Confirmation Modal)
|
||||
|
||||
**Props:**
|
||||
```typescript
|
||||
visible: boolean
|
||||
slot: TimeSlotWithBookingStatus | null
|
||||
memberships: MembershipWithCardType[]
|
||||
```
|
||||
|
||||
**Emits:**
|
||||
- `confirm` - { timeSlotId, membershipId }
|
||||
- `cancel` - Popup closes
|
||||
- `update:visible` - Manual visibility control
|
||||
|
||||
**Template Sections:**
|
||||
|
||||
**1. Overlay Mask:**
|
||||
```vue
|
||||
<view v-if="visible" class="popup-mask" @tap="handleMaskTap">
|
||||
<!-- Clicking mask closes popup -->
|
||||
</view>
|
||||
```
|
||||
|
||||
**2. Header:**
|
||||
```vue
|
||||
<text class="popup-title">确认预约</text>
|
||||
<view class="close-btn">✕</view>
|
||||
```
|
||||
|
||||
**3. Info Section (read-only display):**
|
||||
```
|
||||
日期: 2026-04-05
|
||||
时间: 09:00 - 10:00
|
||||
剩余: 1 个名额
|
||||
```
|
||||
|
||||
**4. Membership Card Selection:**
|
||||
|
||||
**Case A: 1 membership**
|
||||
```vue
|
||||
<view class="card-item selected">
|
||||
💳
|
||||
{{ membership.cardType.name }}
|
||||
剩余 {{ remainingTimes }} 次
|
||||
✓
|
||||
</view>
|
||||
```
|
||||
(Auto-selected, pre-filled)
|
||||
|
||||
**Case B: Multiple memberships**
|
||||
```vue
|
||||
<view v-for="m in memberships" class="card-item"
|
||||
:class="{ selected: selectedMembershipId === m.id }">
|
||||
<!-- User taps to select -->
|
||||
</view>
|
||||
```
|
||||
|
||||
**5. Deduction Tip:**
|
||||
```vue
|
||||
<view v-if="selectedMembership" class="deduction-tip">
|
||||
确认后将从「{{ selectedMembership.cardType.name }}」扣除 1 次课时
|
||||
</view>
|
||||
```
|
||||
|
||||
**6. Action Buttons:**
|
||||
```
|
||||
[取消] [确认预约]
|
||||
(Outline) (Tan solid)
|
||||
(Disabled if no membership selected)
|
||||
```
|
||||
|
||||
**Auto-selection Logic:**
|
||||
```typescript
|
||||
watch([() => props.visible, () => props.memberships],
|
||||
([visible, memberships]) => {
|
||||
if (visible && memberships.length > 0) {
|
||||
selectedMembershipId.value = memberships[0].id
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
```
|
||||
|
||||
**Confirm Handler:**
|
||||
```typescript
|
||||
function handleConfirm() {
|
||||
emit('confirm', {
|
||||
timeSlotId: props.slot.id,
|
||||
membershipId: selectedMembershipId.value,
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
**Styles:**
|
||||
- Modal: Fixed positioning, rgba(0,0,0,0.45) dark overlay
|
||||
- Panel: White background, rounded top corners, 32rpx padding
|
||||
- Card items: 24rpx padding, border, transition on select
|
||||
- Buttons: 88rpx height, rounded pills (44rpx)
|
||||
- Cancel: Outline style, gray text
|
||||
- Confirm: Solid tan background, white text
|
||||
|
||||
---
|
||||
|
||||
### 7️⃣ **stores/user.ts** (User State)
|
||||
|
||||
**Key State:**
|
||||
```typescript
|
||||
user: ref<UserProfileResponse | null>(null)
|
||||
memberships: ref<readonly MembershipWithCardType[]>([])
|
||||
token: ref<string>(uni.getStorageSync('token'))
|
||||
```
|
||||
|
||||
**Key Computed:**
|
||||
```typescript
|
||||
loggedIn: computed(() => !!token.value)
|
||||
activeMemberships: computed(() =>
|
||||
memberships.value.filter(m => m.status === MembershipStatus.ACTIVE)
|
||||
)
|
||||
hasValidMembership: computed(() => activeMemberships.value.length > 0)
|
||||
```
|
||||
|
||||
**Key Actions:**
|
||||
```typescript
|
||||
async function login()
|
||||
async function fetchMemberships()
|
||||
// GET /membership/my
|
||||
async function logout()
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 8️⃣ **utils/request.ts** (API Client)
|
||||
|
||||
**Base URL Logic:**
|
||||
```typescript
|
||||
const BASE_URL = (() => {
|
||||
const { miniProgram } = uni.getAccountInfoSync()
|
||||
if (miniProgram.envVersion !== 'develop') {
|
||||
return 'https://focus.richarjiang.com/api'
|
||||
}
|
||||
return 'http://localhost:3000/api'
|
||||
})()
|
||||
```
|
||||
|
||||
**Main request() function:**
|
||||
```typescript
|
||||
function request<T>(options: RequestOptions): Promise<T> {
|
||||
// 1. Get token from localStorage
|
||||
const token = uni.getStorageSync('token')
|
||||
|
||||
// 2. Call uni.request with:
|
||||
// - Authorization header (Bearer token)
|
||||
// - Content-Type: application/json
|
||||
|
||||
// 3. Response handling:
|
||||
// - 401 → Clear token, show "please login", reject
|
||||
// - ≥400 → Extract error from response.message, reject
|
||||
// - <400 & success: true → Resolve with data
|
||||
// - <400 & success: false → Reject with message
|
||||
|
||||
// 4. Network fail → Reject with errMsg
|
||||
}
|
||||
|
||||
export function get<T>(url, data?): Promise<T>
|
||||
export function post<T>(url, data?): Promise<T>
|
||||
export function put<T>(url, data?): Promise<T>
|
||||
```
|
||||
|
||||
**⚠️ GET Request Issue:**
|
||||
```typescript
|
||||
// In get(), data becomes the request body
|
||||
// But uni.request with GET should NOT have a body
|
||||
// Query params should be in the URL string
|
||||
// This might cause issues on some platforms!
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 9️⃣ **utils/format.ts** (Date Utilities)
|
||||
|
||||
```typescript
|
||||
formatDate(date): string
|
||||
// Returns YYYY-MM-DD
|
||||
|
||||
getWeekdayLabel(date): string
|
||||
// Returns "周一", "周二", ..., "周日"
|
||||
|
||||
isToday(date): boolean
|
||||
// Compares year/month/day
|
||||
|
||||
getDateRange(days: number): ReadonlyArray
|
||||
// Returns array of:
|
||||
// {
|
||||
// date: YYYY-MM-DD,
|
||||
// weekday: "周一" | "今天" (if i===0),
|
||||
// isToday: boolean
|
||||
// }
|
||||
// Uses i * 86400000ms for date increment
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔍 Data Types Overview
|
||||
|
||||
### TimeSlotWithBookingStatus (Extended from TimeSlot)
|
||||
```typescript
|
||||
interface TimeSlotWithBookingStatus extends TimeSlot {
|
||||
readonly isBookedByMe: boolean // Has user already booked?
|
||||
readonly myBookingId: string | null // ID needed to cancel
|
||||
}
|
||||
|
||||
interface TimeSlot {
|
||||
readonly id: string // UUID
|
||||
readonly date: string // YYYY-MM-DD
|
||||
readonly startTime: string // HH:MM
|
||||
readonly endTime: string // HH:MM
|
||||
readonly capacity: number // Max people
|
||||
readonly bookedCount: number // Already booked
|
||||
readonly status: TimeSlotStatus // OPEN|FULL|CLOSED
|
||||
readonly source: TimeSlotSource // TEMPLATE|MANUAL
|
||||
readonly templateId: string | null
|
||||
}
|
||||
```
|
||||
|
||||
### MembershipWithCardType
|
||||
```typescript
|
||||
interface MembershipWithCardType {
|
||||
readonly id: string
|
||||
readonly cardType: CardType
|
||||
readonly status: MembershipStatus // ACTIVE|EXPIRED|USED_UP
|
||||
readonly remainingTimes: number | null
|
||||
readonly expireDate: string // YYYY-MM-DD
|
||||
}
|
||||
```
|
||||
|
||||
### CreateBookingDto
|
||||
```typescript
|
||||
interface CreateBookingDto {
|
||||
readonly timeSlotId: string
|
||||
readonly membershipId: string
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Color Scheme
|
||||
|
||||
| Element | Color | Hex | Usage |
|
||||
|---------|-------|-----|-------|
|
||||
| Primary (Accent) | Tan/Brown | #c9a87c | Buttons, active tabs, highlights |
|
||||
| Background | Light Beige | #f5f3f0 | Page background |
|
||||
| Text Primary | Dark Gray | #1a1a1a | Main headings |
|
||||
| Text Secondary | Medium Gray | #666/#999 | Labels, descriptions |
|
||||
| Text Tertiary | Light Gray | #bbb | Disabled, hints |
|
||||
| Success | Green | #4caf50 | Open slots (capacity label) |
|
||||
| Warning | Orange | #f59e0b | Almost full (capacity label) |
|
||||
| Error | Red | #ef4444 | Full/closed, cancel button |
|
||||
| Borders | Very Light Gray | #f0f0f0/#f0ece8 | Dividers, borders |
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ Potential Issues & Problems
|
||||
|
||||
### 1. **GET Request Body Issue**
|
||||
**File:** `utils/request.ts` in `get()` function
|
||||
```typescript
|
||||
export function get<T>(url: string, data?: Record<string, unknown>): Promise<T> {
|
||||
return request<T>({ url, method: 'GET', data }) // ← data as body!
|
||||
}
|
||||
```
|
||||
**Problem:** GET requests shouldn't have a body. Query params should be in the URL.
|
||||
**Impact:** `/time-slot/available?date=2026-04-05` might not work on all platforms.
|
||||
|
||||
### 2. **Empty Slots Array on Error**
|
||||
**File:** `stores/booking.ts`, `fetchSlots()`
|
||||
```typescript
|
||||
catch (err) {
|
||||
console.error('Fetch slots failed:', err)
|
||||
slots.value = [] // ← Clears state on error!
|
||||
}
|
||||
```
|
||||
**Problem:** Network error → page shows "empty state" instead of error message.
|
||||
**Impact:** Users can't tell if there's an error or truly no slots available.
|
||||
|
||||
### 3. **No Error Handling in Main Page**
|
||||
**File:** `pages/booking/index.vue`, `loadSlots()`
|
||||
```typescript
|
||||
async function loadSlots(date: string) {
|
||||
await bookingStore.fetchSlots(date)
|
||||
// ← No error handling, no user feedback
|
||||
}
|
||||
```
|
||||
**Problem:** If fetchSlots() fails, user sees empty page with no explanation.
|
||||
|
||||
### 4. **Manual Date Calculation**
|
||||
**File:** `utils/format.ts`, `getDateRange()`
|
||||
```typescript
|
||||
const d = new Date(now.getTime() + i * 86400000)
|
||||
```
|
||||
**Problem:** Doesn't account for DST transitions. Using `Date.setDate()` would be safer.
|
||||
|
||||
### 5. **No Loading State for Slots**
|
||||
**File:** `pages/booking/index.vue`
|
||||
```typescript
|
||||
<view v-if="bookingStore.loadingSlots && !refreshing" class="loading-wrap">
|
||||
```
|
||||
**Problem:** Skeleton appears only on initial load, not when changing dates or refreshing.
|
||||
**Impact:** Date changes appear instant (good UX but confusing if slow network).
|
||||
|
||||
### 6. **Hardcoded Membership Message**
|
||||
**File:** `components/BookingConfirmPopup.vue`
|
||||
```typescript
|
||||
确认后将从「{{ selectedMembership.cardType.name }}」扣除 1 次课时
|
||||
// ← Always says "1 次" even if card might deduct different amounts
|
||||
```
|
||||
**Problem:** Doesn't show actual deduction amount if dynamic.
|
||||
|
||||
---
|
||||
|
||||
## 📊 Event Flow Sequence
|
||||
|
||||
```
|
||||
1. PAGE LOAD (onMounted)
|
||||
├─ Check: userStore.loggedIn?
|
||||
├─ If yes & no memberships: fetchMemberships()
|
||||
└─ loadSlots(today)
|
||||
└─ GET /time-slot/available?date=today
|
||||
└─ bookingStore.slots = [...]
|
||||
└─ render SlotCard components
|
||||
|
||||
2. USER TAPS DATE
|
||||
├─ selectedDate.value = newDate
|
||||
└─ onDateSelect(newDate)
|
||||
└─ loadSlots(newDate)
|
||||
└─ fetchSlots()
|
||||
|
||||
3. USER FILTERS PERIOD
|
||||
├─ selectedPeriod.value = MORNING|AFTERNOON|EVENING|null
|
||||
└─ filteredSlots computed updates
|
||||
└─ SlotCards re-render (no new API call)
|
||||
|
||||
4. USER PULLS TO REFRESH
|
||||
├─ onRefresh()
|
||||
└─ loadSlots(selectedDate.value)
|
||||
|
||||
5. USER TAPS "可预约" BUTTON
|
||||
├─ onBookTap(slot)
|
||||
├─ Check login (if not → login modal)
|
||||
├─ Check membership (if not → purchase modal)
|
||||
└─ Show BookingConfirmPopup
|
||||
└─ Pre-select first membership
|
||||
|
||||
6. USER CONFIRMS BOOKING
|
||||
├─ onConfirmBooking({timeSlotId, membershipId})
|
||||
├─ POST /booking
|
||||
│ └─ bookingStore.createBooking()
|
||||
├─ Show success toast
|
||||
└─ loadSlots(selectedDate.value) // Refresh
|
||||
└─ Updated slot.isBookedByMe = true
|
||||
|
||||
7. USER TAPS "取消" BUTTON
|
||||
├─ onCancelTap(slot)
|
||||
├─ Confirm modal
|
||||
├─ PUT /booking/:id/cancel
|
||||
│ └─ bookingStore.cancelBooking()
|
||||
├─ Show success toast
|
||||
└─ loadSlots(selectedDate.value) // Refresh
|
||||
└─ Updated slot.isBookedByMe = false
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧪 Testing Scenarios
|
||||
|
||||
### ✅ Happy Path
|
||||
- [ ] Load page → today's slots display
|
||||
- [ ] Tap date → slots for that date display
|
||||
- [ ] Filter by period → slots filtered correctly
|
||||
- [ ] Tap "可预约" → popup shows with correct time/date
|
||||
- [ ] Select membership → deduction message updates
|
||||
- [ ] Confirm → booking created, slot shows "已预约"
|
||||
- [ ] Pull to refresh → slots reload
|
||||
- [ ] Tap "取消" → booking cancelled, slot back to "可预约"
|
||||
|
||||
### ⚠️ Edge Cases
|
||||
- [ ] No slots for date → empty state appears
|
||||
- [ ] User not logged in → login modal shows
|
||||
- [ ] No valid membership → purchase modal shows
|
||||
- [ ] Network error → ??? (currently shows empty)
|
||||
- [ ] Slot changes to FULL → button becomes disabled
|
||||
- [ ] Slot changes to CLOSED → button becomes disabled
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Integration Points
|
||||
|
||||
**From Backend:**
|
||||
1. ✅ GET `/time-slot/available?date=...` → Returns slots
|
||||
2. ✅ POST `/booking` → Create booking
|
||||
3. ✅ PUT `/booking/:id/cancel` → Cancel booking
|
||||
4. ✅ GET `/membership/my` → List memberships
|
||||
5. ✅ Auth via Bearer token
|
||||
|
||||
**From Frontend:**
|
||||
1. ✅ LocalStorage for token persistence
|
||||
2. ✅ uni.showModal, uni.showToast for UI feedback
|
||||
3. ✅ uni.getSystemInfoSync() for responsive sizing
|
||||
4. ✅ uni.navigateTo() for page navigation
|
||||
|
||||
---
|
||||
|
||||
## 📱 Responsive Layout
|
||||
|
||||
**Design Breakpoint:**
|
||||
- Base: 750rpx (WeChat standard width unit)
|
||||
- Window height: dynamic via uni.getSystemInfoSync().windowHeight
|
||||
|
||||
**Scroll Area Height Calculation:**
|
||||
```typescript
|
||||
scrollHeight = windowHeight - headerHeight(220rpx) - tabbarHeight(100rpx)
|
||||
= windowHeight - (220 * (windowWidth / 750)) - (100 * (windowWidth / 750))
|
||||
```
|
||||
|
||||
**Sticky Header:**
|
||||
- Position: sticky (CSS)
|
||||
- Top: 0
|
||||
- Z-index: 100
|
||||
- Contains: DateSelector + TimePeriodFilter
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Summary
|
||||
|
||||
The booking system is well-architected with:
|
||||
- ✅ Clear separation of concerns (component, store, utils)
|
||||
- ✅ Proper type safety with TypeScript
|
||||
- ✅ Responsive date/time selection
|
||||
- ✅ Membership-based booking validation
|
||||
- ✅ Optimistic loading states
|
||||
- ✅ Accessible UI patterns
|
||||
|
||||
But needs:
|
||||
- ⚠️ Better error handling
|
||||
- ⚠️ Fix GET request implementation
|
||||
- ⚠️ Loading state during date/period changes
|
||||
- ⚠️ Network error user feedback
|
||||
|
||||
395
BOOKING_README.md
Normal file
395
BOOKING_README.md
Normal file
@@ -0,0 +1,395 @@
|
||||
# Booking Page Documentation
|
||||
|
||||
## 📚 Overview
|
||||
|
||||
This folder contains comprehensive documentation for the WeChat Mini-Program booking system in the mp-pilates project (Uni-app + Vue 3).
|
||||
|
||||
### 📄 Documentation Files
|
||||
|
||||
1. **BOOKING_PAGE_ANALYSIS.md** ⭐ START HERE
|
||||
- Complete file-by-file breakdown of all components
|
||||
- Data flow diagrams
|
||||
- API contract documentation
|
||||
- Color scheme and styling details
|
||||
- Potential issues and problems
|
||||
|
||||
2. **COMPONENT_HIERARCHY.md**
|
||||
- Visual component tree structure
|
||||
- State management flow (Pinia stores)
|
||||
- API sequence diagrams
|
||||
- State machine for slot cards
|
||||
- Data transformations
|
||||
|
||||
3. **QUICK_REFERENCE.md**
|
||||
- Code snippets for quick lookup
|
||||
- Debugging tips and console commands
|
||||
- Common issues and solutions
|
||||
- Debugging checklist
|
||||
- API examples
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Quick Navigation
|
||||
|
||||
### I want to understand...
|
||||
|
||||
**...the overall flow**
|
||||
→ Read: BOOKING_PAGE_ANALYSIS.md → "Complete Data Flow Diagram" section
|
||||
|
||||
**...how the UI is structured**
|
||||
→ Read: COMPONENT_HIERARCHY.md → "Component Tree" + "UI Layout Breakdown"
|
||||
|
||||
**...where specific code is**
|
||||
→ Read: QUICK_REFERENCE.md → "Finding Specific Things"
|
||||
|
||||
**...how to debug an issue**
|
||||
→ Read: QUICK_REFERENCE.md → "Common Issues & Solutions"
|
||||
|
||||
**...the API contracts**
|
||||
→ Read: QUICK_REFERENCE.md → "API Contract Summary"
|
||||
|
||||
**...the store state**
|
||||
→ Read: COMPONENT_HIERARCHY.md → "State Management Flow"
|
||||
|
||||
---
|
||||
|
||||
## 🏗️ Project Structure
|
||||
|
||||
```
|
||||
packages/app/src/
|
||||
├── pages/
|
||||
│ └── booking/
|
||||
│ └── index.vue # Main booking page (311 lines)
|
||||
├── components/
|
||||
│ ├── DateSelector.vue # Date picker (50 lines)
|
||||
│ ├── TimePeriodFilter.vue # Time period filter (50 lines)
|
||||
│ ├── SlotCard.vue # Individual slot card (230 lines)
|
||||
│ └── BookingConfirmPopup.vue # Booking confirmation modal (430 lines)
|
||||
├── stores/
|
||||
│ ├── booking.ts # Booking state (72 lines)
|
||||
│ └── user.ts # User/membership state (110 lines)
|
||||
└── utils/
|
||||
├── request.ts # API request utilities (80 lines)
|
||||
└── format.ts # Date formatting utilities (50 lines)
|
||||
|
||||
packages/shared/src/
|
||||
├── types/
|
||||
│ ├── time-slot.ts # TimeSlot types
|
||||
│ ├── api.ts # API response types
|
||||
│ └── booking.ts # Booking types
|
||||
├── constants.ts # TIME_PERIODS, etc
|
||||
└── enums.ts # Enums (TimeSlotStatus, etc)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Data Flow at a Glance
|
||||
|
||||
```
|
||||
Page Load
|
||||
↓
|
||||
[Check login + load memberships]
|
||||
↓
|
||||
Store: fetchSlots(today)
|
||||
↓
|
||||
API: GET /time-slot/available?date=TODAY
|
||||
↓
|
||||
State: bookingStore.slots = [TimeSlotWithBookingStatus[], ...]
|
||||
↓
|
||||
Computed: filteredSlots (optionally filtered by period)
|
||||
↓
|
||||
Render: SlotCard components
|
||||
↓
|
||||
User interaction:
|
||||
- Tap date → loadSlots(newDate)
|
||||
- Filter period → filteredSlots re-computed
|
||||
- Book slot → onBookTap() → popup
|
||||
- Confirm → createBooking() → refresh slots
|
||||
- Cancel → cancelBooking() → refresh slots
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎭 Key Components
|
||||
|
||||
### 1. pages/booking/index.vue
|
||||
**Role:** Main page that orchestrates everything
|
||||
**State:** selectedDate, selectedPeriod, showConfirmPopup, pendingSlot
|
||||
**Stores:** bookingStore, userStore
|
||||
**Key computed:** scrollHeight, filteredSlots
|
||||
|
||||
### 2. components/SlotCard.vue
|
||||
**Role:** Displays individual time slot
|
||||
**Props:** slot (TimeSlotWithBookingStatus)
|
||||
**Emits:** book, cancel
|
||||
**States:** 4 button states based on status + isBookedByMe
|
||||
|
||||
### 3. components/DateSelector.vue
|
||||
**Role:** Horizontal date picker
|
||||
**Props:** modelValue (YYYY-MM-DD)
|
||||
**Data:** dateRange (7 days from today)
|
||||
**Display:** Shows weekday, day number, month
|
||||
|
||||
### 4. components/TimePeriodFilter.vue
|
||||
**Role:** Horizontal tab filter
|
||||
**Props:** modelValue (MORNING|AFTERNOON|EVENING|null)
|
||||
**Constants:** TIME_PERIODS from shared
|
||||
|
||||
### 5. components/BookingConfirmPopup.vue
|
||||
**Role:** Modal for confirming booking
|
||||
**Props:** visible, slot, memberships
|
||||
**State:** selectedMembershipId (auto-selected on show)
|
||||
**Logic:** Auto-select first membership when popup opens
|
||||
|
||||
### 6. stores/booking.ts
|
||||
**Actions:**
|
||||
- fetchSlots(date) → GET /time-slot/available?date=
|
||||
- createBooking(dto) → POST /booking
|
||||
- cancelBooking(bookingId) → PUT /booking/:id/cancel
|
||||
- fetchMyBookings(status?) → GET /booking/my
|
||||
- fetchUpcomingBookings() → GET /booking/my/upcoming
|
||||
|
||||
### 7. stores/user.ts
|
||||
**Computed:**
|
||||
- loggedIn: !!token.value
|
||||
- hasValidMembership: activeMemberships.length > 0
|
||||
- activeMemberships: memberships filtered by ACTIVE status
|
||||
|
||||
---
|
||||
|
||||
## 📊 State Types
|
||||
|
||||
### TimeSlotWithBookingStatus
|
||||
```typescript
|
||||
{
|
||||
id: string // UUID
|
||||
date: "2026-04-05" // YYYY-MM-DD
|
||||
startTime: "09:00" // HH:MM
|
||||
endTime: "10:00" // HH:MM
|
||||
capacity: 1 // Max slots
|
||||
bookedCount: 0 // Currently booked
|
||||
status: "OPEN" | "FULL" | "CLOSED"
|
||||
source: "MANUAL" | "TEMPLATE"
|
||||
templateId: null
|
||||
isBookedByMe: boolean // User has booked this
|
||||
myBookingId: string | null // Booking ID (for cancel)
|
||||
}
|
||||
```
|
||||
|
||||
### MembershipWithCardType
|
||||
```typescript
|
||||
{
|
||||
id: string
|
||||
cardType: { name: string, ... }
|
||||
status: "ACTIVE" | "EXPIRED" | "USED_UP"
|
||||
remainingTimes: number | null
|
||||
expireDate: "2026-12-31"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Visual States
|
||||
|
||||
### Slot Card Button States
|
||||
|
||||
| Condition | Button | Color | Action |
|
||||
|-----------|--------|-------|--------|
|
||||
| OPEN, not booked | "可预约" | Tan (#c9a87c) | Show popup |
|
||||
| OPEN, booked by me | "已预约" + "取消" link | Tan + Red | Show cancel confirm |
|
||||
| FULL | "已约满" | Gray (#f0f0f0) | Disabled |
|
||||
| CLOSED | "已关闭" | Gray (#f0f0f0) | Disabled |
|
||||
|
||||
### Capacity Badge Colors
|
||||
|
||||
| Condition | Background | Text | Meaning |
|
||||
|-----------|------------|------|---------|
|
||||
| <80% booked | #f0faf3 | #4caf50 | Green - Plenty of spots |
|
||||
| ≥80% booked | #fff8ed | #f59e0b | Orange - Almost full |
|
||||
| FULL | #fef0f0 | #ef4444 | Red - No spots |
|
||||
| CLOSED | #f5f5f5 | #999 | Gray - Unavailable |
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Authentication
|
||||
|
||||
- Token stored in localStorage
|
||||
- Automatically included in request headers
|
||||
- 401 response → Clear token + show "please login" toast
|
||||
- onBookTap checks loggedIn → shows login modal if needed
|
||||
- onBookTap checks hasValidMembership → shows purchase modal if needed
|
||||
|
||||
---
|
||||
|
||||
## 📡 API Endpoints
|
||||
|
||||
### GET /time-slot/available?date=YYYY-MM-DD
|
||||
```
|
||||
Query: date (required, YYYY-MM-DD format)
|
||||
Returns: TimeSlotWithBookingStatus[]
|
||||
Auth: Bearer token required
|
||||
```
|
||||
|
||||
### POST /booking
|
||||
```
|
||||
Body: { timeSlotId, membershipId }
|
||||
Returns: BookingWithDetails
|
||||
Auth: Bearer token required
|
||||
```
|
||||
|
||||
### PUT /booking/:bookingId/cancel
|
||||
```
|
||||
Path: bookingId
|
||||
Returns: BookingWithDetails (with status: CANCELLED)
|
||||
Auth: Bearer token required
|
||||
```
|
||||
|
||||
### GET /membership/my
|
||||
```
|
||||
Returns: MembershipWithCardType[]
|
||||
Auth: Bearer token required
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ Known Issues
|
||||
|
||||
### 1. GET Request Body Issue
|
||||
- File: `utils/request.ts`, `get()` function
|
||||
- Problem: Data passed as body instead of query params
|
||||
- Impact: Might not work on all platforms
|
||||
|
||||
### 2. Error Handling
|
||||
- File: `stores/booking.ts`, `fetchSlots()`
|
||||
- Problem: Network error → empty array instead of error message
|
||||
- Impact: Users can't tell if error or truly no slots
|
||||
|
||||
### 3. Loading State
|
||||
- File: `pages/booking/index.vue`
|
||||
- Problem: Skeleton only appears on initial load
|
||||
- Impact: Date changes appear instant (confusing on slow network)
|
||||
|
||||
### 4. Date Math
|
||||
- File: `utils/format.ts`, `getDateRange()`
|
||||
- Problem: Uses ms arithmetic (86400000ms per day)
|
||||
- Impact: Doesn't account for DST transitions
|
||||
|
||||
---
|
||||
|
||||
## 🧪 Testing Checklist
|
||||
|
||||
### Happy Path
|
||||
- [ ] Load page → today's slots display
|
||||
- [ ] Tap date → slots change for that date
|
||||
- [ ] Filter by period → slots filtered correctly
|
||||
- [ ] Tap "可预约" → popup shows
|
||||
- [ ] Confirm booking → slot shows "已预约"
|
||||
- [ ] Tap "取消" → booking cancelled, slot resets
|
||||
- [ ] Pull to refresh → slots reload
|
||||
|
||||
### Edge Cases
|
||||
- [ ] No slots for date → empty state appears
|
||||
- [ ] Not logged in → login modal on book tap
|
||||
- [ ] No valid membership → purchase modal on book tap
|
||||
- [ ] Network error → ??? (currently shows empty)
|
||||
- [ ] Slot becomes FULL → button updates to disabled
|
||||
- [ ] Multiple memberships → can select different card
|
||||
|
||||
---
|
||||
|
||||
## 📝 File Sizes
|
||||
|
||||
| File | Lines | Purpose |
|
||||
|------|-------|---------|
|
||||
| pages/booking/index.vue | 311 | Main page orchestration |
|
||||
| components/BookingConfirmPopup.vue | 430 | Booking modal |
|
||||
| components/SlotCard.vue | 230 | Slot display |
|
||||
| stores/booking.ts | 72 | Booking state |
|
||||
| utils/request.ts | 80 | API client |
|
||||
| components/DateSelector.vue | 50 | Date picker |
|
||||
| components/TimePeriodFilter.vue | 50 | Period filter |
|
||||
| utils/format.ts | 50 | Date utilities |
|
||||
|
||||
---
|
||||
|
||||
## 🎓 Learning Path
|
||||
|
||||
**Level 1: Overview**
|
||||
1. Read this file
|
||||
2. Look at BOOKING_PAGE_ANALYSIS.md → "Complete Data Flow Diagram"
|
||||
|
||||
**Level 2: Components**
|
||||
1. Read COMPONENT_HIERARCHY.md → "Component Tree"
|
||||
2. Read BOOKING_PAGE_ANALYSIS.md → "File-by-File Analysis"
|
||||
|
||||
**Level 3: Implementation**
|
||||
1. Read QUICK_REFERENCE.md → "Where Slots Come From"
|
||||
2. Read actual source files in order:
|
||||
- stores/booking.ts
|
||||
- pages/booking/index.vue
|
||||
- components/SlotCard.vue
|
||||
- components/BookingConfirmPopup.vue
|
||||
|
||||
**Level 4: Debugging**
|
||||
1. Read QUICK_REFERENCE.md → "Debugging Tips"
|
||||
2. Read QUICK_REFERENCE.md → "Common Issues & Solutions"
|
||||
|
||||
**Level 5: Deep Dive**
|
||||
1. Read COMPONENT_HIERARCHY.md → "State Management Flow"
|
||||
2. Read COMPONENT_HIERARCHY.md → "API Calls Sequence"
|
||||
3. Study utils/request.ts for request handling
|
||||
|
||||
---
|
||||
|
||||
## 🔗 Related Documentation
|
||||
|
||||
- Backend: `/packages/server/src/time-slot/`
|
||||
- Shared types: `/packages/shared/src/types/`
|
||||
- Auth: `/packages/app/src/utils/auth.ts`
|
||||
- User store: `/packages/app/src/stores/user.ts`
|
||||
|
||||
---
|
||||
|
||||
## 📞 Quick Answers
|
||||
|
||||
**Q: Why doesn't the page load?**
|
||||
A: Check 1) Is API returning data? 2) Is token valid? 3) Check console for errors
|
||||
|
||||
**Q: Why doesn't filtering work?**
|
||||
A: Check 1) Is selectedPeriod.value being set? 2) Is slot.startTime correct format?
|
||||
|
||||
**Q: Why doesn't the booking button work?**
|
||||
A: Check 1) Is slot.status === OPEN? 2) Is isBookedByMe === false? 3) Is user logged in?
|
||||
|
||||
**Q: How do I add error handling?**
|
||||
A: See QUICK_REFERENCE.md → "Issue 1: Slots not loading" → Solution
|
||||
|
||||
**Q: How do I test the booking flow?**
|
||||
A: See "Testing Checklist" section above
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Common Tasks
|
||||
|
||||
### Add loading indicator during date change
|
||||
→ Use bookingStore.loadingSlots in template
|
||||
|
||||
### Show error message for API failures
|
||||
→ Add error state to bookingStore, show in template
|
||||
|
||||
### Change colors/styling
|
||||
→ Edit style blocks in .vue files (see color scheme in BOOKING_PAGE_ANALYSIS.md)
|
||||
|
||||
### Modify time period ranges
|
||||
→ Edit TIME_PERIODS in packages/shared/src/constants.ts
|
||||
|
||||
### Change initial date or time range
|
||||
→ Edit pages/booking/index.vue onMounted() or DATE_SELECTOR_DAYS constant
|
||||
|
||||
### Add/remove date selector days
|
||||
→ Edit DATE_SELECTOR_DAYS in packages/shared/src/constants.ts
|
||||
|
||||
---
|
||||
|
||||
Generated: 2026-04-05
|
||||
Last Updated: BOOKING_PAGE_ANALYSIS.md
|
||||
359
COMPONENT_HIERARCHY.md
Normal file
359
COMPONENT_HIERARCHY.md
Normal file
@@ -0,0 +1,359 @@
|
||||
# Component & Data Flow Hierarchy
|
||||
|
||||
## 🏗️ Component Tree
|
||||
|
||||
```
|
||||
pages/booking/index.vue (Main Page)
|
||||
│
|
||||
├── DateSelector.vue
|
||||
│ └── Emits: @select (date string)
|
||||
│ Props: v-model (current date)
|
||||
│
|
||||
├── TimePeriodFilter.vue
|
||||
│ └── Emits: @change (period key)
|
||||
│ Props: v-model (current period)
|
||||
│
|
||||
├── SlotCard.vue (Multiple, v-for)
|
||||
│ ├── Props: slot (TimeSlotWithBookingStatus)
|
||||
│ ├── Emits: @book (slot) / @cancel (slot)
|
||||
│ └── Computed: capacityLabel, capacityClass
|
||||
│
|
||||
└── BookingConfirmPopup.vue (Modal)
|
||||
├── Props: visible, slot, memberships
|
||||
├── Emits: @confirm ({timeSlotId, membershipId})
|
||||
├── Emits: @cancel
|
||||
└── State: selectedMembershipId
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 State Management Flow
|
||||
|
||||
```
|
||||
Pinia Store (stores/booking.ts)
|
||||
├── State:
|
||||
│ ├── slots: TimeSlotWithBookingStatus[]
|
||||
│ ├── myBookings: BookingWithDetails[]
|
||||
│ ├── upcomingBookings: BookingWithDetails[]
|
||||
│ ├── loadingSlots: boolean
|
||||
│ └── loadingBookings: boolean
|
||||
│
|
||||
└── Actions:
|
||||
├── fetchSlots(date) → GET /time-slot/available?date=
|
||||
├── createBooking({...}) → POST /booking
|
||||
├── cancelBooking(bookingId) → PUT /booking/:id/cancel
|
||||
├── fetchMyBookings(status?) → GET /booking/my
|
||||
└── fetchUpcomingBookings() → GET /booking/my/upcoming
|
||||
|
||||
Pinia Store (stores/user.ts)
|
||||
├── State:
|
||||
│ ├── user: UserProfileResponse | null
|
||||
│ ├── memberships: MembershipWithCardType[]
|
||||
│ ├── token: string
|
||||
│ └── stats: UserStatsResponse | null
|
||||
│
|
||||
├── Computed:
|
||||
│ ├── loggedIn: boolean
|
||||
│ ├── hasValidMembership: boolean
|
||||
│ └── activeMemberships: MembershipWithCardType[]
|
||||
│
|
||||
└── Actions:
|
||||
├── login() → WX login + token
|
||||
├── fetchMemberships() → GET /membership/my
|
||||
├── fetchProfile() → GET /user/profile
|
||||
└── logout()
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📡 API Calls Sequence
|
||||
|
||||
```
|
||||
INITIAL LOAD
|
||||
├─ POST /auth/wxLogin
|
||||
│ └─ Returns: { token, user }
|
||||
│
|
||||
├─ GET /membership/my (if logged in)
|
||||
│ └─ Returns: MembershipWithCardType[]
|
||||
│
|
||||
└─ GET /time-slot/available?date=TODAY
|
||||
└─ Returns: TimeSlotWithBookingStatus[]
|
||||
|
||||
DATE CHANGE
|
||||
└─ GET /time-slot/available?date=SELECTED_DATE
|
||||
└─ Returns: TimeSlotWithBookingStatus[]
|
||||
|
||||
BOOKING CREATION
|
||||
├─ POST /booking
|
||||
│ ├─ Body: { timeSlotId, membershipId }
|
||||
│ └─ Returns: BookingWithDetails
|
||||
│
|
||||
└─ GET /time-slot/available?date=SELECTED_DATE (refresh)
|
||||
└─ Returns: Updated slots with isBookedByMe: true
|
||||
|
||||
BOOKING CANCELLATION
|
||||
├─ PUT /booking/:bookingId/cancel
|
||||
│ └─ Returns: Updated BookingWithDetails
|
||||
│
|
||||
└─ GET /time-slot/available?date=SELECTED_DATE (refresh)
|
||||
└─ Returns: Updated slots with isBookedByMe: false
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎭 Slot Card State Machine
|
||||
|
||||
```
|
||||
TimeSlotWithBookingStatus {
|
||||
status: 'OPEN' | 'FULL' | 'CLOSED'
|
||||
isBookedByMe: boolean
|
||||
}
|
||||
|
||||
STATE COMBINATIONS:
|
||||
|
||||
┌─────────────────────────────────────┐
|
||||
│ status: OPEN, isBookedByMe: false │
|
||||
├─────────────────────────────────────┤
|
||||
│ Button: "可预约" (Tan) │
|
||||
│ Color: #c9a87c │
|
||||
│ Action: onBookTap() → Popup │
|
||||
└─────────────────────────────────────┘
|
||||
|
||||
┌─────────────────────────────────────┐
|
||||
│ status: OPEN, isBookedByMe: true │
|
||||
├─────────────────────────────────────┤
|
||||
│ Badge: "已预约" │
|
||||
│ Link: "取消" (Red underline) │
|
||||
│ Indicator: Tan bar on left │
|
||||
│ Action: onCancelTap() → Confirm │
|
||||
└─────────────────────────────────────┘
|
||||
|
||||
┌─────────────────────────────────────┐
|
||||
│ status: FULL │
|
||||
├─────────────────────────────────────┤
|
||||
│ Button: "已约满" (Gray) │
|
||||
│ Color: #f0f0f0 │
|
||||
│ Action: Disabled (no-op) │
|
||||
└─────────────────────────────────────┘
|
||||
|
||||
┌─────────────────────────────────────┐
|
||||
│ status: CLOSED │
|
||||
├─────────────────────────────────────┤
|
||||
│ Button: "已关闭" (Gray) │
|
||||
│ Color: #f0f0f0 │
|
||||
│ Action: Disabled (no-op) │
|
||||
└─────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Capacity Label Colors
|
||||
|
||||
```
|
||||
Condition Label Background Text
|
||||
─────────────────────────────────────────────────────────────────
|
||||
status === CLOSED "已关闭" #f5f5f5 #999
|
||||
status === FULL "0/1 人" #fef0f0 #ef4444
|
||||
bookedCount >= 80% "0/1 人" #fff8ed #f59e0b
|
||||
bookedCount < 80% "0/1 人" #f0faf3 #4caf50
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🌐 Time Period Filters
|
||||
|
||||
```
|
||||
Key Label Start End Range
|
||||
──────────────────────────────────────────────────────
|
||||
null (all) "全部" - - All times
|
||||
'MORNING' "上午" 06:00 12:00 6am-12pm
|
||||
'AFTERNOON' "下午" 12:00 18:00 12pm-6pm
|
||||
'EVENING' "晚上" 18:00 22:00 6pm-10pm
|
||||
|
||||
Filtering Logic:
|
||||
slot.startTime >= period.start && slot.startTime < period.end
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📱 UI Layout Breakdown
|
||||
|
||||
```
|
||||
┌─────────────────────────────────┐
|
||||
│ 📱 Booking Page (750rpx) │
|
||||
├─────────────────────────────────┤
|
||||
│ │
|
||||
│ ┌─────────────────────────────┐│
|
||||
│ │ 🎫 STICKY HEADER (z-index:100)
|
||||
│ │ ┌───────────────────────────┐│
|
||||
│ │ │ DateSelector (horizontal) ││
|
||||
│ │ │ 今天 5月 4月 3月... ││
|
||||
│ │ └───────────────────────────┘│
|
||||
│ │ ┌───────────────────────────┐│
|
||||
│ │ │ TimePeriodFilter (tabs) ││
|
||||
│ │ │ 全部 | 上午 | 下午 | 晚上││
|
||||
│ │ └───────────────────────────┘│
|
||||
│ └─────────────────────────────┘│
|
||||
│ │
|
||||
│ ┌─────────────────────────────┐│
|
||||
│ │ 📜 SCROLL AREA ││
|
||||
│ │ ││
|
||||
│ │ OR [Loading skeleton] ×4 ││
|
||||
│ │ OR [Empty state] ││
|
||||
│ │ ││
|
||||
│ │ [SlotCard 1] ┌──────────┐ ││
|
||||
│ │ 09:00-10:00 │ 0/1 人 │ ││
|
||||
│ │ │ [可预约] │ ││
|
||||
│ │ ┌──────────┘ └─────────┘ ││
|
||||
│ │ [SlotCard 2] ┌──────────┐ ││
|
||||
│ │ 10:00-11:00 │ 1/1 人 │ ││
|
||||
│ │ ✓已预约 [取消]└─────────┘ ││
|
||||
│ │ [SlotCard 3] ... ││
|
||||
│ │ ││
|
||||
│ │ [Spacer 48rpx] ││
|
||||
│ └─────────────────────────────┘│
|
||||
│ │
|
||||
│ ┌──────────────────────────────┐│
|
||||
│ │ [BookingConfirmPopup] (Modal)││
|
||||
│ │ ┌────────────────────────────┐│
|
||||
│ │ │ ✕ 确认预约 ││
|
||||
│ │ │ ││
|
||||
│ │ │ 日期: 2026-04-05 ││
|
||||
│ │ │ 时间: 09:00 - 10:00 ││
|
||||
│ │ │ 剩余: 1 个名额 ││
|
||||
│ │ │ ───────────────────── ││
|
||||
│ │ │ 💳 私教课程 ││
|
||||
│ │ │ 剩余 10 次 ✓ ││
|
||||
│ │ │ 确认后扣除 1 次课时 ││
|
||||
│ │ │ ││
|
||||
│ │ │ [取消] [确认预约] ││
|
||||
│ │ └────────────────────────────┘│
|
||||
│ └──────────────────────────────┘│
|
||||
└─────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Authentication Flow
|
||||
|
||||
```
|
||||
PAGE LOAD
|
||||
│
|
||||
├─ Check: userStore.loggedIn?
|
||||
│
|
||||
├─ YES
|
||||
│ ├─ Check: userStore.activeMemberships.length > 0?
|
||||
│ │ ├─ NO: await fetchMemberships()
|
||||
│ │ └─ YES: (already loaded)
|
||||
│ │
|
||||
│ └─ Load today's slots
|
||||
│
|
||||
└─ NO (not logged in)
|
||||
└─ Page loads but booking disabled
|
||||
(onBookTap shows login modal)
|
||||
|
||||
USER TAPS "可预约"
|
||||
│
|
||||
├─ Check: userStore.loggedIn?
|
||||
│ ├─ NO: Show login modal
|
||||
│ │ ├─ User confirms → wxLogin()
|
||||
│ │ ├─ Retry booking flow
|
||||
│ │ └─ Success: Load memberships, show popup
|
||||
│ │
|
||||
│ └─ YES: Continue
|
||||
│
|
||||
├─ Check: userStore.hasValidMembership?
|
||||
│ ├─ NO: Show purchase modal
|
||||
│ │ └─ User navigates to /pages/store/index
|
||||
│ │
|
||||
│ └─ YES: Continue
|
||||
│
|
||||
└─ Show BookingConfirmPopup
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Error Handling (Current)
|
||||
|
||||
```
|
||||
fetchSlots() Error:
|
||||
├─ console.error('Fetch slots failed:', err)
|
||||
├─ slots.value = []
|
||||
└─ UI shows: "当日暂无可约时段" (empty state)
|
||||
❌ User can't distinguish network error from no slots
|
||||
|
||||
createBooking() Error:
|
||||
├─ uni.showToast({ title: message, icon: 'none' })
|
||||
└─ UI shows: Error toast (Good ✓)
|
||||
|
||||
cancelBooking() Error:
|
||||
├─ uni.showToast({ title: message, icon: 'none' })
|
||||
└─ UI shows: Error toast (Good ✓)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧮 Computed Values & Reactivity
|
||||
|
||||
```
|
||||
PAGE LEVEL:
|
||||
scrollHeight = computed(() => {
|
||||
// Recalc when window size changes
|
||||
// = windowHeight - headerHeight - tabbarHeight
|
||||
})
|
||||
|
||||
filteredSlots = computed(() => {
|
||||
// Depends on: slots, selectedPeriod
|
||||
// Recalc when either changes
|
||||
// Filters by TIME_PERIODS[selectedPeriod].start/end
|
||||
})
|
||||
|
||||
COMPONENT LEVEL:
|
||||
SlotCard.capacityLabel = computed(() => {
|
||||
// Depends on: slot.status, slot.bookedCount, slot.capacity
|
||||
// Returns: "已关闭" | "X/Y 人"
|
||||
})
|
||||
|
||||
SlotCard.capacityClass = computed(() => {
|
||||
// Depends on: slot.status, slot.bookedCount, slot.capacity
|
||||
// Returns: "cap-open" | "cap-almost" | "cap-full" | "cap-closed"
|
||||
})
|
||||
|
||||
BookingConfirmPopup.selectedMembership = computed(() => {
|
||||
// Depends on: selectedMembershipId, memberships
|
||||
// Returns: Found membership or null
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Key Data Transformations
|
||||
|
||||
```
|
||||
Raw API Response
|
||||
└─ TimeSlot {
|
||||
date: "2026-04-05",
|
||||
startTime: "09:00",
|
||||
endTime: "10:00",
|
||||
...
|
||||
}
|
||||
|
||||
STORE (bookingStore.slots)
|
||||
└─ TimeSlotWithBookingStatus extends TimeSlot {
|
||||
isBookedByMe: boolean,
|
||||
myBookingId: string | null
|
||||
}
|
||||
|
||||
DISPLAY (SlotCard)
|
||||
├─ capacityLabel: "0/1 人" | "已关闭"
|
||||
├─ capacityClass: "cap-open" | "cap-almost" | "cap-full" | "cap-closed"
|
||||
├─ Button state: "可预约" | "已预约" | "已约满" | "已关闭"
|
||||
└─ Time display: "09:00 - 10:00" (slice first 5 chars)
|
||||
|
||||
BOOKING CREATION
|
||||
├─ Selected Slot ID
|
||||
├─ Selected Membership ID
|
||||
└─ POST /booking
|
||||
└─ Success: Slot updated with isBookedByMe: true
|
||||
```
|
||||
|
||||
592
QUICK_REFERENCE.md
Normal file
592
QUICK_REFERENCE.md
Normal file
@@ -0,0 +1,592 @@
|
||||
# Booking Page - Quick Reference & Code Snippets
|
||||
|
||||
## 🚀 Quick Start: Understanding the Flow
|
||||
|
||||
### Where Slots Come From
|
||||
```typescript
|
||||
// 1. Store calls API
|
||||
packages/app/src/stores/booking.ts:17-27
|
||||
async function fetchSlots(date: string) {
|
||||
loadingSlots.value = true
|
||||
try {
|
||||
// GET /time-slot/available?date=2026-04-05
|
||||
slots.value = await get<TimeSlotWithBookingStatus[]>(
|
||||
'/time-slot/available',
|
||||
{ date }
|
||||
)
|
||||
} catch (err) {
|
||||
console.error('Fetch slots failed:', err)
|
||||
slots.value = [] // ⚠️ Clears on error!
|
||||
} finally {
|
||||
loadingSlots.value = false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Where Time Periods Are Defined
|
||||
```typescript
|
||||
// packages/shared/src/constants.ts:11-15
|
||||
export const TIME_PERIODS = {
|
||||
MORNING: { label: '上午', start: '06:00', end: '12:00' },
|
||||
AFTERNOON: { label: '下午', start: '12:00', end: '18:00' },
|
||||
EVENING: { label: '晚上', start: '18:00', end: '22:00' },
|
||||
} as const
|
||||
```
|
||||
|
||||
### Where Filtering Happens
|
||||
```typescript
|
||||
// pages/booking/index.vue:94-103
|
||||
const filteredSlots = computed<TimeSlotWithBookingStatus[]>(() => {
|
||||
const slots = bookingStore.slots as TimeSlotWithBookingStatus[]
|
||||
if (!selectedPeriod.value) return [...slots]
|
||||
|
||||
const period = TIME_PERIODS[selectedPeriod.value]
|
||||
return slots.filter((slot) => {
|
||||
const t = slot.startTime // "09:00", "10:00", etc
|
||||
return t >= period.start && t < period.end
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
### Slot Rendering
|
||||
```vue
|
||||
<!-- pages/booking/index.vue:34-42 -->
|
||||
<view v-else class="slot-list">
|
||||
<SlotCard
|
||||
v-for="slot in filteredSlots"
|
||||
:key="slot.id"
|
||||
:slot="slot"
|
||||
@book="onBookTap"
|
||||
@cancel="onCancelTap"
|
||||
/>
|
||||
</view>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔍 Finding Specific Things
|
||||
|
||||
### Q: Where do the time slot types come from?
|
||||
**A:** `packages/shared/src/types/time-slot.ts`
|
||||
```typescript
|
||||
interface TimeSlotWithBookingStatus extends TimeSlot {
|
||||
readonly isBookedByMe: boolean // true if user booked it
|
||||
readonly myBookingId: string | null // needed for cancellation
|
||||
}
|
||||
|
||||
interface TimeSlot {
|
||||
readonly id: string // UUID
|
||||
readonly date: string // "2026-04-05"
|
||||
readonly startTime: string // "09:00"
|
||||
readonly endTime: string // "10:00"
|
||||
readonly capacity: number // 1 (for private lessons)
|
||||
readonly bookedCount: number // 0 or 1
|
||||
readonly status: TimeSlotStatus // OPEN|FULL|CLOSED
|
||||
readonly source: TimeSlotSource // TEMPLATE|MANUAL
|
||||
readonly templateId: string | null
|
||||
readonly createdAt: string
|
||||
readonly updatedAt: string
|
||||
}
|
||||
```
|
||||
|
||||
### Q: Where is the membership selection happening?
|
||||
**A:** `components/BookingConfirmPopup.vue:136-147`
|
||||
```typescript
|
||||
const selectedMembershipId = ref<string>('')
|
||||
|
||||
watch(
|
||||
[() => props.visible, () => props.memberships],
|
||||
([visible, memberships]) => {
|
||||
if (visible && memberships.length > 0) {
|
||||
selectedMembershipId.value = memberships[0].id // Auto-select first
|
||||
}
|
||||
},
|
||||
{ immediate: true },
|
||||
)
|
||||
```
|
||||
|
||||
### Q: Where are the button states determined?
|
||||
**A:** `components/SlotCard.vue:15-45`
|
||||
```vue
|
||||
<!-- OPEN + not booked by me -->
|
||||
<template v-if="slot.status === TimeSlotStatus.OPEN && !slot.isBookedByMe">
|
||||
<view class="btn btn-book" @tap.stop="emit('book', slot)">
|
||||
<text class="btn-text">可预约</text>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- OPEN + booked by me -->
|
||||
<template v-else-if="slot.status === TimeSlotStatus.OPEN && slot.isBookedByMe">
|
||||
<view class="booked-row">
|
||||
<view class="badge-booked">
|
||||
<text class="badge-text">已预约</text>
|
||||
</view>
|
||||
<view class="btn-cancel" @tap.stop="emit('cancel', slot)">
|
||||
<text class="btn-cancel-text">取消</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- FULL or CLOSED -->
|
||||
<template v-else>
|
||||
<view class="btn btn-disabled">
|
||||
<text class="btn-text">
|
||||
{{ slot.status === TimeSlotStatus.FULL ? '已约满' : '已关闭' }}
|
||||
</text>
|
||||
</view>
|
||||
</template>
|
||||
```
|
||||
|
||||
### Q: Where is the API request actually made?
|
||||
**A:** `utils/request.ts:22-59`
|
||||
```typescript
|
||||
export function request<T>(options: RequestOptions): Promise<T> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const token = uni.getStorageSync('token') as string
|
||||
|
||||
uni.request({
|
||||
url: `${BASE_URL}${options.url}`, // BASE_URL = http://localhost:3000/api
|
||||
method: options.method || 'GET',
|
||||
data: options.data,
|
||||
header: {
|
||||
'Content-Type': 'application/json',
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
...options.header,
|
||||
},
|
||||
success: (res) => {
|
||||
if (res.statusCode === 401) {
|
||||
uni.removeStorageSync('token')
|
||||
uni.showToast({ title: '请重新登录', icon: 'none' })
|
||||
reject(new Error('Unauthorized'))
|
||||
return
|
||||
}
|
||||
if (res.statusCode >= 400) {
|
||||
const body = res.data as ApiResponse<unknown>
|
||||
reject(new Error(body?.message || `请求失败 (${res.statusCode})`))
|
||||
return
|
||||
}
|
||||
const body = res.data as ApiResponse<T>
|
||||
if (body.success) {
|
||||
resolve(body.data as T) // ← Extract data from ApiResponse
|
||||
} else {
|
||||
reject(new Error(body.message || '请求失败'))
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
reject(new Error(err.errMsg || '网络请求失败'))
|
||||
},
|
||||
})
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🐛 Debugging Tips
|
||||
|
||||
### Tip 1: Check what's in the store
|
||||
```typescript
|
||||
// In browser console while in booking page:
|
||||
console.log('Slots:', JSON.stringify(uni.$u.pinia.state.value.booking.slots, null, 2))
|
||||
console.log('Selected period:', uni.$u.pinia.state.value.booking.selectedPeriod)
|
||||
```
|
||||
|
||||
### Tip 2: Log slot filtering
|
||||
```typescript
|
||||
// Add to pages/booking/index.vue filteredSlots computed:
|
||||
const filteredSlots = computed<TimeSlotWithBookingStatus[]>(() => {
|
||||
const slots = bookingStore.slots as TimeSlotWithBookingStatus[]
|
||||
if (!selectedPeriod.value) {
|
||||
console.log('No period filter, showing all slots:', slots.length)
|
||||
return [...slots]
|
||||
}
|
||||
|
||||
const period = TIME_PERIODS[selectedPeriod.value]
|
||||
console.log(`Filtering by ${selectedPeriod.value}:`, period)
|
||||
console.log('All slot times:', slots.map(s => s.startTime))
|
||||
|
||||
const filtered = slots.filter((slot) => {
|
||||
const t = slot.startTime
|
||||
const matches = t >= period.start && t < period.end
|
||||
if (!matches) console.log(`${t} not in [${period.start}, ${period.end})`)
|
||||
return matches
|
||||
})
|
||||
|
||||
console.log('Filtered result:', filtered.length)
|
||||
return filtered
|
||||
})
|
||||
```
|
||||
|
||||
### Tip 3: Verify API response
|
||||
```typescript
|
||||
// In stores/booking.ts fetchSlots():
|
||||
async function fetchSlots(date: string) {
|
||||
loadingSlots.value = true
|
||||
try {
|
||||
console.log('Fetching slots for date:', date)
|
||||
slots.value = await get<TimeSlotWithBookingStatus[]>(
|
||||
'/time-slot/available',
|
||||
{ date }
|
||||
)
|
||||
console.log('Received slots:', slots.value)
|
||||
console.log('Slot count:', slots.value.length)
|
||||
if (slots.value.length > 0) {
|
||||
console.log('First slot:', JSON.stringify(slots.value[0], null, 2))
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Fetch slots failed:', err)
|
||||
slots.value = []
|
||||
} finally {
|
||||
loadingSlots.value = false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Tip 4: Check network requests
|
||||
```typescript
|
||||
// Open WeChat DevTools → Network tab
|
||||
// Look for GET request to /time-slot/available
|
||||
// Check:
|
||||
// ✓ URL has ?date=YYYY-MM-DD
|
||||
// ✓ Authorization header exists
|
||||
// ✓ Response status 200
|
||||
// ✓ Response body has "success": true
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ❌ Common Issues & Solutions
|
||||
|
||||
### Issue 1: Slots not loading
|
||||
**Symptoms:**
|
||||
- Page shows "当日暂无可约时段" (no slots)
|
||||
- No error message
|
||||
|
||||
**Check list:**
|
||||
```typescript
|
||||
// 1. Is API endpoint correct?
|
||||
// Check: /time-slot/available?date=2026-04-05
|
||||
// Should return TimeSlotWithBookingStatus[]
|
||||
|
||||
// 2. Is date format correct?
|
||||
// Page sends: formatDate(new Date()) → "2026-04-05"
|
||||
// API expects: "YYYY-MM-DD"
|
||||
console.log(formatDate(new Date())) // Should output: "2026-04-05"
|
||||
|
||||
// 3. Is authentication working?
|
||||
console.log('Token:', uni.getStorageSync('token'))
|
||||
|
||||
// 4. Check for errors in console
|
||||
// If fetchSlots fails, slots.value becomes []
|
||||
```
|
||||
|
||||
**Solution:**
|
||||
```typescript
|
||||
// In bookingStore.fetchSlots(), add error state:
|
||||
const error = ref<string | null>(null)
|
||||
|
||||
async function fetchSlots(date: string) {
|
||||
loadingSlots.value = true
|
||||
error.value = null // Clear previous error
|
||||
try {
|
||||
slots.value = await get<TimeSlotWithBookingStatus[]>(
|
||||
'/time-slot/available',
|
||||
{ date }
|
||||
)
|
||||
} catch (err) {
|
||||
console.error('Fetch slots failed:', err)
|
||||
error.value = err instanceof Error ? err.message : '加载失败'
|
||||
slots.value = []
|
||||
} finally {
|
||||
loadingSlots.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// Then in page template:
|
||||
<view v-if="error" class="error-wrap">
|
||||
<text>{{ error }}</text>
|
||||
<view @tap="loadSlots(selectedDate)">重试</view>
|
||||
</view>
|
||||
```
|
||||
|
||||
### Issue 2: Time period filtering not working
|
||||
**Symptoms:**
|
||||
- Select "上午" (morning) but all slots still show
|
||||
- Or vice versa
|
||||
|
||||
**Check:**
|
||||
```typescript
|
||||
// 1. Verify TIME_PERIODS constant
|
||||
console.log('TIME_PERIODS:', TIME_PERIODS)
|
||||
|
||||
// 2. Check selectedPeriod value
|
||||
console.log('Selected period:', selectedPeriod.value)
|
||||
|
||||
// 3. Verify slot.startTime format
|
||||
// Should be "HH:MM" like "09:00", not "09:00:00"
|
||||
bookingStore.slots.forEach(slot => {
|
||||
console.log('Slot time:', slot.startTime, 'format ok?', /^\d{2}:\d{2}$/.test(slot.startTime))
|
||||
})
|
||||
|
||||
// 4. Test filtering manually
|
||||
const slot = bookingStore.slots[0]
|
||||
const period = TIME_PERIODS.MORNING
|
||||
console.log(`${slot.startTime} >= ${period.start}?`, slot.startTime >= period.start)
|
||||
console.log(`${slot.startTime} < ${period.end}?`, slot.startTime < period.end)
|
||||
```
|
||||
|
||||
**Solution:**
|
||||
```typescript
|
||||
// If time format is "09:00:00", slice it:
|
||||
const filteredSlots = computed<TimeSlotWithBookingStatus[]>(() => {
|
||||
const slots = bookingStore.slots as TimeSlotWithBookingStatus[]
|
||||
if (!selectedPeriod.value) return [...slots]
|
||||
|
||||
const period = TIME_PERIODS[selectedPeriod.value]
|
||||
return slots.filter((slot) => {
|
||||
// Ensure HH:MM format
|
||||
const t = slot.startTime.slice(0, 5) // "09:00:00" → "09:00"
|
||||
return t >= period.start && t < period.end
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
### Issue 3: Booking button not responding
|
||||
**Symptoms:**
|
||||
- Click "可预约" but nothing happens
|
||||
- No modal appears
|
||||
|
||||
**Check:**
|
||||
```typescript
|
||||
// 1. Is slot.status correct?
|
||||
console.log('Slot status:', slot.status)
|
||||
// Should be "OPEN" to show book button
|
||||
|
||||
// 2. Is isBookedByMe false?
|
||||
console.log('Is booked by me?', slot.isBookedByMe)
|
||||
// Should be false to show book button
|
||||
|
||||
// 3. Is onBookTap being called?
|
||||
// Add to pages/booking/index.vue:
|
||||
async function onBookTap(slot: TimeSlotWithBookingStatus) {
|
||||
console.log('Book tapped for slot:', slot) // ← Should log
|
||||
|
||||
// Rest of code...
|
||||
}
|
||||
|
||||
// 4. Is userStore.loggedIn true?
|
||||
console.log('Logged in?', userStore.loggedIn)
|
||||
```
|
||||
|
||||
### Issue 4: Membership not showing in popup
|
||||
**Symptoms:**
|
||||
- Booking popup appears but no membership card shown
|
||||
- "暂无可用会员卡" displayed
|
||||
|
||||
**Check:**
|
||||
```typescript
|
||||
// 1. Are memberships loaded?
|
||||
console.log('Memberships:', userStore.memberships)
|
||||
|
||||
// 2. Are any memberships ACTIVE?
|
||||
console.log('Active memberships:', userStore.activeMemberships)
|
||||
console.log('Has valid membership?', userStore.hasValidMembership)
|
||||
|
||||
// 3. Are memberships passed to popup?
|
||||
// In pages/booking/index.vue:
|
||||
<BookingConfirmPopup
|
||||
:memberships="userStore.activeMemberships as MembershipWithCardType[]"
|
||||
...
|
||||
/>
|
||||
console.log('Popup passed memberships:', userStore.activeMemberships)
|
||||
```
|
||||
|
||||
**Solution:**
|
||||
```typescript
|
||||
// In onMounted:
|
||||
onMounted(async () => {
|
||||
if (userStore.loggedIn && userStore.activeMemberships.length === 0) {
|
||||
console.log('Fetching memberships...')
|
||||
try {
|
||||
await userStore.fetchMemberships()
|
||||
console.log('Memberships loaded:', userStore.activeMemberships)
|
||||
} catch (err) {
|
||||
console.error('Failed to fetch memberships:', err)
|
||||
uni.showToast({ title: '加载会员卡失败', icon: 'none' })
|
||||
}
|
||||
}
|
||||
await loadSlots(selectedDate.value)
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Capacity Display Logic
|
||||
|
||||
### How Capacity Color is Determined
|
||||
```typescript
|
||||
// components/SlotCard.vue:69-81
|
||||
const capacityLabel = computed(() => {
|
||||
const { bookedCount, capacity, status } = props.slot
|
||||
if (status === TimeSlotStatus.CLOSED) return '已关闭'
|
||||
return `${bookedCount}/${capacity} 人`
|
||||
})
|
||||
|
||||
const capacityClass = computed(() => {
|
||||
const { bookedCount, capacity, status } = props.slot
|
||||
if (status === TimeSlotStatus.CLOSED) return 'cap-closed'
|
||||
if (status === TimeSlotStatus.FULL) return 'cap-full'
|
||||
if (bookedCount >= capacity * 0.8) return 'cap-almost'
|
||||
return 'cap-open'
|
||||
})
|
||||
|
||||
// Color mapping in styles:
|
||||
// cap-open: #f0faf3 bg, #4caf50 text (green) - <80% booked
|
||||
// cap-almost: #fff8ed bg, #f59e0b text (orange) - ≥80% booked
|
||||
// cap-full: #fef0f0 bg, #ef4444 text (red) - status: FULL
|
||||
// cap-closed: #f5f5f5 bg, #999 text (gray) - status: CLOSED
|
||||
```
|
||||
|
||||
### Example Calculations
|
||||
```typescript
|
||||
// Slot 1: capacity=1, bookedCount=0, status=OPEN
|
||||
// 0/1 人 in green badge (0% booked)
|
||||
|
||||
// Slot 2: capacity=1, bookedCount=1, status=OPEN
|
||||
// 1/1 人 in red badge (100% booked ≥ 80%)
|
||||
|
||||
// Slot 3: capacity=5, bookedCount=4, status=OPEN
|
||||
// 4/5 人 in orange badge (80% booked ≥ 80%)
|
||||
|
||||
// Slot 4: capacity=5, bookedCount=3, status=OPEN
|
||||
// 3/5 人 in green badge (60% booked < 80%)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔗 API Contract Summary
|
||||
|
||||
### GET /time-slot/available
|
||||
|
||||
**Request:**
|
||||
```
|
||||
GET /api/time-slot/available?date=2026-04-05
|
||||
Authorization: Bearer <token>
|
||||
```
|
||||
|
||||
**Response (200 OK):**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": [
|
||||
{
|
||||
"id": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"date": "2026-04-05",
|
||||
"startTime": "09:00",
|
||||
"endTime": "10:00",
|
||||
"capacity": 1,
|
||||
"bookedCount": 0,
|
||||
"status": "OPEN",
|
||||
"source": "MANUAL",
|
||||
"templateId": null,
|
||||
"createdAt": "2026-04-01T10:00:00Z",
|
||||
"updatedAt": "2026-04-05T09:00:00Z",
|
||||
"isBookedByMe": false,
|
||||
"myBookingId": null
|
||||
}
|
||||
],
|
||||
"message": null
|
||||
}
|
||||
```
|
||||
|
||||
**Error (400):**
|
||||
```json
|
||||
{
|
||||
"success": false,
|
||||
"data": null,
|
||||
"message": "Invalid date format"
|
||||
}
|
||||
```
|
||||
|
||||
### POST /booking
|
||||
|
||||
**Request:**
|
||||
```json
|
||||
POST /api/booking
|
||||
{
|
||||
"timeSlotId": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"membershipId": "220e8400-e29b-41d4-a716-446655440111"
|
||||
}
|
||||
```
|
||||
|
||||
**Response (201):**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"id": "550e8400-e29b-41d4-a716-446655440222",
|
||||
"userId": "user-123",
|
||||
"timeSlotId": "550e8400-e29b-41d4-a716-446655440000",
|
||||
"membershipId": "220e8400-e29b-41d4-a716-446655440111",
|
||||
"status": "CONFIRMED",
|
||||
"bookedAt": "2026-04-05T10:30:00Z",
|
||||
"courseDate": "2026-04-05",
|
||||
"courseTime": "09:00",
|
||||
"instructorName": "instructor name",
|
||||
"isCompleted": false
|
||||
},
|
||||
"message": null
|
||||
}
|
||||
```
|
||||
|
||||
### PUT /booking/:id/cancel
|
||||
|
||||
**Request:**
|
||||
```
|
||||
PUT /api/booking/550e8400-e29b-41d4-a716-446655440222/cancel
|
||||
```
|
||||
|
||||
**Response (200):**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"id": "550e8400-e29b-41d4-a716-446655440222",
|
||||
"status": "CANCELLED",
|
||||
"cancelledAt": "2026-04-05T10:35:00Z"
|
||||
},
|
||||
"message": null
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Next Steps for Debugging
|
||||
|
||||
1. **Verify API Endpoint**
|
||||
- Open DevTools → Network
|
||||
- Check `/time-slot/available?date=...` request
|
||||
- Confirm response has `"success": true`
|
||||
- Confirm data array is not empty
|
||||
|
||||
2. **Check Store State**
|
||||
- Add console.logs to bookingStore.fetchSlots()
|
||||
- Verify slots are set correctly
|
||||
- Check loadingSlots toggle
|
||||
|
||||
3. **Verify Computed Properties**
|
||||
- Log filteredSlots in component
|
||||
- Check if filtering logic works
|
||||
- Verify slot.startTime format
|
||||
|
||||
4. **Test User Interaction**
|
||||
- Click date item → verify onDateSelect fires
|
||||
- Click period tab → verify onPeriodChange fires
|
||||
- Click book button → verify onBookTap fires
|
||||
- Check modals appear
|
||||
|
||||
5. **Check Mobile-Specific Issues**
|
||||
- Test in WeChat DevTools
|
||||
- Check rpx calculations
|
||||
- Verify touch events work
|
||||
|
||||
244
SCHEDULING_DOCUMENTATION_INDEX.md
Normal file
244
SCHEDULING_DOCUMENTATION_INDEX.md
Normal file
@@ -0,0 +1,244 @@
|
||||
# WeChat Mini-Program Admin Scheduling - Documentation Index
|
||||
|
||||
**Created**: 2026-04-05
|
||||
**Project**: mp-pilates (Pilates Studio Booking System)
|
||||
|
||||
---
|
||||
|
||||
## 📚 Documentation Files
|
||||
|
||||
This exploration contains **3 comprehensive documents** about the admin scheduling/排课设置 system:
|
||||
|
||||
### 1. **ADMIN_SCHEDULING_EXPLORATION.md** (24 KB, 803 lines)
|
||||
**Purpose**: Complete deep-dive into the scheduling system
|
||||
|
||||
**Sections**:
|
||||
- Executive Summary
|
||||
- File Structure (frontend, backend, shared)
|
||||
- 4 Key Components (Admin Dashboard, Week Templates, Slot Adjustment, Admin Store)
|
||||
- Backend Architecture (Controllers, Services, Slot Generator)
|
||||
- Data Flow & User Journey
|
||||
- Constants & Utilities
|
||||
- Permission Model
|
||||
- Implementation Status
|
||||
- Edge Cases
|
||||
- UI Design Patterns
|
||||
- Deployment & Configuration
|
||||
|
||||
**Best for**: Understanding the complete architecture and how everything connects
|
||||
|
||||
---
|
||||
|
||||
### 2. **SCHEDULING_FLOW_DIAGRAM.md** (13 KB, 271 lines)
|
||||
**Purpose**: Visual flowcharts and architecture diagrams
|
||||
|
||||
**Sections**:
|
||||
- Component Architecture (visual tree)
|
||||
- Data Flow: Template → Slots (visual flowchart)
|
||||
- State Management breakdown
|
||||
- API Endpoints Summary
|
||||
- Entity Relationships (ER diagram)
|
||||
- Weekday Mapping (ISO vs JS conversion)
|
||||
- Timeline Example (realistic scenario)
|
||||
|
||||
**Best for**: Quick visual understanding of the flow and architecture
|
||||
|
||||
---
|
||||
|
||||
### 3. **SCHEDULING_QUICK_REFERENCE.md** (7.9 KB, 296 lines)
|
||||
**Purpose**: Quick lookup guide for developers
|
||||
|
||||
**Sections**:
|
||||
- Quick Links to Key Files (with line numbers)
|
||||
- The Flow in 30 Seconds
|
||||
- Core Entities (WeekTemplate, TimeSlot)
|
||||
- API Endpoints (with JSON examples)
|
||||
- UI State Management
|
||||
- Permissions & Auth
|
||||
- Important Constants
|
||||
- Common Gotchas (5 key points)
|
||||
- Usage Example (step-by-step)
|
||||
- Related Components
|
||||
- Scalability Notes
|
||||
|
||||
**Best for**: Developers jumping into the code for the first time
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Choose Your Path
|
||||
|
||||
### If you want to...
|
||||
|
||||
**Understand the big picture**
|
||||
→ Read: `SCHEDULING_FLOW_DIAGRAM.md`
|
||||
→ Then: `ADMIN_SCHEDULING_EXPLORATION.md` (section 2)
|
||||
|
||||
**Start coding immediately**
|
||||
→ Read: `SCHEDULING_QUICK_REFERENCE.md`
|
||||
→ Then: Jump to specific file links
|
||||
|
||||
**Debug a specific issue**
|
||||
→ Read: `SCHEDULING_QUICK_REFERENCE.md` (Common Gotchas)
|
||||
→ Then: Search in `ADMIN_SCHEDULING_EXPLORATION.md`
|
||||
|
||||
**Understand data flow**
|
||||
→ Read: `SCHEDULING_FLOW_DIAGRAM.md` (Data Flow section)
|
||||
→ Then: `ADMIN_SCHEDULING_EXPLORATION.md` (section 7: Data Flow)
|
||||
|
||||
---
|
||||
|
||||
## 🔑 Key Files by Role
|
||||
|
||||
### Frontend Developer
|
||||
**Must Read**:
|
||||
- `SCHEDULING_QUICK_REFERENCE.md` → UI State Management
|
||||
- `packages/app/src/pages/admin/week-template.vue` (500 lines)
|
||||
- `packages/app/src/pages/admin/slot-adjust.vue` (428 lines)
|
||||
- `packages/app/src/stores/admin.ts` (171 lines)
|
||||
|
||||
### Backend Developer
|
||||
**Must Read**:
|
||||
- `SCHEDULING_QUICK_REFERENCE.md` → API Endpoints
|
||||
- `packages/server/src/time-slot/time-slot.controller.ts`
|
||||
- `packages/server/src/time-slot/slot-generator.service.ts`
|
||||
- `packages/server/src/time-slot/time-slot.service.ts`
|
||||
|
||||
### Full-Stack Developer
|
||||
**Must Read**: All documentation files in order:
|
||||
1. `SCHEDULING_QUICK_REFERENCE.md` (5 min)
|
||||
2. `SCHEDULING_FLOW_DIAGRAM.md` (10 min)
|
||||
3. `ADMIN_SCHEDULING_EXPLORATION.md` (20 min)
|
||||
|
||||
---
|
||||
|
||||
## 🎓 Learning Timeline
|
||||
|
||||
### Day 1: Orientation (30 minutes)
|
||||
- Read: `SCHEDULING_QUICK_REFERENCE.md` section "The Flow: In 30 Seconds"
|
||||
- Skim: `SCHEDULING_FLOW_DIAGRAM.md`
|
||||
|
||||
### Day 2: Deep Dive (1-2 hours)
|
||||
- Read: `SCHEDULING_FLOW_DIAGRAM.md` (entire)
|
||||
- Read: `ADMIN_SCHEDULING_EXPLORATION.md` (sections 1-3)
|
||||
|
||||
### Day 3: Implementation (ongoing)
|
||||
- Refer to: `SCHEDULING_QUICK_REFERENCE.md` as needed
|
||||
- Cross-reference: `ADMIN_SCHEDULING_EXPLORATION.md` sections 4-8
|
||||
- Check: Backend/Frontend specific sections
|
||||
|
||||
---
|
||||
|
||||
## 🔗 File Paths: Quick Lookup
|
||||
|
||||
| Component | Path | Lines |
|
||||
|-----------|------|-------|
|
||||
| Admin Dashboard | `packages/app/src/pages/admin/index.vue` | 177 |
|
||||
| **Week Templates** | `packages/app/src/pages/admin/week-template.vue` | 500 ⭐ |
|
||||
| Slot Adjustment | `packages/app/src/pages/admin/slot-adjust.vue` | 428 |
|
||||
| Admin Store | `packages/app/src/stores/admin.ts` | 171 |
|
||||
| API Controller | `packages/server/src/time-slot/time-slot.controller.ts` | 92 |
|
||||
| API Service | `packages/server/src/time-slot/time-slot.service.ts` | 142 |
|
||||
| Slot Generator | `packages/server/src/time-slot/slot-generator.service.ts` | 172 |
|
||||
| Types: Templates | `packages/shared/src/types/week-template.ts` | 19 |
|
||||
| Types: Slots | `packages/shared/src/types/time-slot.ts` | 30 |
|
||||
| Constants | `packages/shared/src/constants.ts` | 22 |
|
||||
| Utilities | `packages/app/src/utils/format.ts` | 47 |
|
||||
|
||||
⭐ = Main scheduling component (排课设置)
|
||||
|
||||
---
|
||||
|
||||
## 📊 System Overview
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────┐
|
||||
│ ADMIN SCHEDULING SYSTEM │
|
||||
├─────────────────────────────────────────────────────────┤
|
||||
│ │
|
||||
│ Frontend (Vue 3 + TypeScript) │
|
||||
│ ├─ week-template.vue (templates CRUD) │
|
||||
│ ├─ slot-adjust.vue (manual operations) │
|
||||
│ └─ admin.ts (Pinia store) │
|
||||
│ │
|
||||
│ Backend (NestJS + Prisma) │
|
||||
│ ├─ time-slot.controller.ts (API routes) │
|
||||
│ ├─ time-slot.service.ts (business logic) │
|
||||
│ └─ slot-generator.service.ts (auto-generation) │
|
||||
│ │
|
||||
│ Database (PostgreSQL/MySQL) │
|
||||
│ ├─ WeekTemplate (recurring schedule rules) │
|
||||
│ ├─ TimeSlot (actual bookable slots) │
|
||||
│ └─ Booking (user reservations) │
|
||||
│ │
|
||||
└─────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Quick Start Checklist
|
||||
|
||||
- [ ] Read `SCHEDULING_QUICK_REFERENCE.md` (5 min)
|
||||
- [ ] Skim `SCHEDULING_FLOW_DIAGRAM.md` (5 min)
|
||||
- [ ] Open `packages/app/src/pages/admin/week-template.vue`
|
||||
- [ ] Open `packages/server/src/time-slot/slot-generator.service.ts`
|
||||
- [ ] Bookmark this index file for reference
|
||||
- [ ] Ask questions about specific sections in the docs
|
||||
|
||||
---
|
||||
|
||||
## 📝 Terms & Definitions
|
||||
|
||||
| Term | Definition |
|
||||
|------|-----------|
|
||||
| **WeekTemplate** | Recurring schedule rule (e.g., "every Monday 9-10 AM") |
|
||||
| **TimeSlot** | Actual bookable time (e.g., "Monday, April 6, 9-10 AM") |
|
||||
| **排课设置** | Schedule setup (admin template management) |
|
||||
| **临时调整** | Temporary adjustments (manual slot operations) |
|
||||
| **isDirty** | Flag indicating unsaved changes |
|
||||
| **Atomic** | All-or-nothing database transaction |
|
||||
| **skipDuplicates** | Prisma option to ignore duplicate records on batch insert |
|
||||
| **ISO Weekday** | 1=Monday, 2=Tuesday, ..., 7=Sunday |
|
||||
|
||||
---
|
||||
|
||||
## 🆘 Getting Help
|
||||
|
||||
### Question Type → Documentation
|
||||
|
||||
**"How does admin add a new class?"**
|
||||
→ `SCHEDULING_QUICK_REFERENCE.md` → Usage Example
|
||||
|
||||
**"What API endpoints exist?"**
|
||||
→ `SCHEDULING_QUICK_REFERENCE.md` → API Endpoints
|
||||
→ OR `ADMIN_SCHEDULING_EXPLORATION.md` → Backend Architecture
|
||||
|
||||
**"How do templates become slots?"**
|
||||
→ `SCHEDULING_FLOW_DIAGRAM.md` → Data Flow section
|
||||
|
||||
**"What database schema?"**
|
||||
→ `SCHEDULING_QUICK_REFERENCE.md` → Core Entities
|
||||
→ OR `SCHEDULING_FLOW_DIAGRAM.md` → Entity Relationships
|
||||
|
||||
**"Where does X file?"**
|
||||
→ `SCHEDULING_QUICK_REFERENCE.md` → File Paths lookup table
|
||||
|
||||
---
|
||||
|
||||
## ✅ Verification Checklist
|
||||
|
||||
- [x] All 3 documentation files created
|
||||
- [x] 803 + 271 + 296 = 1,370 lines of documentation
|
||||
- [x] Complete file paths documented
|
||||
- [x] API endpoints listed with examples
|
||||
- [x] Data flow diagrams included
|
||||
- [x] Common gotchas documented
|
||||
- [x] Usage examples provided
|
||||
- [x] Scalability notes included
|
||||
- [x] Permission model explained
|
||||
- [x] Timezone handling noted
|
||||
|
||||
---
|
||||
|
||||
**Last Updated**: 2026-04-05
|
||||
**Status**: Complete and ready for reference
|
||||
|
||||
271
SCHEDULING_FLOW_DIAGRAM.md
Normal file
271
SCHEDULING_FLOW_DIAGRAM.md
Normal file
@@ -0,0 +1,271 @@
|
||||
# Admin Scheduling Flow Diagram
|
||||
|
||||
## Component Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────┐
|
||||
│ Admin Dashboard │
|
||||
│ (pages/admin/index.vue) │
|
||||
│ │
|
||||
│ 📅 排课设置 🔧 临时调整 👥 会员 📋 订单 💳 卡 🏢 工作室
|
||||
└─────────────────────────────────────────────────────────┘
|
||||
│
|
||||
└─► 📅 排课设置 (Week Template)
|
||||
└─────────────────────────────────────────┐
|
||||
│ pages/admin/week-template.vue │
|
||||
│ ================================ │
|
||||
│ │
|
||||
│ 1. Fetch Templates (onMounted) │
|
||||
│ └─ GET /admin/week-template │
|
||||
│ │
|
||||
│ 2. Display grouped by day (Mon-Sun) │
|
||||
│ │
|
||||
│ 3. Add/Edit/Delete/Toggle locally │
|
||||
│ └─ isDirty flag = true │
|
||||
│ │
|
||||
│ 4. Save All Changes (bottom bar) │
|
||||
│ └─ PUT /admin/week-template │
|
||||
│ (Full template array) │
|
||||
│ │
|
||||
│ 5. Backend transaction: │
|
||||
│ - DELETE all templates │
|
||||
│ - CREATE new templates │
|
||||
└────────────────────────────────────────┘
|
||||
|
||||
└─► 🔧 临时调整 (Slot Adjustment - 3 Tabs)
|
||||
└─────────────────────────────────────────┐
|
||||
│ pages/admin/slot-adjust.vue │
|
||||
│ ================================ │
|
||||
│ │
|
||||
│ TAB 0: 新增时段 (Add Manual Slot) │
|
||||
│ ├─ Date picker │
|
||||
│ ├─ Time pickers │
|
||||
│ ├─ Capacity input │
|
||||
│ └─ POST /admin/time-slot/manual │
|
||||
│ └─ Creates slot with source=MANUAL │
|
||||
│ │
|
||||
│ TAB 1: 关闭时段 (Close Slots) │
|
||||
│ ├─ Date picker │
|
||||
│ ├─ Fetch slots for date │
|
||||
│ │ └─ GET /admin/time-slots?date=XXX │
|
||||
│ ├─ Display with status badges │
|
||||
│ │ (OPEN/FULL/CLOSED) │
|
||||
│ └─ PUT /admin/time-slot/:id/close │
|
||||
│ │
|
||||
│ TAB 2: 批量生成 (Batch Generate) │
|
||||
│ ├─ Start/end date pickers │
|
||||
│ ├─ POST /admin/generate-slots │
|
||||
│ └─ Backend: │
|
||||
│ 1. Fetch active WeekTemplates │
|
||||
│ 2. For each day in range: │
|
||||
│ - Get ISO weekday (1-7) │
|
||||
│ - Find matching templates │
|
||||
│ - Create TimeSlot records │
|
||||
│ 3. Returns { count: N } │
|
||||
└────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## Data Flow: Template → Slots
|
||||
|
||||
```
|
||||
┌──────────────────────────────────────────────────────────────────┐
|
||||
│ ADMIN TEMPLATE SETUP │
|
||||
│ (weeks/admin/week-template.vue) │
|
||||
└──────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌───────────────────────────────────┐
|
||||
│ Admin configures templates: │
|
||||
│ │
|
||||
│ 周一: 09:00-10:00 (10 ppl) │
|
||||
│ 周一: 18:00-19:00 (8 ppl) │
|
||||
│ 周三: 10:00-11:00 (12 ppl) │
|
||||
│ 周五: 18:00-20:00 (15 ppl) │
|
||||
└───────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌───────────────────────────────────┐
|
||||
│ PUT /admin/week-template │
|
||||
│ (All templates replaced) │
|
||||
└───────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────┐
|
||||
│ Backend: Delete all, Create new (atomic) │
|
||||
└────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────┐
|
||||
│ Scheduler (nightly cron or manual trigger)│
|
||||
│ POST /admin/generate-slots (14 days) │
|
||||
└────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────┐
|
||||
│ SlotGeneratorService.generateSlots() │
|
||||
│ │
|
||||
│ For each active template: │
|
||||
│ For date in next 14 days: │
|
||||
│ If template.dayOfWeek == date.dayOfWeek:
|
||||
│ CREATE TimeSlot { │
|
||||
│ date, startTime, endTime, │
|
||||
│ capacity, source=TEMPLATE, │
|
||||
│ templateId │
|
||||
│ } │
|
||||
└────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────┐
|
||||
│ GENERATED TIME SLOTS │
|
||||
│ │
|
||||
│ 2026-04-06 (Mon): │
|
||||
│ 09:00-10:00 (10 ppl, OPEN) │
|
||||
│ 18:00-19:00 (8 ppl, OPEN) │
|
||||
│ │
|
||||
│ 2026-04-08 (Wed): │
|
||||
│ 10:00-11:00 (12 ppl, OPEN) │
|
||||
│ │
|
||||
│ 2026-04-11 (Fri): │
|
||||
│ 18:00-20:00 (15 ppl, OPEN) │
|
||||
│ ... (more dates) │
|
||||
└────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────┐
|
||||
│ Members can book available slots │
|
||||
│ GET /time-slot/available?date=YYYY-MM-DD
|
||||
└────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## State Management
|
||||
|
||||
### Component State (week-template.vue)
|
||||
```typescript
|
||||
templates: LocalTemplate[] ◄─ Main data array
|
||||
loading: boolean ◄─ Fetch state
|
||||
saving: boolean ◄─ Save state
|
||||
isDirty: boolean ◄─ "Save bar" trigger
|
||||
showModal: boolean ◄─ Modal visibility
|
||||
editTarget: LocalTemplate | null ◄─ Which template is being edited
|
||||
form: { ◄─ Modal form data
|
||||
dayIdx: number
|
||||
startTime: string
|
||||
endTime: string
|
||||
capacityStr: string
|
||||
}
|
||||
grouped: Computed<Record<number, LocalTemplate[]>> ◄─ Grouped by dayOfWeek
|
||||
```
|
||||
|
||||
### Store State (stores/admin.ts)
|
||||
```typescript
|
||||
weekTemplates: WeekTemplate[] ◄─ Cached from server
|
||||
cardTypes: CardType[]
|
||||
studioConfig: StudioConfig | null
|
||||
// ...other admin state
|
||||
```
|
||||
|
||||
## API Endpoints Summary
|
||||
|
||||
### Week Templates
|
||||
```
|
||||
GET /admin/week-template Fetch all templates
|
||||
PUT /admin/week-template Replace all templates
|
||||
```
|
||||
|
||||
### Time Slots
|
||||
```
|
||||
GET /admin/time-slots?date=YYYY-MM-DD Fetch slots for date
|
||||
POST /admin/time-slot/manual Create manual slot
|
||||
PUT /admin/time-slot/:id/close Close a slot
|
||||
POST /admin/generate-slots Generate slots from templates
|
||||
```
|
||||
|
||||
### Public Endpoints
|
||||
```
|
||||
GET /time-slot/available?date=YYYY-MM-DD For members
|
||||
GET /time-slot/:id For members
|
||||
```
|
||||
|
||||
## Entity Relationships
|
||||
|
||||
```
|
||||
┌─────────────────────┐
|
||||
│ WeekTemplate │
|
||||
├─────────────────────┤
|
||||
│ id │
|
||||
│ dayOfWeek (1-7) │
|
||||
│ startTime │
|
||||
│ endTime │
|
||||
│ capacity │
|
||||
│ isActive │
|
||||
└─────────────────────┘
|
||||
│ (1:N)
|
||||
│
|
||||
▼
|
||||
┌─────────────────────┐ ┌──────────────────┐
|
||||
│ TimeSlot │ │ Booking (M:1) │
|
||||
├─────────────────────┤ ├──────────────────┤
|
||||
│ id │◄─────│ timeSlotId │
|
||||
│ date │ │ userId │
|
||||
│ startTime │ │ status │
|
||||
│ endTime │ └──────────────────┘
|
||||
│ capacity │
|
||||
│ bookedCount │
|
||||
│ status │
|
||||
│ source (TEMPLATE/ │
|
||||
│ MANUAL) │
|
||||
│ templateId (FK) │
|
||||
└─────────────────────┘
|
||||
```
|
||||
|
||||
## Weekday Mapping
|
||||
|
||||
### Frontend Picker (dayOptions)
|
||||
```
|
||||
Index 0: 周一 (Monday) ──► dayOfWeek = 1
|
||||
Index 1: 周二 (Tuesday) ──► dayOfWeek = 2
|
||||
Index 2: 周三 (Wednesday) ──► dayOfWeek = 3
|
||||
Index 3: 周四 (Thursday) ──► dayOfWeek = 4
|
||||
Index 4: 周五 (Friday) ──► dayOfWeek = 5
|
||||
Index 5: 周六 (Saturday) ──► dayOfWeek = 6
|
||||
Index 6: 周日 (Sunday) ──► dayOfWeek = 7
|
||||
```
|
||||
|
||||
### Backend Conversion (slot-generator.service.ts)
|
||||
```typescript
|
||||
JS getDay(): 0=Sun, 1=Mon, 2=Tue, ..., 6=Sat
|
||||
│
|
||||
▼ toIsoWeekday()
|
||||
│
|
||||
ISO weekday: 1=Mon, 2=Tue, ..., 7=Sun
|
||||
```
|
||||
|
||||
## Timeline Example
|
||||
|
||||
```
|
||||
TODAY: 2026-04-05 (Sunday)
|
||||
|
||||
Admin actions:
|
||||
1. Sets up weekly templates for Mon-Fri
|
||||
2. Taps "保存全部更改"
|
||||
3. PUT /admin/week-template sent
|
||||
|
||||
Backend scheduler (daily at midnight):
|
||||
4. Runs generateSlots(14)
|
||||
5. Tomorrow is 2026-04-06 (Monday)
|
||||
6. Generates slots for Apr 6-19 (next 14 days)
|
||||
7. Creates TimeSlots based on active templates:
|
||||
|
||||
Generated slots:
|
||||
2026-04-06 (Mon): 09:00-10:00, 18:00-19:00
|
||||
2026-04-07 (Tue): (none if no templates)
|
||||
2026-04-08 (Wed): 10:00-11:00
|
||||
2026-04-09 (Thu): (none if no templates)
|
||||
2026-04-10 (Fri): 18:00-20:00
|
||||
2026-04-11 (Sat): (none - weekend)
|
||||
2026-04-12 (Sun): (none - weekend)
|
||||
...repeats until 2026-04-19
|
||||
|
||||
Members can book from Apr 6 onwards
|
||||
```
|
||||
|
||||
296
SCHEDULING_QUICK_REFERENCE.md
Normal file
296
SCHEDULING_QUICK_REFERENCE.md
Normal file
@@ -0,0 +1,296 @@
|
||||
# Admin Scheduling - Quick Reference Guide
|
||||
|
||||
## 🎯 Quick Links to Key Files
|
||||
|
||||
### Frontend Components
|
||||
| File | Lines | Purpose |
|
||||
|------|-------|---------|
|
||||
| `packages/app/src/pages/admin/index.vue` | 1-177 | Admin dashboard, 6 nav items |
|
||||
| `packages/app/src/pages/admin/week-template.vue` | 1-500 | **MAIN: Schedule template management** |
|
||||
| `packages/app/src/pages/admin/slot-adjust.vue` | 1-428 | 3 tabs: add/close/generate slots |
|
||||
| `packages/app/src/stores/admin.ts` | 1-171 | API calls (Pinia store) |
|
||||
|
||||
### Backend Services
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `packages/server/src/time-slot/time-slot.controller.ts` | API endpoints (/admin/*) |
|
||||
| `packages/server/src/time-slot/time-slot.service.ts` | Template & slot logic |
|
||||
| `packages/server/src/time-slot/slot-generator.service.ts` | Auto-generate slots from templates |
|
||||
| `packages/server/src/time-slot/dto/week-template.dto.ts` | Input validation |
|
||||
|
||||
### Shared Types & Constants
|
||||
| File | Exports |
|
||||
|------|---------|
|
||||
| `packages/shared/src/types/week-template.ts` | `WeekTemplate`, `WeekTemplateInput` |
|
||||
| `packages/shared/src/types/time-slot.ts` | `TimeSlot`, `CreateManualSlotDto` |
|
||||
| `packages/shared/src/constants.ts` | `WEEKDAY_LABELS`, `SLOT_GENERATION_DAYS`, etc. |
|
||||
|
||||
---
|
||||
|
||||
## 🔄 The Flow: In 30 Seconds
|
||||
|
||||
```
|
||||
Admin edits templates
|
||||
↓
|
||||
isDirty = true → Save bar appears
|
||||
↓
|
||||
Admin taps "保存全部更改"
|
||||
↓
|
||||
PUT /admin/week-template (full array)
|
||||
↓
|
||||
Backend: DELETE all, CREATE new (atomic)
|
||||
↓
|
||||
Scheduler triggers (nightly or manual)
|
||||
↓
|
||||
POST /admin/generate-slots
|
||||
↓
|
||||
SlotGeneratorService fetches active templates
|
||||
↓
|
||||
For each day (next 14 days):
|
||||
Match templates by ISO weekday
|
||||
Create TimeSlot records (source=TEMPLATE)
|
||||
↓
|
||||
Members see slots and can book
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Core Entities
|
||||
|
||||
### WeekTemplate (Database)
|
||||
```typescript
|
||||
id: string // UUID
|
||||
dayOfWeek: number // 1=Mon, 2=Tue, ..., 7=Sun
|
||||
startTime: string // "09:00"
|
||||
endTime: string // "10:00"
|
||||
capacity: number // Max bookings
|
||||
isActive: boolean // Enabled/disabled
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
```
|
||||
|
||||
### TimeSlot (Database)
|
||||
```typescript
|
||||
id: string
|
||||
date: string // YYYY-MM-DD
|
||||
startTime: string
|
||||
endTime: string
|
||||
capacity: number
|
||||
bookedCount: number // How many booked
|
||||
status: "OPEN" | "FULL" | "CLOSED"
|
||||
source: "TEMPLATE" | "MANUAL"
|
||||
templateId: string | null // Links to WeekTemplate
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🌐 API Endpoints
|
||||
|
||||
### GET /admin/week-template
|
||||
Returns all templates (ordered by dayOfWeek ASC, startTime ASC)
|
||||
```json
|
||||
[
|
||||
{
|
||||
"id": "uuid1",
|
||||
"dayOfWeek": 1,
|
||||
"startTime": "09:00",
|
||||
"endTime": "10:00",
|
||||
"capacity": 10,
|
||||
"isActive": true,
|
||||
"createdAt": "2026-04-05T00:00:00Z",
|
||||
"updatedAt": "2026-04-05T00:00:00Z"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
### PUT /admin/week-template
|
||||
Replace all templates (atomic transaction)
|
||||
```json
|
||||
{
|
||||
"templates": [
|
||||
{ "dayOfWeek": 1, "startTime": "09:00", "endTime": "10:00", "capacity": 10, "isActive": true },
|
||||
{ "dayOfWeek": 1, "startTime": "18:00", "endTime": "19:00", "capacity": 8, "isActive": true },
|
||||
{ "dayOfWeek": 3, "startTime": "10:00", "endTime": "11:00", "capacity": 12, "isActive": false }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### POST /admin/time-slot/manual
|
||||
Create a one-off slot
|
||||
```json
|
||||
{
|
||||
"date": "2026-04-15",
|
||||
"startTime": "14:00",
|
||||
"endTime": "15:00",
|
||||
"capacity": 10
|
||||
}
|
||||
```
|
||||
|
||||
### PUT /admin/time-slot/:id/close
|
||||
Close a slot (changes status to CLOSED)
|
||||
|
||||
### POST /admin/generate-slots
|
||||
Generate slots for next 14 days from active templates
|
||||
Response: `{ "count": 28 }`
|
||||
|
||||
---
|
||||
|
||||
## 🎨 UI State Management
|
||||
|
||||
### week-template.vue Local State
|
||||
```typescript
|
||||
// Main data
|
||||
templates: LocalTemplate[] // All templates
|
||||
grouped: Computed<Record<number, LocalTemplate[]>> // By dayOfWeek
|
||||
|
||||
// UI states
|
||||
loading: boolean // Initial fetch
|
||||
saving: boolean // Save in progress
|
||||
isDirty: boolean // Show save bar?
|
||||
showModal: boolean // Show add/edit modal?
|
||||
editTarget: LocalTemplate | null // Editing which template?
|
||||
|
||||
// Modal form
|
||||
form: {
|
||||
dayIdx: number // 0-6 (picker index)
|
||||
startTime: string // "09:00"
|
||||
endTime: string // "10:00"
|
||||
capacityStr: string // User input as string
|
||||
}
|
||||
```
|
||||
|
||||
### Key Computed
|
||||
```typescript
|
||||
const grouped = computed(() => {
|
||||
// Groups templates by dayOfWeek for rendering
|
||||
// Sorts by day number ascending (1-7)
|
||||
// Returns: { 1: [...], 3: [...], 5: [...], ... }
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Permissions & Auth
|
||||
|
||||
All `/admin/*` endpoints require:
|
||||
1. Valid JWT token in `Authorization: Bearer <token>` header
|
||||
2. User role must be `UserRole.ADMIN`
|
||||
3. Guards: `@UseGuards(JwtAuthGuard, RolesGuard)`
|
||||
|
||||
---
|
||||
|
||||
## 🧮 Important Constants
|
||||
|
||||
From `packages/shared/src/constants.ts`:
|
||||
```typescript
|
||||
SLOT_GENERATION_DAYS = 14 // Generate 14 days ahead
|
||||
DEFAULT_SLOT_CAPACITY = 1 // Private lesson default
|
||||
DEFAULT_CANCEL_HOURS_LIMIT = 2 // Cancel up to 2 hours before
|
||||
WEEKDAY_LABELS = [
|
||||
'', // index 0 (unused)
|
||||
'周一', // index 1 → dayOfWeek 1 (Monday)
|
||||
'周二', // index 2 → dayOfWeek 2
|
||||
'周三', // ... etc
|
||||
'周四',
|
||||
'周五',
|
||||
'周六',
|
||||
'周日' // index 7 → dayOfWeek 7 (Sunday)
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🐛 Common Gotchas
|
||||
|
||||
### 1. dayOfWeek vs JS getDay()
|
||||
- **Frontend uses**: ISO weekday (1=Mon, 7=Sun)
|
||||
- **JS Date.getDay()**: 0=Sun, 6=Sat
|
||||
- **Backend converts**: `toIsoWeekday()` in slot-generator.service.ts
|
||||
|
||||
### 2. Template Replace (Not Merge)
|
||||
- `PUT /admin/week-template` **deletes all** and creates new
|
||||
- NOT a merge/patch operation
|
||||
- Frontend must send complete array
|
||||
|
||||
### 3. isDirty Flag
|
||||
- Tracks **any** change locally (add/edit/delete/toggle)
|
||||
- Used to show/hide save bar
|
||||
- Cleared after successful save
|
||||
|
||||
### 4. Timezone
|
||||
- All dates stored as UTC midnight: `setUTCHours(0,0,0,0)`
|
||||
- Frontend displays as local YYYY-MM-DD strings
|
||||
- May cause off-by-one on day boundaries
|
||||
|
||||
### 5. Slot Generation
|
||||
- Uses `skipDuplicates: true` in Prisma
|
||||
- Safe to re-run without creating duplicates
|
||||
- Assumes `date + startTime + endTime` is unique
|
||||
|
||||
---
|
||||
|
||||
## 💡 Usage Example: Add a Monday 9AM Class
|
||||
|
||||
**Frontend (week-template.vue)**:
|
||||
```typescript
|
||||
// User clicks "+ 新增时段"
|
||||
openAdd()
|
||||
form.value = { dayIdx: 0, startTime: '09:00', endTime: '10:00', capacityStr: '10' }
|
||||
showModal.value = true
|
||||
|
||||
// User confirms in modal
|
||||
submitForm()
|
||||
templates.value.push({
|
||||
_key: String(Date.now()),
|
||||
dayOfWeek: 1, // dayOptions[0].value = Monday
|
||||
startTime: '09:00',
|
||||
endTime: '10:00',
|
||||
capacity: 10,
|
||||
isActive: true
|
||||
})
|
||||
isDirty.value = true // ← Save bar appears
|
||||
|
||||
// User taps "保存全部更改"
|
||||
handleSave()
|
||||
payload = templates.value.map(t => ({...}))
|
||||
await adminStore.saveWeekTemplates(payload)
|
||||
|
||||
// Backend creates transaction:
|
||||
// DELETE FROM week_template
|
||||
// INSERT INTO week_template (day_of_week, start_time, end_time, capacity, is_active)
|
||||
// VALUES (1, '09:00', '10:00', 10, true)
|
||||
// ... (all other templates)
|
||||
|
||||
// Frontend refetches and displays
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔗 Related Components
|
||||
|
||||
- **Admin Members** (`pages/admin/members.vue`): Shows member list
|
||||
- **Admin Orders** (`pages/admin/orders.vue`): Shows order history
|
||||
- **Admin Card Types** (`pages/admin/card-types.vue`): Manage membership cards
|
||||
- **Admin Studio** (`pages/admin/studio.vue`): Studio info settings
|
||||
|
||||
---
|
||||
|
||||
## 📈 Scalability Notes
|
||||
|
||||
### Current Approach
|
||||
- Templates: Small dataset (typically < 50 records)
|
||||
- Slots: Generated in batches (14 days at a time)
|
||||
- Uses `skipDuplicates` to handle reruns safely
|
||||
|
||||
### Bottlenecks
|
||||
- Template replacement deletes ALL and creates NEW (atomic but slow with 1000s)
|
||||
- Slot generation is serial (could be parallelized)
|
||||
- No pagination for templates (assumes all fit in memory)
|
||||
|
||||
### Future Improvements
|
||||
- Batch template updates (don't replace all)
|
||||
- Pagination if templates > 100
|
||||
- Incremental slot generation (detect last generated date)
|
||||
|
||||
606
docs/TIME_SLOT_DIAGRAMS.md
Normal file
606
docs/TIME_SLOT_DIAGRAMS.md
Normal file
@@ -0,0 +1,606 @@
|
||||
# Time-Slot & Scheduling System - Architecture Diagrams
|
||||
|
||||
## 1. Data Model Relationships
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ WEEK TEMPLATE │
|
||||
│ │
|
||||
│ dayOfWeek (1-7, ISO standard) │
|
||||
│ startTime, endTime (e.g., "09:00", "10:00") │
|
||||
│ capacity (default 1) │
|
||||
│ isActive (can disable template) │
|
||||
│ │
|
||||
│ ↓ (auto-generates) │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ TIME SLOT │
|
||||
│ │
|
||||
│ date (calendar date, midnight UTC) │
|
||||
│ startTime, endTime (from template) │
|
||||
│ capacity (from template) │
|
||||
│ bookedCount (# of current bookings) │
|
||||
│ status (OPEN | FULL | CLOSED) │
|
||||
│ source (TEMPLATE | MANUAL) │
|
||||
│ templateId (reference to WeekTemplate) │
|
||||
│ │
|
||||
│ ↓ (has many) ↓ (belongs to) │
|
||||
│ └─────────────────────┘ │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
↑ ↑
|
||||
│ │
|
||||
└────────────┬─────────────────────────
|
||||
│
|
||||
│ 1:1 booking
|
||||
│
|
||||
↓
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ BOOKING │
|
||||
│ │
|
||||
│ userId (FK to User) │
|
||||
│ timeSlotId (FK to TimeSlot) │
|
||||
│ membershipId (FK to Membership) │
|
||||
│ status (CONFIRMED | CANCELLED | COMPLETED | NO_SHOW) │
|
||||
│ cancelledAt (timestamp when cancelled) │
|
||||
│ │
|
||||
│ Constraints: │
|
||||
│ - Unique [userId, timeSlotId] (one booking per user per slot) │
|
||||
│ - ONE booking per TimeSlot per user │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
↑ ↑
|
||||
│ │
|
||||
└─────────────┬───────────┘
|
||||
│
|
||||
belongs to
|
||||
│
|
||||
↓
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ MEMBERSHIP │
|
||||
│ │
|
||||
│ userId (FK to User) │
|
||||
│ cardTypeId (FK to CardType) │
|
||||
│ remainingTimes (for TIMES/TRIAL card types) │
|
||||
│ expireDate (for DURATION card types) │
|
||||
│ status (ACTIVE | EXPIRED | USED_UP) │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 2. Daily Scheduler Timeline
|
||||
|
||||
```
|
||||
00:00 ─────────────────────────────────────────────────
|
||||
│
|
||||
├─ [Midnight] - Time passes
|
||||
│
|
||||
├─ System running in background
|
||||
│
|
||||
├─ ... (various other operations)
|
||||
│
|
||||
02:00 ─────────────────────────────────────────────────
|
||||
│
|
||||
├─► 🟢 SLOT GENERATION
|
||||
│ SlotGeneratorService.generateSlots(14)
|
||||
│
|
||||
│ ├─ Query WeekTemplate (all isActive=true)
|
||||
│ ├─ For each day in [tomorrow, tomorrow+14):
|
||||
│ │ ├─ Get ISO weekday
|
||||
│ │ ├─ Find matching templates
|
||||
│ │ └─ Create TimeSlot entries
|
||||
│ ├─ Batch insert with skipDuplicates: true
|
||||
│ └─ Log: "Generated X new time slots"
|
||||
│
|
||||
02:30 ─────────────────────────────────────────────────
|
||||
│
|
||||
├─► 🟡 SLOT CLEANUP
|
||||
│ SlotGeneratorService.cleanupExpiredSlots()
|
||||
│
|
||||
│ ├─ Find all OPEN slots with date < TODAY
|
||||
│ ├─ Mark as CLOSED
|
||||
│ └─ Log: "Closed X expired time slots"
|
||||
│
|
||||
03:00 ─────────────────────────────────────────────────
|
||||
│
|
||||
├─► 🟠 MEMBERSHIP CHECK
|
||||
│ SlotGeneratorService.checkExpiredMemberships()
|
||||
│
|
||||
│ ├─ Update ACTIVE memberships with expireDate < NOW
|
||||
│ │ └─ Set status = EXPIRED
|
||||
│ ├─ Update ACTIVE memberships with remainingTimes = 0
|
||||
│ │ └─ Set status = USED_UP
|
||||
│ └─ Log: "Expired X by date, Y by sessions"
|
||||
│
|
||||
├─ ... (users awake, making bookings)
|
||||
│
|
||||
22:00 ─────────────────────────────────────────────────
|
||||
│
|
||||
├─► 🔴 BOOKING COMPLETION
|
||||
│ SlotGeneratorService.completeBookings()
|
||||
│
|
||||
│ ├─ Find CONFIRMED bookings with timeSlot.date < TODAY
|
||||
│ ├─ Mark as COMPLETED
|
||||
│ └─ Log: "Completed X past bookings"
|
||||
│
|
||||
└─ (Day ends, repeat tomorrow)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Booking Lifecycle
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────┐
|
||||
│ BOOKING CREATION │
|
||||
│ (POST /booking) │
|
||||
└─────────────────────────────────────────────────────────┘
|
||||
│
|
||||
├─ Input: { timeSlotId, membershipId }
|
||||
│
|
||||
├─ TRANSACTION START ──────────────────
|
||||
│ │
|
||||
│ ├─► Fetch TimeSlot
|
||||
│ │ └─ Check: status = OPEN? ✓
|
||||
│ │
|
||||
│ ├─► Check Duplicate
|
||||
│ │ └─ Query: SELECT * FROM bookings WHERE userId=? AND timeSlotId=?
|
||||
│ │ └─ Must not exist
|
||||
│ │
|
||||
│ ├─► Fetch Membership
|
||||
│ │ └─ Check: belongs to user? ✓
|
||||
│ │ └─ Check: status = ACTIVE? ✓
|
||||
│ │ └─ Check: has capacity?
|
||||
│ │ └─ IF TIMES/TRIAL: remainingTimes > 0? ✓
|
||||
│ │ └─ IF DURATION: expireDate > NOW? ✓
|
||||
│ │
|
||||
│ ├─► CREATE Booking(CONFIRMED)
|
||||
│ │ └─ INSERT: { userId, timeSlotId, membershipId, status: CONFIRMED }
|
||||
│ │
|
||||
│ ├─► UPDATE TimeSlot
|
||||
│ │ ├─ bookedCount = bookedCount + 1
|
||||
│ │ ├─ IF bookedCount >= capacity:
|
||||
│ │ │ └─ status = FULL
|
||||
│ │ └─ ELSE:
|
||||
│ │ └─ status = OPEN (unchanged)
|
||||
│ │
|
||||
│ ├─► UPDATE Membership (if TIMES/TRIAL)
|
||||
│ │ ├─ remainingTimes = remainingTimes - 1
|
||||
│ │ ├─ IF remainingTimes <= 0:
|
||||
│ │ │ └─ status = USED_UP
|
||||
│ │ └─ ELSE:
|
||||
│ │ └─ status = ACTIVE (unchanged)
|
||||
│ │
|
||||
│ └─ TRANSACTION COMMIT ──────────────
|
||||
│
|
||||
└─► Return: BookingWithRelations (includes timeSlot, membership)
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────┐
|
||||
│ BOOKING CANCELLATION │
|
||||
│ (PUT /booking/:id/cancel) │
|
||||
└─────────────────────────────────────────────────────────┘
|
||||
│
|
||||
├─ Fetch Booking + TimeSlot + Membership
|
||||
│
|
||||
├─ Check: booking.status = CONFIRMED? ✓
|
||||
│
|
||||
├─ Calculate Refund Eligibility
|
||||
│ │
|
||||
│ ├─ cancelHoursLimit = StudioConfig.cancelHoursLimit (default 2)
|
||||
│ ├─ slotStartMs = Date(timeSlot.date) + timeSlot.startTime
|
||||
│ ├─ deadlineMs = NOW + (cancelHoursLimit * 3600 * 1000)
|
||||
│ │
|
||||
│ ├─ IF slotStartMs >= deadlineMs:
|
||||
│ │ └─ withinLimit = TRUE ✓ (User gets refund)
|
||||
│ └─ ELSE:
|
||||
│ └─ withinLimit = FALSE (No refund)
|
||||
│
|
||||
├─ TRANSACTION START ──────────────────
|
||||
│ │
|
||||
│ ├─► UPDATE Booking
|
||||
│ │ ├─ status = CANCELLED
|
||||
│ │ └─ cancelledAt = NOW
|
||||
│ │
|
||||
│ ├─► UPDATE TimeSlot
|
||||
│ │ ├─ bookedCount = MAX(0, bookedCount - 1)
|
||||
│ │ ├─ IF slot was FULL:
|
||||
│ │ │ └─ status = OPEN
|
||||
│ │ └─ ELSE:
|
||||
│ │ └─ status = (unchanged)
|
||||
│ │
|
||||
│ ├─► IF withinLimit = TRUE:
|
||||
│ │ └─ UPDATE Membership (if TIMES/TRIAL)
|
||||
│ │ ├─ remainingTimes = remainingTimes + 1
|
||||
│ │ ├─ IF was USED_UP:
|
||||
│ │ │ └─ status = ACTIVE
|
||||
│ │ └─ ELSE:
|
||||
│ │ └─ status = (unchanged)
|
||||
│ │
|
||||
│ └─ TRANSACTION COMMIT ──────────────
|
||||
│
|
||||
└─► Return: { booking, refunded: boolean }
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. Slot Generation from Template
|
||||
|
||||
```
|
||||
Template Setup:
|
||||
┌─────────────────────────────────────────────────────┐
|
||||
│ PUT /admin/week-template │
|
||||
│ │
|
||||
│ { │
|
||||
│ "templates": [ │
|
||||
│ { │
|
||||
│ "dayOfWeek": 1, // Monday (ISO standard)│
|
||||
│ "startTime": "09:00", │
|
||||
│ "endTime": "10:00", │
|
||||
│ "capacity": 1, // Private lesson │
|
||||
│ "isActive": true │
|
||||
│ }, │
|
||||
│ { │
|
||||
│ "dayOfWeek": 5, // Friday (ISO standard)│
|
||||
│ "startTime": "18:00", │
|
||||
│ "endTime": "19:00", │
|
||||
│ "capacity": 1, │
|
||||
│ "isActive": true │
|
||||
│ } │
|
||||
│ ] │
|
||||
│ } │
|
||||
└─────────────────────────────────────────────────────┘
|
||||
↓
|
||||
Stored in database as WeekTemplates
|
||||
↓
|
||||
Each day at 02:00 UTC, generateSlots(14) runs:
|
||||
|
||||
|
||||
Today: Monday, April 7, 2026
|
||||
│
|
||||
├─ Tomorrow = Tuesday, April 8
|
||||
│
|
||||
├─ For next 14 days:
|
||||
│
|
||||
│ Day 0: Tue (ISO 2) → no matching template → skip
|
||||
│ Day 1: Wed (ISO 3) → no matching template → skip
|
||||
│ Day 2: Thu (ISO 4) → no matching template → skip
|
||||
│ Day 3: Fri (ISO 5) → MATCH! template (18:00-19:00)
|
||||
│ └─ CREATE TimeSlot(date=Apr12, time=18:00-19:00, capacity=1)
|
||||
│
|
||||
│ Day 4: Sat (ISO 6) → no matching template → skip
|
||||
│ Day 5: Sun (ISO 7) → no matching template → skip
|
||||
│ Day 6: Mon (ISO 1) → MATCH! template (09:00-10:00)
|
||||
│ └─ CREATE TimeSlot(date=Apr14, time=09:00-10:00, capacity=1)
|
||||
│
|
||||
│ Day 7: Tue (ISO 2) → no matching template → skip
|
||||
│ ... (repeats pattern)
|
||||
│
|
||||
└─ All created with:
|
||||
├─ status = OPEN
|
||||
├─ bookedCount = 0
|
||||
├─ source = TEMPLATE
|
||||
├─ templateId = (reference to template)
|
||||
└─ skipDuplicates = true (safe to re-run)
|
||||
|
||||
|
||||
Result:
|
||||
14 Friday 18:00-19:00 slots generated
|
||||
14 Monday 09:00-10:00 slots generated
|
||||
Total: 28 new slots
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. User Booking Flow (Frontend → Backend)
|
||||
|
||||
```
|
||||
┌──────────────────────────────────────────────────────┐
|
||||
│ MEMBER CLIENT │
|
||||
└──────────────────────────────────────────────────────┘
|
||||
│
|
||||
│ 1. Click "View Available Slots"
|
||||
│
|
||||
├─► GET /time-slot/available?date=2026-04-10
|
||||
│
|
||||
│ Response: [{
|
||||
│ id: "slot-123",
|
||||
│ date: "2026-04-10",
|
||||
│ startTime: "09:00",
|
||||
│ endTime: "10:00",
|
||||
│ status: "OPEN",
|
||||
│ bookedCount: 0,
|
||||
│ capacity: 1,
|
||||
│ isBookedByMe: false, ← User's booking status
|
||||
│ myBookingId: null
|
||||
│ }, ...]
|
||||
│
|
||||
├─ Display available slots in UI
|
||||
│
|
||||
│ 2. User selects slot and membership
|
||||
│
|
||||
├─► POST /booking
|
||||
│ Body: {
|
||||
│ "timeSlotId": "slot-123",
|
||||
│ "membershipId": "mem-456"
|
||||
│ }
|
||||
│
|
||||
│ Response: {
|
||||
│ id: "booking-789",
|
||||
│ userId: "user-001",
|
||||
│ timeSlotId: "slot-123",
|
||||
│ status: "CONFIRMED",
|
||||
│ createdAt: "2026-04-05T10:30:00Z",
|
||||
│ timeSlot: { ... }, ← Full slot details
|
||||
│ membership: { ... } ← Full membership details
|
||||
│ }
|
||||
│
|
||||
├─ Display confirmation
|
||||
│
|
||||
│ 3. [Later] User cancels booking
|
||||
│
|
||||
└─► PUT /booking/booking-789/cancel
|
||||
|
||||
Response: {
|
||||
booking: { ... },
|
||||
refunded: true ← Was refund issued?
|
||||
}
|
||||
|
||||
Display: "Booking cancelled. You've been refunded."
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. State Transitions
|
||||
|
||||
### TimeSlot Status
|
||||
|
||||
```
|
||||
┌─────────────────────────────────┐
|
||||
│ AUTO-GENERATED │
|
||||
│ by generateSlots() │
|
||||
└─────────────┬───────────────────┘
|
||||
│
|
||||
↓
|
||||
┌─────────────────┐
|
||||
│ OPEN │ ← Can accept bookings
|
||||
│ (bookedCount < │ bookedCount starts at 0
|
||||
│ capacity) │
|
||||
└────────┬────────┘
|
||||
│
|
||||
┌──────────┼──────────┐
|
||||
│ │ │
|
||||
│ │ │
|
||||
[booking │ [cleanup
|
||||
creates] │ or manual
|
||||
│ close]
|
||||
│ │ │
|
||||
↓ ↓ ↓
|
||||
FULL CLOSED
|
||||
(bookedCount >= capacity)
|
||||
│
|
||||
│ [booking cancelled]
|
||||
↓
|
||||
OPEN (back to)
|
||||
|
||||
|
||||
Once slot date passes:
|
||||
├─ OPEN → CLOSED (by cleanup job at 02:30 UTC)
|
||||
├─ FULL → CLOSED (when cleanup runs)
|
||||
└─ CANCELLED bookings don't affect slot status
|
||||
```
|
||||
|
||||
### Booking Status
|
||||
|
||||
```
|
||||
┌──────────────────┐
|
||||
│ CONFIRMED │ ← Default when created
|
||||
│ │ User has active reservation
|
||||
└────────┬─────────┘
|
||||
│
|
||||
┌─────┼─────┐
|
||||
│ │ │
|
||||
[user │ [auto-mark
|
||||
cancels] │ when date
|
||||
│ │ passes]
|
||||
│ │ │
|
||||
↓ ↓ ↓
|
||||
CANCELLED COMPLETED
|
||||
(free (slot time
|
||||
cancellation has passed)
|
||||
until deadline)
|
||||
|
||||
|
||||
CANCELLED bookings stay in history
|
||||
COMPLETED bookings show in past bookings
|
||||
CONFIRMED bookings show in upcoming bookings
|
||||
```
|
||||
|
||||
### Membership Status
|
||||
|
||||
```
|
||||
┌─────────────────┐
|
||||
│ ACTIVE │ ← Can book classes
|
||||
│ │ Has remaining capacity
|
||||
└────────┬────────┘
|
||||
│
|
||||
┌─────┼─────┐
|
||||
│ │ │
|
||||
[booking │ [auto-check
|
||||
depletes │ by scheduler
|
||||
sessions] │ at 03:00 UTC]
|
||||
│ │ │
|
||||
↓ ↓ ↓
|
||||
USED_UP EXPIRED
|
||||
(for (for
|
||||
TIMES) DURATION)
|
||||
|
||||
|
||||
USED_UP: remainingTimes = 0 (for TIMES/TRIAL only)
|
||||
EXPIRED: expireDate < NOW (for DURATION) OR date-based expiry
|
||||
|
||||
All non-ACTIVE statuses prevent new bookings
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. Timezone & Date Handling
|
||||
|
||||
```
|
||||
User Timezone: Local (browser/app)
|
||||
API Timezone: UTC (backend)
|
||||
Database: UTC
|
||||
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ User in Shanghai (UTC+8) │
|
||||
│ Local time: 2026-04-10 15:00:00 CST │
|
||||
│ UTC time: 2026-04-10 07:00:00 UTC │
|
||||
└──────────────────────────────────────────────┘
|
||||
│
|
||||
├─ Query: GET /time-slot/available?date=2026-04-10
|
||||
│ (User sends local date, frontend converts to ISO)
|
||||
│
|
||||
├─ Backend receives:
|
||||
│ ├─ Parse "2026-04-10"
|
||||
│ ├─ Build start of day: 2026-04-10T00:00:00 UTC
|
||||
│ ├─ Build end of day: 2026-04-10T23:59:59.999 UTC
|
||||
│ ├─ Query TimeSlots WHERE date BETWEEN [00:00, 23:59]
|
||||
│
|
||||
└─ Return slots for that calendar day in UTC
|
||||
|
||||
|
||||
┌──────────────────────────────────────────────┐
|
||||
│ TimeSlot Storage (Database) │
|
||||
│ │
|
||||
│ date: 2026-04-10 (DATE type, midnight UTC) │
|
||||
│ startTime: "09:00" (string, no timezone) │
|
||||
│ endTime: "10:00" (string, no timezone) │
|
||||
│ │
|
||||
│ When combined: │
|
||||
│ Slot datetime = 2026-04-10T09:00:00 UTC │
|
||||
└──────────────────────────────────────────────┘
|
||||
│
|
||||
├─ For Shanghai user (UTC+8):
|
||||
│ └─ 09:00 UTC = 17:00 CST (5 PM)
|
||||
│
|
||||
└─ For New York user (UTC-4):
|
||||
└─ 09:00 UTC = 05:00 EDT (5 AM)
|
||||
|
||||
|
||||
Scheduler (UTC times):
|
||||
┌─────────────────────────────────────────────┐
|
||||
│ 02:00 UTC = Generate slots │
|
||||
│ 02:30 UTC = Cleanup │
|
||||
│ 03:00 UTC = Check memberships │
|
||||
│ 22:00 UTC = Complete bookings │
|
||||
│ │
|
||||
│ When scheduler checks "is date < today?": │
|
||||
│ ├─ Create midnight UTC boundary │
|
||||
│ ├─ Compare slot.date < today's midnight │
|
||||
│ └─ Mark as CLOSED/COMPLETED if older │
|
||||
└─────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 8. Error Handling Tree
|
||||
|
||||
```
|
||||
POST /booking
|
||||
│
|
||||
├─ TimeSlot not found
|
||||
│ └─ Return: NotFoundException
|
||||
│
|
||||
├─ TimeSlot.status ≠ OPEN
|
||||
│ └─ Return: BadRequestException("TimeSlot is not available")
|
||||
│
|
||||
├─ Duplicate booking exists
|
||||
│ └─ Return: ConflictException("Already booked this slot")
|
||||
│
|
||||
├─ Membership not found
|
||||
│ └─ Return: NotFoundException
|
||||
│
|
||||
├─ Membership.userId ≠ current user
|
||||
│ └─ Return: ForbiddenException("Not your membership")
|
||||
│
|
||||
├─ Membership.status ≠ ACTIVE
|
||||
│ └─ Return: BadRequestException("Membership inactive")
|
||||
│
|
||||
├─ Card type is TIMES/TRIAL:
|
||||
│ │
|
||||
│ └─ remainingTimes ≤ 0
|
||||
│ └─ Return: BadRequestException("No remaining times")
|
||||
│
|
||||
└─ Card type is DURATION:
|
||||
│
|
||||
└─ expireDate < NOW
|
||||
└─ Return: BadRequestException("Membership expired")
|
||||
|
||||
|
||||
PUT /booking/:id/cancel
|
||||
│
|
||||
├─ Booking not found
|
||||
│ └─ Return: NotFoundException
|
||||
│
|
||||
├─ Booking.userId ≠ current user
|
||||
│ └─ Return: ForbiddenException("Not your booking")
|
||||
│
|
||||
├─ Booking.status ≠ CONFIRMED
|
||||
│ └─ Return: BadRequestException("Can't cancel this status")
|
||||
│
|
||||
└─ ✓ Cancel successful
|
||||
├─ Check refund eligibility
|
||||
├─ Update booking status
|
||||
├─ Update timeSlot bookedCount
|
||||
└─ Conditionally refund membership
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 9. Integration Points
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────┐
|
||||
│ APP MODULE │
|
||||
│ (packages/server/src/app.module.ts) │
|
||||
└─────────────────────────────────────────────────────┘
|
||||
│
|
||||
├─ imports: [
|
||||
│ AuthModule,
|
||||
│ TimeSlotModule, ← Time-Slot logic
|
||||
│ SchedulerModule, ← Auto jobs (cron)
|
||||
│ BookingModule, ← Booking logic
|
||||
│ MembershipModule, ← Membership checks
|
||||
│ StudioModule, ← Config (cancelHoursLimit)
|
||||
│ ...
|
||||
│ ]
|
||||
│
|
||||
└─ Controllers route to:
|
||||
│
|
||||
├─ TimeSlotController (public slots viewing)
|
||||
├─ AdminTimeSlotController (templates, admin actions)
|
||||
├─ BookingController (create, cancel bookings)
|
||||
└─ ... (other endpoints)
|
||||
|
||||
|
||||
SchedulerModule dependencies:
|
||||
├─ ScheduleModule.forRoot() ← Enable @Cron decorators
|
||||
└─ TimeSlotModule ← Access to SlotGeneratorService
|
||||
|
||||
|
||||
BookingModule dependencies:
|
||||
├─ MembershipModule ← Check membership status
|
||||
└─ StudioModule ← Read cancelHoursLimit config
|
||||
|
||||
|
||||
Services call chain:
|
||||
├─ Controller
|
||||
│ ├─ TimeSlotService
|
||||
│ │ └─ PrismaService
|
||||
│ └─ BookingService
|
||||
│ ├─ PrismaService
|
||||
│ ├─ MembershipService
|
||||
│ └─ StudioService
|
||||
```
|
||||
|
||||
364
docs/TIME_SLOT_INDEX.md
Normal file
364
docs/TIME_SLOT_INDEX.md
Normal file
@@ -0,0 +1,364 @@
|
||||
# Time-Slot & Scheduling System - Documentation Index
|
||||
|
||||
This directory contains comprehensive documentation of the NestJS backend time-slot and scheduling system for the pilates studio booking platform.
|
||||
|
||||
## 📚 Documentation Files
|
||||
|
||||
### 1. **TIME_SLOT_SCHEDULING_SYSTEM.md** (966 lines, 24KB)
|
||||
**Most comprehensive reference** - Full system analysis with all details
|
||||
|
||||
**Contents:**
|
||||
- Executive Summary
|
||||
- Data Models (WeekTemplate, TimeSlot, Booking) with Prisma schema
|
||||
- SlotGeneratorService (4 key methods: generateSlots, cleanupExpiredSlots, checkExpiredMemberships, completeBookings)
|
||||
- TimeSlotService (queries and management)
|
||||
- TimeSlotController & AdminTimeSlotController (all endpoints)
|
||||
- SchedulerService (4 daily cron jobs at 02:00, 02:30, 03:00, 22:00 UTC)
|
||||
- BookingService (integration with time slots)
|
||||
- Data Flow Diagrams
|
||||
- DTOs & Request/Response examples
|
||||
- Shared Constants & Enums
|
||||
- File Structure Summary
|
||||
- Key Architectural Patterns
|
||||
- Example Scenarios
|
||||
- Testing Guide
|
||||
- Configuration & Environment
|
||||
- Performance Considerations
|
||||
- Security Notes
|
||||
- Future Enhancement Ideas
|
||||
|
||||
**When to use:** Deep dive into how the system works, understanding all components
|
||||
|
||||
---
|
||||
|
||||
### 2. **TIME_SLOT_QUICK_REFERENCE.md** (355 lines, 9KB)
|
||||
**Quick lookup guide** - Essential information at a glance
|
||||
|
||||
**Contents:**
|
||||
- File Locations (all key files in one table)
|
||||
- Key Concepts (WeekTemplate, TimeSlot, Booking)
|
||||
- Daily Scheduler Jobs (quick table with times and purposes)
|
||||
- Important Methods (TypeScript signatures for all key methods)
|
||||
- API Endpoints (member and admin endpoints with request/response)
|
||||
- Status Values (all enum values explained)
|
||||
- Key Logic (booking creation & cancellation flows in pseudocode)
|
||||
- Weekday Mapping (ISO standard vs JavaScript)
|
||||
- Database Constraints
|
||||
- Configuration
|
||||
- Common Errors (troubleshooting table)
|
||||
- Testing
|
||||
- Development Workflow
|
||||
- Architecture Highlights
|
||||
|
||||
**When to use:** Quick lookup while coding, API reference, debugging errors
|
||||
|
||||
---
|
||||
|
||||
### 3. **TIME_SLOT_DIAGRAMS.md** (606 lines, 25KB)
|
||||
**Visual references** - ASCII diagrams and flowcharts
|
||||
|
||||
**Contents:**
|
||||
1. Data Model Relationships (entity diagram)
|
||||
2. Daily Scheduler Timeline (24-hour cron schedule visualization)
|
||||
3. Booking Lifecycle (detailed creation and cancellation flows)
|
||||
4. Slot Generation from Template (step-by-step with example)
|
||||
5. User Booking Flow (frontend → backend interaction)
|
||||
6. State Transitions (TimeSlot, Booking, Membership status flows)
|
||||
7. Timezone & Date Handling (UTC, local time conversion)
|
||||
8. Error Handling Tree (decision tree for POST /booking and cancellation)
|
||||
9. Integration Points (module dependencies)
|
||||
|
||||
**When to use:** Understanding the big picture, presenting to team, tracing flow execution
|
||||
|
||||
---
|
||||
|
||||
## 🔍 Key Information at a Glance
|
||||
|
||||
### Source Code Locations
|
||||
|
||||
```
|
||||
Backend Time-Slot System:
|
||||
├── packages/server/src/time-slot/
|
||||
│ ├── slot-generator.service.ts (172 lines)
|
||||
│ ├── time-slot.service.ts (142 lines)
|
||||
│ ├── time-slot.controller.ts (93 lines)
|
||||
│ ├── time-slot.module.ts
|
||||
│ └── dto/
|
||||
│ ├── query-slots.dto.ts
|
||||
│ ├── create-manual-slot.dto.ts
|
||||
│ └── week-template.dto.ts
|
||||
│
|
||||
├── packages/server/src/scheduler/
|
||||
│ ├── scheduler.service.ts (55 lines)
|
||||
│ └── scheduler.module.ts
|
||||
│
|
||||
├── packages/server/src/booking/
|
||||
│ ├── booking.service.ts (367 lines)
|
||||
│ ├── booking.controller.ts (82 lines)
|
||||
│ ├── booking.module.ts
|
||||
│ └── dto/
|
||||
│ └── create-booking.dto.ts
|
||||
│
|
||||
├── packages/server/prisma/
|
||||
│ └── schema.prisma (Models: WeekTemplate, TimeSlot, Booking)
|
||||
│
|
||||
└── packages/shared/src/
|
||||
├── constants.ts (Slot generation, capacity defaults)
|
||||
├── enums.ts (TimeSlotStatus, BookingStatus, etc.)
|
||||
└── types/
|
||||
└── time-slot.ts (Type definitions)
|
||||
```
|
||||
|
||||
### Daily Scheduler (UTC)
|
||||
|
||||
| Time | Job | Method |
|
||||
|------|-----|--------|
|
||||
| 02:00 | Generate 14 days of slots | `SlotGeneratorService.generateSlots(14)` |
|
||||
| 02:30 | Close expired OPEN slots | `SlotGeneratorService.cleanupExpiredSlots()` |
|
||||
| 03:00 | Expire memberships | `SlotGeneratorService.checkExpiredMemberships()` |
|
||||
| 22:00 | Complete past bookings | `SlotGeneratorService.completeBookings()` |
|
||||
|
||||
### Important Constants
|
||||
|
||||
```
|
||||
DEFAULT_SLOT_CAPACITY = 1 (private lessons)
|
||||
SLOT_GENERATION_DAYS = 14 (days ahead to auto-generate)
|
||||
DEFAULT_CANCEL_HOURS_LIMIT = 2 (hours before slot to allow refund)
|
||||
```
|
||||
|
||||
### API Endpoints
|
||||
|
||||
**Member:**
|
||||
```
|
||||
GET /time-slot/available?date=YYYY-MM-DD
|
||||
GET /time-slot/:id
|
||||
POST /booking
|
||||
PUT /booking/:id/cancel
|
||||
GET /booking/my
|
||||
GET /booking/my/upcoming
|
||||
```
|
||||
|
||||
**Admin:**
|
||||
```
|
||||
GET /admin/week-template
|
||||
PUT /admin/week-template
|
||||
POST /admin/time-slot/manual
|
||||
PUT /admin/time-slot/:id/close
|
||||
POST /admin/generate-slots
|
||||
GET /admin/bookings
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Common Tasks & Where to Find Info
|
||||
|
||||
| Task | Reference |
|
||||
|------|-----------|
|
||||
| **Understand slot generation algorithm** | TIME_SLOT_SCHEDULING_SYSTEM.md § 2.2 or DIAGRAMS § 4 |
|
||||
| **See all API endpoints** | QUICK_REFERENCE § "API Endpoints" or TIME_SLOT_SCHEDULING_SYSTEM.md § 4 |
|
||||
| **Booking creation logic** | TIME_SLOT_DIAGRAMS.md § 3 or QUICK_REFERENCE § "Key Logic" |
|
||||
| **Weekday mapping (ISO vs JS)** | QUICK_REFERENCE § "Weekday Mapping" or DIAGRAMS § 7 |
|
||||
| **Cancellation refund policy** | TIME_SLOT_SCHEDULING_SYSTEM.md § 6.1 or DIAGRAMS § 3 |
|
||||
| **Scheduler jobs timeline** | QUICK_REFERENCE § "Daily Scheduler Jobs" or DIAGRAMS § 2 |
|
||||
| **Error handling** | QUICK_REFERENCE § "Common Errors" or DIAGRAMS § 8 |
|
||||
| **Data model relationships** | DIAGRAMS § 1 or TIME_SLOT_SCHEDULING_SYSTEM.md § 1 |
|
||||
| **Configuration & setup** | QUICK_REFERENCE § "Configuration" or TIME_SLOT_SCHEDULING_SYSTEM.md § 14 |
|
||||
| **Performance tips** | TIME_SLOT_SCHEDULING_SYSTEM.md § 15 or QUICK_REFERENCE § "Performance Tips" |
|
||||
| **Module dependencies** | DIAGRAMS § 9 or TIME_SLOT_SCHEDULING_SYSTEM.md § 11.2 |
|
||||
| **Testing** | TIME_SLOT_SCHEDULING_SYSTEM.md § 13 or QUICK_REFERENCE § "Testing" |
|
||||
|
||||
---
|
||||
|
||||
## 📋 System Overview
|
||||
|
||||
### What It Does
|
||||
|
||||
This system manages the complete lifecycle of time slots and bookings for a pilates studio:
|
||||
|
||||
1. **Automated Slot Generation**: Every day at 02:00 UTC, generates 14 days of time slots from reusable weekly templates
|
||||
2. **Capacity Management**: Tracks slot capacity and prevents overbooking
|
||||
3. **Booking Management**: Allows members to book slots with their memberships
|
||||
4. **Cancellation & Refunds**: Members can cancel with conditional refunds (within 2-hour window)
|
||||
5. **Membership Expiration**: Automatically expires memberships by date or used sessions
|
||||
6. **Cleanup**: Marks past slots as closed and completed bookings as finished
|
||||
|
||||
### Key Concepts
|
||||
|
||||
- **WeekTemplate**: Defines recurring schedule (e.g., "Monday 09:00-10:00")
|
||||
- **TimeSlot**: Individual class instance (e.g., "April 10, 2026 09:00-10:00")
|
||||
- **Booking**: User's reservation (links user + slot + membership)
|
||||
- **Status Tracking**: OPEN → FULL → CLOSED (slots) and CONFIRMED → COMPLETED (bookings)
|
||||
|
||||
### Architecture Highlights
|
||||
|
||||
✅ **Idempotent** - Safe to re-run slot generation
|
||||
✅ **Transactional** - ACID compliance for bookings
|
||||
✅ **Automated** - 4 daily cron jobs maintain state
|
||||
✅ **Flexible** - Supports TIMES, DURATION, and TRIAL memberships
|
||||
✅ **Scalable** - Batch operations, proper database indexes
|
||||
✅ **Secure** - Role-based access, comprehensive validation
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Getting Started
|
||||
|
||||
### For New Developers
|
||||
|
||||
1. **Start with**: TIME_SLOT_QUICK_REFERENCE.md
|
||||
- Get oriented with file locations and key methods
|
||||
|
||||
2. **Then read**: TIME_SLOT_DIAGRAMS.md § 1 (Data Model)
|
||||
- Understand how entities relate
|
||||
|
||||
3. **Deep dive**: TIME_SLOT_SCHEDULING_SYSTEM.md § 2
|
||||
- Study the SlotGeneratorService algorithm
|
||||
|
||||
4. **Explore the code**: Read actual source files for implementation details
|
||||
|
||||
### For System Integration
|
||||
|
||||
1. Review TIME_SLOT_DIAGRAMS.md § 9 (Integration Points)
|
||||
2. Check the module imports in `app.module.ts`
|
||||
3. Understand dependencies in QUICK_REFERENCE.md § "Configuration"
|
||||
|
||||
### For API Integration
|
||||
|
||||
1. Start with TIME_SLOT_QUICK_REFERENCE.md § "API Endpoints"
|
||||
2. See examples in TIME_SLOT_SCHEDULING_SYSTEM.md § 12
|
||||
3. Check DTOs in TIME_SLOT_SCHEDULING_SYSTEM.md § 8
|
||||
|
||||
### For Debugging
|
||||
|
||||
1. Check common errors in QUICK_REFERENCE.md § "Common Errors"
|
||||
2. Trace error handling in DIAGRAMS.md § 8
|
||||
3. Review actual error handling in source code
|
||||
|
||||
---
|
||||
|
||||
## 📖 Reading Recommendations by Role
|
||||
|
||||
### Backend Developer
|
||||
1. TIME_SLOT_SCHEDULING_SYSTEM.md (all)
|
||||
2. TIME_SLOT_DIAGRAMS.md (all)
|
||||
3. Source code in `packages/server/src/time-slot/`
|
||||
|
||||
### Frontend Developer
|
||||
1. TIME_SLOT_QUICK_REFERENCE.md (API Endpoints section)
|
||||
2. TIME_SLOT_SCHEDULING_SYSTEM.md § 12 (Example Scenarios)
|
||||
3. TIME_SLOT_DIAGRAMS.md § 5 (User Booking Flow)
|
||||
|
||||
### DevOps / Sysadmin
|
||||
1. TIME_SLOT_SCHEDULING_SYSTEM.md § 14 (Configuration)
|
||||
2. TIME_SLOT_QUICK_REFERENCE.md § "Daily Scheduler Jobs"
|
||||
3. TIME_SLOT_DIAGRAMS.md § 2 (Scheduler Timeline)
|
||||
|
||||
### Product Manager
|
||||
1. TIME_SLOT_SCHEDULING_SYSTEM.md § "Executive Summary"
|
||||
2. TIME_SLOT_DIAGRAMS.md § 3 & 5 (Booking flows)
|
||||
3. TIME_SLOT_QUICK_REFERENCE.md § "Architecture Highlights"
|
||||
|
||||
### QA / Tester
|
||||
1. TIME_SLOT_QUICK_REFERENCE.md (all)
|
||||
2. TIME_SLOT_SCHEDULING_SYSTEM.md § 13 (Testing Guide)
|
||||
3. TIME_SLOT_SCHEDULING_SYSTEM.md § 12 (Example Scenarios)
|
||||
|
||||
---
|
||||
|
||||
## 🔗 Related Documentation
|
||||
|
||||
- **Database Schema**: See `packages/server/prisma/schema.prisma` (lines 113-168)
|
||||
- **Shared Types**: See `packages/shared/src/types/` and `enums.ts`
|
||||
- **Authentication**: See booking endpoints require JwtAuthGuard
|
||||
- **Membership System**: See `BookingService` integration with `MembershipService`
|
||||
- **Studio Config**: See `StudioService` for `cancelHoursLimit`
|
||||
|
||||
---
|
||||
|
||||
## 📊 Document Statistics
|
||||
|
||||
| File | Lines | Size | Topics |
|
||||
|------|-------|------|--------|
|
||||
| TIME_SLOT_SCHEDULING_SYSTEM.md | 966 | 24KB | 17 comprehensive sections |
|
||||
| TIME_SLOT_QUICK_REFERENCE.md | 355 | 9KB | 15 quick-lookup sections |
|
||||
| TIME_SLOT_DIAGRAMS.md | 606 | 25KB | 9 visual flowcharts |
|
||||
| **Total** | **1,927** | **58KB** | **Complete system coverage** |
|
||||
|
||||
---
|
||||
|
||||
## 🎓 Learning Path
|
||||
|
||||
```
|
||||
Entry Level
|
||||
├─ README.md (this file)
|
||||
├─ TIME_SLOT_QUICK_REFERENCE.md (20 min read)
|
||||
└─ TIME_SLOT_DIAGRAMS.md § 1 (5 min)
|
||||
|
||||
Intermediate
|
||||
├─ TIME_SLOT_DIAGRAMS.md (all, 15 min)
|
||||
├─ TIME_SLOT_QUICK_REFERENCE.md (re-read, 15 min)
|
||||
└─ TIME_SLOT_SCHEDULING_SYSTEM.md § 1-6 (30 min)
|
||||
|
||||
Advanced
|
||||
├─ TIME_SLOT_SCHEDULING_SYSTEM.md (full, 60 min)
|
||||
├─ Source code reading (packages/server/src/time-slot/)
|
||||
└─ Prisma schema study
|
||||
|
||||
Expert
|
||||
└─ Code review + contributions
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🤝 Contributing
|
||||
|
||||
When adding features or making changes:
|
||||
|
||||
1. **Update the code** in `packages/server/src/time-slot/` and related modules
|
||||
2. **Update tests** in `__tests__/` directories
|
||||
3. **Update documentation** in this docs folder if behavior changes
|
||||
4. Use the **Quick Reference** as checklist for all affected pieces
|
||||
|
||||
---
|
||||
|
||||
## ❓ FAQ
|
||||
|
||||
**Q: Where do time slots come from?**
|
||||
A: Auto-generated from WeekTemplates every day at 02:00 UTC by `generateSlots(14)`.
|
||||
|
||||
**Q: Can I disable slot generation?**
|
||||
A: Yes, make templates `isActive: false` or disable the cron job in `scheduler.service.ts`.
|
||||
|
||||
**Q: How is capacity managed?**
|
||||
A: `bookedCount` increments on booking, slot status becomes FULL when `bookedCount >= capacity`.
|
||||
|
||||
**Q: What if I cancel a booking?**
|
||||
A: `bookedCount` decrements; if within 2-hour window, membership refunded; slot status restored if was FULL.
|
||||
|
||||
**Q: Timezone support?**
|
||||
A: All times stored in UTC. Scheduler uses UTC times (02:00, 02:30, etc.). See DIAGRAMS § 7.
|
||||
|
||||
**Q: How are memberships expired?**
|
||||
A: Automatically by scheduler job at 03:00 UTC daily; marks EXPIRED if date passed or USED_UP if sessions depleted.
|
||||
|
||||
---
|
||||
|
||||
## 📞 Quick Reference Card
|
||||
|
||||
### Status Values
|
||||
- **TimeSlot**: OPEN | FULL | CLOSED
|
||||
- **Booking**: CONFIRMED | CANCELLED | COMPLETED | NO_SHOW
|
||||
- **Membership**: ACTIVE | EXPIRED | USED_UP
|
||||
|
||||
### Key Dates & Times
|
||||
- **Slot generation**: Daily 02:00 UTC (14 days ahead)
|
||||
- **Cleanup**: Daily 02:30 UTC
|
||||
- **Membership check**: Daily 03:00 UTC
|
||||
- **Booking completion**: Daily 22:00 UTC
|
||||
- **Cancellation window**: 2 hours before slot (configurable)
|
||||
|
||||
### Key Files
|
||||
- **Slot generation**: `slot-generator.service.ts`
|
||||
- **Slot queries**: `time-slot.service.ts`
|
||||
- **Booking logic**: `booking.service.ts`
|
||||
- **Database**: `prisma/schema.prisma`
|
||||
|
||||
355
docs/TIME_SLOT_QUICK_REFERENCE.md
Normal file
355
docs/TIME_SLOT_QUICK_REFERENCE.md
Normal file
@@ -0,0 +1,355 @@
|
||||
# Time-Slot & Scheduling System - Quick Reference
|
||||
|
||||
## File Locations
|
||||
|
||||
| Component | Path |
|
||||
|-----------|------|
|
||||
| **Slot Generator** | `packages/server/src/time-slot/slot-generator.service.ts` |
|
||||
| **TimeSlot Service** | `packages/server/src/time-slot/time-slot.service.ts` |
|
||||
| **TimeSlot Controller** | `packages/server/src/time-slot/time-slot.controller.ts` |
|
||||
| **Scheduler** | `packages/server/src/scheduler/scheduler.service.ts` |
|
||||
| **Booking Service** | `packages/server/src/booking/booking.service.ts` |
|
||||
| **Booking Controller** | `packages/server/src/booking/booking.controller.ts` |
|
||||
| **Database Schema** | `packages/server/prisma/schema.prisma` |
|
||||
| **Shared Constants** | `packages/shared/src/constants.ts` |
|
||||
| **Shared Enums** | `packages/shared/src/enums.ts` |
|
||||
|
||||
---
|
||||
|
||||
## Key Concepts
|
||||
|
||||
### WeekTemplate
|
||||
Defines **recurring class schedule** by day of week (1=Monday, 7=Sunday) and time.
|
||||
- Used to auto-generate TimeSlots nightly
|
||||
- Can be enabled/disabled
|
||||
- Has capacity (default 1 for private lessons)
|
||||
|
||||
### TimeSlot
|
||||
**Individual class instance** on a specific date with a specific time.
|
||||
- Status: OPEN → FULL → CLOSED
|
||||
- Source: TEMPLATE (auto-generated) or MANUAL (admin-created)
|
||||
- Cannot have duplicates (unique constraint on date+startTime+endTime)
|
||||
|
||||
### Booking
|
||||
**User's reservation** for a specific TimeSlot.
|
||||
- Status: CONFIRMED → COMPLETED (or CANCELLED)
|
||||
- Links user + timeSlot + membership
|
||||
- Unique constraint: one booking per user per slot
|
||||
|
||||
---
|
||||
|
||||
## Daily Scheduler Jobs
|
||||
|
||||
All times in UTC:
|
||||
|
||||
| Time | Job | What It Does |
|
||||
|------|-----|--------------|
|
||||
| **02:00** | `handleSlotGeneration()` | Generate slots 14 days ahead from WeekTemplates |
|
||||
| **02:30** | `handleCleanupSlots()` | Mark past OPEN slots as CLOSED |
|
||||
| **03:00** | `handleCheckMemberships()` | Expire memberships by date or used-up sessions |
|
||||
| **22:00** | `handleCompleteBookings()` | Mark past CONFIRMED bookings as COMPLETED |
|
||||
|
||||
---
|
||||
|
||||
## Important Methods
|
||||
|
||||
### SlotGeneratorService
|
||||
|
||||
```typescript
|
||||
// Generate N days of slots from WeekTemplates
|
||||
generateSlots(daysAhead = 14): Promise<number>
|
||||
|
||||
// Close all past OPEN slots
|
||||
cleanupExpiredSlots(): Promise<number>
|
||||
|
||||
// Expire memberships by date or session count
|
||||
checkExpiredMemberships(): Promise<number>
|
||||
|
||||
// Mark past bookings as COMPLETED
|
||||
completeBookings(): Promise<number>
|
||||
```
|
||||
|
||||
### TimeSlotService
|
||||
|
||||
```typescript
|
||||
// Get all slots for a date (with user's booking status if provided)
|
||||
getAvailableSlots(date: string, userId?: string): Promise<TimeSlotWithBookingStatus[]>
|
||||
|
||||
// Manually create a one-off slot
|
||||
createManualSlot(dto: CreateManualSlotDto): Promise<TimeSlot>
|
||||
|
||||
// Close a slot (prevent new bookings)
|
||||
closeSlot(id: string): Promise<TimeSlot>
|
||||
|
||||
// Get/replace weekly templates
|
||||
getWeekTemplates(): Promise<WeekTemplate[]>
|
||||
replaceWeekTemplates(items: WeekTemplateItemDto[]): Promise<CreateBatchPayload>
|
||||
```
|
||||
|
||||
### BookingService
|
||||
|
||||
```typescript
|
||||
// Create a booking (validates slot/membership, updates counts)
|
||||
createBooking(userId: string, dto: CreateBookingDto): Promise<BookingWithRelations>
|
||||
|
||||
// Cancel a booking (conditionally refunds membership)
|
||||
cancelBooking(userId: string, bookingId: string): Promise<CancelBookingResult>
|
||||
|
||||
// Get user's bookings (paginated, filterable by status)
|
||||
getMyBookings(userId: string, status?, page, limit): Promise<PaginatedResult>
|
||||
|
||||
// Get all CONFIRMED bookings for dates >= today
|
||||
getUpcomingBookings(userId: string): Promise<BookingWithRelations[]>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## API Endpoints
|
||||
|
||||
### Member Endpoints
|
||||
|
||||
```
|
||||
GET /time-slot/available?date=2026-04-10
|
||||
→ Returns slots for that date with user's booking status
|
||||
|
||||
GET /time-slot/:id
|
||||
→ Returns full slot details with all bookings
|
||||
|
||||
POST /booking
|
||||
Body: { "timeSlotId": "uuid", "membershipId": "uuid" }
|
||||
→ Create a booking
|
||||
|
||||
PUT /booking/:id/cancel
|
||||
→ Cancel a booking (refund if within window)
|
||||
|
||||
GET /booking/my?status=CONFIRMED&page=1&limit=10
|
||||
→ Get user's bookings (paginated)
|
||||
|
||||
GET /booking/my/upcoming
|
||||
→ Get all upcoming CONFIRMED bookings
|
||||
```
|
||||
|
||||
### Admin Endpoints
|
||||
|
||||
```
|
||||
GET /admin/week-template
|
||||
→ List all templates
|
||||
|
||||
PUT /admin/week-template
|
||||
Body: { "templates": [ {...}, {...} ] }
|
||||
→ Replace all templates (atomic)
|
||||
|
||||
POST /admin/time-slot/manual
|
||||
Body: { "date", "startTime", "endTime", "capacity" }
|
||||
→ Create a one-off slot
|
||||
|
||||
PUT /admin/time-slot/:id/close
|
||||
→ Close a slot
|
||||
|
||||
POST /admin/generate-slots
|
||||
→ Manually trigger slot generation
|
||||
|
||||
GET /admin/bookings?page=1&limit=10&status=CONFIRMED
|
||||
→ View all bookings (admin)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Status Values
|
||||
|
||||
### TimeSlotStatus
|
||||
- **OPEN**: Accepts bookings (bookedCount < capacity)
|
||||
- **FULL**: At capacity (bookedCount >= capacity)
|
||||
- **CLOSED**: Past date or manually closed
|
||||
|
||||
### BookingStatus
|
||||
- **CONFIRMED**: Active reservation
|
||||
- **CANCELLED**: User cancelled
|
||||
- **COMPLETED**: Slot time has passed
|
||||
- **NO_SHOW**: Marked manually
|
||||
|
||||
### MembershipStatus
|
||||
- **ACTIVE**: Valid for booking
|
||||
- **EXPIRED**: End date passed
|
||||
- **USED_UP**: No remaining sessions (for TIMES/TRIAL)
|
||||
|
||||
### CardTypeCategory
|
||||
- **TIMES**: N sessions (e.g., "5-pack")
|
||||
- **DURATION**: Valid for X days (e.g., "1-month")
|
||||
- **TRIAL**: Free trial sessions
|
||||
|
||||
---
|
||||
|
||||
## Key Logic
|
||||
|
||||
### Booking Creation Transaction
|
||||
|
||||
```
|
||||
1. Validate TimeSlot exists and status = OPEN
|
||||
2. Check user not already booked this slot
|
||||
3. Validate Membership:
|
||||
- Belongs to user
|
||||
- Status = ACTIVE
|
||||
- Has capacity:
|
||||
* TIMES/TRIAL: remainingTimes > 0
|
||||
* DURATION: expireDate > NOW
|
||||
4. CREATE Booking(CONFIRMED)
|
||||
5. UPDATE TimeSlot:
|
||||
- bookedCount++
|
||||
- IF bookedCount >= capacity THEN status = FULL
|
||||
6. UPDATE Membership (if time-based):
|
||||
- remainingTimes--
|
||||
- IF remainingTimes = 0 THEN status = USED_UP
|
||||
7. Return with relations
|
||||
```
|
||||
|
||||
### Cancellation Refund Logic
|
||||
|
||||
```
|
||||
cancelHoursLimit = 2 (configurable in StudioConfig)
|
||||
slotStartTime = TimeSlot.date + TimeSlot.startTime
|
||||
deadline = NOW + (cancelHoursLimit * hours)
|
||||
|
||||
IF slotStartTime >= deadline:
|
||||
Refund = TRUE
|
||||
Increment membership.remainingTimes
|
||||
ELSE:
|
||||
Refund = FALSE
|
||||
No membership change
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Weekday Mapping
|
||||
|
||||
**ISO Standard** (what WeekTemplate uses):
|
||||
```
|
||||
1 = Monday
|
||||
2 = Tuesday
|
||||
3 = Wednesday
|
||||
4 = Thursday
|
||||
5 = Friday
|
||||
6 = Saturday
|
||||
7 = Sunday
|
||||
```
|
||||
|
||||
**JavaScript getDay()** (what Date does):
|
||||
```
|
||||
0 = Sunday
|
||||
1 = Monday
|
||||
2 = Tuesday
|
||||
...
|
||||
6 = Saturday
|
||||
```
|
||||
|
||||
**Conversion function:**
|
||||
```typescript
|
||||
function toIsoWeekday(jsDay: number): number {
|
||||
return jsDay === 0 ? 7 : jsDay
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Database Constraints
|
||||
|
||||
### TimeSlot
|
||||
- Unique: `[date, startTime, endTime]` - prevents duplicate slots
|
||||
- Index: `date` - for date range queries
|
||||
- Index: `status` - for filtering
|
||||
|
||||
### Booking
|
||||
- Unique: `[userId, timeSlotId]` - one booking per user per slot
|
||||
- Index: `userId` - for user's bookings
|
||||
- Index: `status` - for status filtering
|
||||
|
||||
---
|
||||
|
||||
## Configuration
|
||||
|
||||
### Environment Variables
|
||||
```
|
||||
DATABASE_URL=mysql://... (required)
|
||||
```
|
||||
|
||||
### From StudioConfig Table
|
||||
```
|
||||
cancelHoursLimit = 2 (hours before slot to allow free cancellation)
|
||||
```
|
||||
|
||||
### From Shared Constants
|
||||
```
|
||||
DEFAULT_SLOT_CAPACITY = 1
|
||||
SLOT_GENERATION_DAYS = 14
|
||||
DEFAULT_CANCEL_HOURS_LIMIT = 2
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Common Errors
|
||||
|
||||
| Error | Cause | Solution |
|
||||
|-------|-------|----------|
|
||||
| TimeSlot not found | Invalid slot ID | Check slot exists |
|
||||
| TimeSlot is not available | Status ≠ OPEN | Slot is FULL or CLOSED |
|
||||
| You have already booked this slot | Duplicate booking | Check user's bookings |
|
||||
| This membership does not belong to you | Membership not user's | Verify membership |
|
||||
| Membership is not active | Status ≠ ACTIVE | Renew or purchase membership |
|
||||
| No remaining times on this membership | remainingTimes ≤ 0 | Purchase more sessions |
|
||||
| Membership has expired | expireDate < NOW | Renew membership |
|
||||
| Cannot cancel booking with status | Status ≠ CONFIRMED | Can only cancel CONFIRMED bookings |
|
||||
|
||||
---
|
||||
|
||||
## Testing
|
||||
|
||||
Run tests with:
|
||||
```bash
|
||||
npm test -- slot-generator.service.spec.ts
|
||||
npm test -- booking.service.spec.ts
|
||||
npm test -- time-slot.service.spec.ts
|
||||
```
|
||||
|
||||
Key test areas:
|
||||
- Slot generation from templates
|
||||
- Weekday mapping (JS vs ISO)
|
||||
- Booking creation with all validations
|
||||
- Cancellation with/without refund
|
||||
- Membership expiration
|
||||
|
||||
---
|
||||
|
||||
## Performance Tips
|
||||
|
||||
1. **Avoid N+1 queries** - Always include relations in findMany
|
||||
2. **Batch operations** - Use createMany/updateMany for large operations
|
||||
3. **Transactions** - Wrap multi-step operations to prevent race conditions
|
||||
4. **Indexes** - Queries filter by date and status (both indexed)
|
||||
|
||||
---
|
||||
|
||||
## Development Workflow
|
||||
|
||||
1. **Setup templates** → `PUT /admin/week-template`
|
||||
2. **Manually trigger generation** → `POST /admin/generate-slots`
|
||||
3. **View available slots** → `GET /time-slot/available?date=...`
|
||||
4. **Create booking** → `POST /booking`
|
||||
5. **Cancel booking** → `PUT /booking/:id/cancel`
|
||||
|
||||
For testing without scheduler:
|
||||
```typescript
|
||||
// Inject SlotGeneratorService and call directly
|
||||
const count = await slotGenerator.generateSlots(7)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Architecture Highlights
|
||||
|
||||
✅ **Idempotent** - Safe to re-run slot generation
|
||||
✅ **Transactional** - Bookings are atomic
|
||||
✅ **Automated** - 4 daily cron jobs maintain state
|
||||
✅ **Flexible** - Supports multiple membership types
|
||||
✅ **Scalable** - Batch operations, proper indexes
|
||||
✅ **Validating** - DTO decorators + business logic checks
|
||||
|
||||
966
docs/TIME_SLOT_SCHEDULING_SYSTEM.md
Normal file
966
docs/TIME_SLOT_SCHEDULING_SYSTEM.md
Normal file
@@ -0,0 +1,966 @@
|
||||
# NestJS Time-Slot & Scheduling System Analysis
|
||||
|
||||
## Executive Summary
|
||||
|
||||
This is a comprehensive analysis of the pilates studio booking system's time-slot generation and scheduling backend. The system automatically generates time slots from reusable weekly templates, maintains their lifecycle, and integrates tightly with the booking and membership management systems.
|
||||
|
||||
---
|
||||
|
||||
## 1. Data Models (Prisma Schema)
|
||||
|
||||
### 1.1 WeekTemplate Model
|
||||
**Location:** `packages/server/prisma/schema.prisma` (lines 113-126)
|
||||
|
||||
```prisma
|
||||
model WeekTemplate {
|
||||
id String @id @default(uuid())
|
||||
dayOfWeek Int @map("day_of_week") // 1=Mon, 7=Sun (ISO standard)
|
||||
startTime String @map("start_time") // e.g., "09:00"
|
||||
endTime String @map("end_time") // e.g., "10:00"
|
||||
capacity Int @default(1) // Max participants
|
||||
isActive Boolean @default(true) // Enable/disable template
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
timeSlots TimeSlot[] // Generated slots from this template
|
||||
}
|
||||
```
|
||||
|
||||
**Purpose:**
|
||||
- Defines recurring time slots by day of week and time
|
||||
- Used as blueprint for automatic slot generation
|
||||
- Capacity defines how many people can book each slot
|
||||
|
||||
**Key Constraints:**
|
||||
- `dayOfWeek` uses **ISO 8601 standard** (1=Monday through 7=Sunday)
|
||||
- NOT JavaScript getDay() (0=Sunday)
|
||||
- Conversion happens in SlotGeneratorService.toIsoWeekday()
|
||||
|
||||
---
|
||||
|
||||
### 1.2 TimeSlot Model
|
||||
**Location:** `packages/server/prisma/schema.prisma` (lines 128-148)
|
||||
|
||||
```prisma
|
||||
model TimeSlot {
|
||||
id String @id @default(uuid())
|
||||
date DateTime @db.Date // Calendar date (midnight UTC)
|
||||
startTime String @map("start_time") // "HH:mm" format
|
||||
endTime String @map("end_time") // "HH:mm" format
|
||||
capacity Int @default(1) // Max participants
|
||||
bookedCount Int @default(0) // Current bookings
|
||||
status TimeSlotStatus @default(OPEN) // OPEN | FULL | CLOSED
|
||||
source TimeSlotSource @default(TEMPLATE) // TEMPLATE | MANUAL
|
||||
templateId String? @map("template_id") // Reference to WeekTemplate
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
template WeekTemplate? @relation(fields: [templateId], references: [id])
|
||||
bookings Booking[]
|
||||
|
||||
@@unique([date, startTime, endTime]) // Prevent duplicate slots
|
||||
@@index([date])
|
||||
@@index([status])
|
||||
}
|
||||
```
|
||||
|
||||
**Status Lifecycle:**
|
||||
- **OPEN**: Accepts bookings, bookedCount < capacity
|
||||
- **FULL**: No more bookings, bookedCount >= capacity
|
||||
- **CLOSED**: Past date or manually closed, no bookings allowed
|
||||
|
||||
**Source Types:**
|
||||
- **TEMPLATE**: Auto-generated from WeekTemplate
|
||||
- **MANUAL**: Created directly by admin
|
||||
|
||||
---
|
||||
|
||||
### 1.3 Booking Model
|
||||
**Location:** `packages/server/prisma/schema.prisma` (lines 150-168)
|
||||
|
||||
```prisma
|
||||
model Booking {
|
||||
id String @id @default(uuid())
|
||||
userId String @map("user_id")
|
||||
timeSlotId String @map("time_slot_id")
|
||||
membershipId String @map("membership_id")
|
||||
status BookingStatus @default(CONFIRMED)
|
||||
cancelledAt DateTime? @map("cancelled_at")
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
user User @relation(fields: [userId], references: [id])
|
||||
timeSlot TimeSlot @relation(fields: [timeSlotId], references: [id])
|
||||
membership Membership @relation(fields: [membershipId], references: [id])
|
||||
|
||||
@@unique([userId, timeSlotId]) // One booking per user per slot
|
||||
@@index([userId])
|
||||
@@index([status])
|
||||
}
|
||||
```
|
||||
|
||||
**Booking Status Values:**
|
||||
- **CONFIRMED**: Active reservation
|
||||
- **CANCELLED**: User cancelled
|
||||
- **COMPLETED**: Slot time has passed
|
||||
- **NO_SHOW**: Marked manually if user didn't attend
|
||||
|
||||
---
|
||||
|
||||
## 2. SlotGeneratorService
|
||||
|
||||
**Location:** `packages/server/src/time-slot/slot-generator.service.ts`
|
||||
|
||||
### 2.1 Service Overview
|
||||
|
||||
Core service responsible for:
|
||||
1. **Generating** time slots from WeekTemplate
|
||||
2. **Cleaning up** expired slots
|
||||
3. **Managing** membership expiration
|
||||
4. **Marking** past bookings as completed
|
||||
|
||||
### 2.2 Key Methods
|
||||
|
||||
#### `generateSlots(daysAhead: number = 14): Promise<number>`
|
||||
|
||||
**Purpose:** Creates time slots for the next N days based on active WeekTemplates.
|
||||
|
||||
**Algorithm:**
|
||||
```
|
||||
1. Fetch all active WeekTemplates (isActive = true)
|
||||
2. Calculate tomorrow at midnight UTC as start date
|
||||
3. For each day in [tomorrow, tomorrow + daysAhead):
|
||||
a. Get ISO weekday (1-7) from JavaScript date
|
||||
b. Find matching templates for this weekday
|
||||
c. For each matching template, create slot data:
|
||||
- date: UTC midnight
|
||||
- startTime/endTime: from template
|
||||
- capacity: from template
|
||||
- source: TimeSlotSource.TEMPLATE
|
||||
- templateId: template.id
|
||||
4. Batch create all slots using createMany() with skipDuplicates: true
|
||||
5. Return count of newly created slots
|
||||
```
|
||||
|
||||
**Key Features:**
|
||||
- **Idempotent:** Re-running is safe; duplicate date+startTime+endTime combos are skipped
|
||||
- **Timezone Aware:** Uses UTC midnight for dates
|
||||
- **Weekday Mapping:** Converts JS getDay() → ISO weekday
|
||||
- **Batch Insert:** Creates all slots in single database operation
|
||||
|
||||
**Example Execution:**
|
||||
- Today: Monday, April 7, 2026
|
||||
- Daylight: 14 days
|
||||
- Template: Monday 09:00-10:00, Friday 18:00-19:00
|
||||
- Result: 2 slots tomorrow (Monday), 0 Wed-Thu, 1 Friday, repeat pattern
|
||||
|
||||
---
|
||||
|
||||
#### `cleanupExpiredSlots(): Promise<number>`
|
||||
|
||||
**Purpose:** Marks all OPEN slots with dates before today as CLOSED.
|
||||
|
||||
**Logic:**
|
||||
```sql
|
||||
UPDATE time_slots
|
||||
SET status = 'CLOSED'
|
||||
WHERE status = 'OPEN' AND date < TODAY_MIDNIGHT_UTC
|
||||
```
|
||||
|
||||
**Returns:** Count of slots closed.
|
||||
|
||||
---
|
||||
|
||||
#### `checkExpiredMemberships(): Promise<number>`
|
||||
|
||||
**Purpose:** Manages membership expiration in two ways:
|
||||
|
||||
1. **By Expiration Date:**
|
||||
```
|
||||
WHERE status = ACTIVE AND expireDate < NOW
|
||||
SET status = EXPIRED
|
||||
```
|
||||
|
||||
2. **By Used-Up Sessions:**
|
||||
```
|
||||
WHERE status = ACTIVE AND remainingTimes = 0
|
||||
SET status = USED_UP
|
||||
```
|
||||
|
||||
**Returns:** Total count of memberships updated.
|
||||
|
||||
---
|
||||
|
||||
#### `completeBookings(): Promise<number>`
|
||||
|
||||
**Purpose:** Marks CONFIRMED bookings for past time slots as COMPLETED.
|
||||
|
||||
**Logic:**
|
||||
```sql
|
||||
UPDATE bookings
|
||||
SET status = 'COMPLETED'
|
||||
WHERE status = 'CONFIRMED'
|
||||
AND timeSlot.date < TODAY_MIDNIGHT_UTC
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. TimeSlotService
|
||||
|
||||
**Location:** `packages/server/src/time-slot/time-slot.service.ts`
|
||||
|
||||
### 3.1 Service Overview
|
||||
|
||||
Handles time slot queries and management for both members and admins.
|
||||
|
||||
### 3.2 Key Methods
|
||||
|
||||
#### `getAvailableSlots(date: string, userId?: string): Promise<TimeSlotWithBookingStatus[]>`
|
||||
|
||||
**Purpose:** Retrieve all non-closed slots for a specific date, optionally including user's booking status.
|
||||
|
||||
**Query Logic:**
|
||||
```
|
||||
1. Parse date string to Date object
|
||||
2. Find all slots for that calendar day:
|
||||
- WHERE status != CLOSED
|
||||
- ORDER BY startTime ASC
|
||||
3. If userId provided:
|
||||
- Include bookings where userId=X AND status=CONFIRMED
|
||||
- Map to "isBookedByMe" and "myBookingId" fields
|
||||
4. Return TimeSlotWithBookingStatus[]
|
||||
```
|
||||
|
||||
**Response Type:**
|
||||
```typescript
|
||||
interface TimeSlotWithBookingStatus {
|
||||
id: string
|
||||
date: string // ISO date "YYYY-MM-DD"
|
||||
startTime: string // "HH:mm"
|
||||
endTime: string
|
||||
capacity: number
|
||||
bookedCount: number
|
||||
status: TimeSlotStatus // OPEN | FULL | CLOSED
|
||||
source: TimeSlotSource // TEMPLATE | MANUAL
|
||||
templateId: string | null
|
||||
createdAt: string // ISO datetime
|
||||
updatedAt: string
|
||||
isBookedByMe: boolean // Current user's booking?
|
||||
myBookingId: string | null // For cancellation
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### `getSlotById(id: string): Promise<TimeSlot>`
|
||||
|
||||
Returns full slot details including all bookings. Throws NotFoundException if not found.
|
||||
|
||||
---
|
||||
|
||||
#### `createManualSlot(dto: CreateManualSlotDto): Promise<TimeSlot>`
|
||||
|
||||
**Purpose:** Allow admins to create one-off time slots outside templates.
|
||||
|
||||
**DTO:**
|
||||
```typescript
|
||||
class CreateManualSlotDto {
|
||||
date: string // "YYYY-MM-DD"
|
||||
startTime: string // "HH:mm"
|
||||
endTime: string // "HH:mm"
|
||||
capacity?: number // Defaults to DEFAULT_SLOT_CAPACITY (1)
|
||||
}
|
||||
```
|
||||
|
||||
**Creates slot with:**
|
||||
- `source: TimeSlotSource.MANUAL`
|
||||
- `templateId: null`
|
||||
|
||||
---
|
||||
|
||||
#### `closeSlot(id: string): Promise<TimeSlot>`
|
||||
|
||||
Sets slot status to CLOSED. Prevents new bookings but keeps existing ones.
|
||||
|
||||
---
|
||||
|
||||
#### `getWeekTemplates(): Promise<WeekTemplate[]>`
|
||||
|
||||
Lists all templates ordered by dayOfWeek and startTime.
|
||||
|
||||
---
|
||||
|
||||
#### `replaceWeekTemplates(items: WeekTemplateItemDto[]): Promise<CreateBatchPayload>`
|
||||
|
||||
**Purpose:** Atomic replacement of all templates (used during admin config).
|
||||
|
||||
**Transaction:**
|
||||
```
|
||||
1. DELETE FROM week_templates (all rows)
|
||||
2. CREATE week_templates with new items
|
||||
3. Return count
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. TimeSlotController & AdminTimeSlotController
|
||||
|
||||
**Location:** `packages/server/src/time-slot/time-slot.controller.ts`
|
||||
|
||||
### 4.1 Member Endpoints
|
||||
|
||||
#### `GET /time-slot/available?date=YYYY-MM-DD`
|
||||
- Returns available slots for the date
|
||||
- Includes current user's booking status
|
||||
- Requires JWT authentication
|
||||
|
||||
#### `GET /time-slot/:id`
|
||||
- Returns full slot details with all bookings
|
||||
- Requires JWT authentication
|
||||
|
||||
---
|
||||
|
||||
### 4.2 Admin Endpoints
|
||||
|
||||
All require `@Roles(UserRole.ADMIN)` and JWT auth.
|
||||
|
||||
#### `GET /admin/week-template`
|
||||
Lists all WeekTemplate entries.
|
||||
|
||||
#### `PUT /admin/week-template`
|
||||
Replaces all templates. Request body:
|
||||
```json
|
||||
{
|
||||
"templates": [
|
||||
{
|
||||
"dayOfWeek": 1,
|
||||
"startTime": "09:00",
|
||||
"endTime": "10:00",
|
||||
"capacity": 1,
|
||||
"isActive": true
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
#### `POST /admin/time-slot/manual`
|
||||
Creates a manual slot. Request body:
|
||||
```json
|
||||
{
|
||||
"date": "2026-04-10",
|
||||
"startTime": "14:00",
|
||||
"endTime": "15:00",
|
||||
"capacity": 2
|
||||
}
|
||||
```
|
||||
|
||||
#### `PUT /admin/time-slot/:id/close`
|
||||
Closes a specific slot.
|
||||
|
||||
#### `POST /admin/generate-slots`
|
||||
Manually trigger slot generation (default 14 days ahead).
|
||||
|
||||
---
|
||||
|
||||
## 5. SchedulerService - Automated Jobs
|
||||
|
||||
**Location:** `packages/server/src/scheduler/scheduler.service.ts`
|
||||
|
||||
### 5.1 Overview
|
||||
|
||||
Uses `@nestjs/schedule` to run daily maintenance tasks. All times in UTC.
|
||||
|
||||
### 5.2 Cron Jobs
|
||||
|
||||
#### Job 1: Slot Generation
|
||||
```
|
||||
@Cron('0 2 * * *') // 02:00 UTC daily
|
||||
async handleSlotGeneration()
|
||||
```
|
||||
- Calls: `slotGenerator.generateSlots(14)`
|
||||
- Generates slots 14 days ahead
|
||||
- Purpose: Keep pipeline filled
|
||||
|
||||
---
|
||||
|
||||
#### Job 2: Slot Cleanup
|
||||
```
|
||||
@Cron('30 2 * * *') // 02:30 UTC daily
|
||||
async handleCleanupSlots()
|
||||
```
|
||||
- Calls: `slotGenerator.cleanupExpiredSlots()`
|
||||
- Marks past OPEN slots as CLOSED
|
||||
|
||||
---
|
||||
|
||||
#### Job 3: Membership Check
|
||||
```
|
||||
@Cron('0 3 * * *') // 03:00 UTC daily
|
||||
async handleCheckMemberships()
|
||||
```
|
||||
- Calls: `slotGenerator.checkExpiredMemberships()`
|
||||
- Expires memberships by date or used-up sessions
|
||||
|
||||
---
|
||||
|
||||
#### Job 4: Booking Completion
|
||||
```
|
||||
@Cron('0 22 * * *') // 22:00 UTC daily
|
||||
async handleCompleteBookings()
|
||||
```
|
||||
- Calls: `slotGenerator.completeBookings()`
|
||||
- Marks past CONFIRMED bookings as COMPLETED
|
||||
|
||||
---
|
||||
|
||||
## 6. BookingService - Integration with TimeSlots
|
||||
|
||||
**Location:** `packages/server/src/booking/booking.service.ts`
|
||||
|
||||
### 6.1 Key Integration Points
|
||||
|
||||
#### `createBooking(userId: string, dto: CreateBookingDto): Promise<BookingWithRelations>`
|
||||
|
||||
**DTO:**
|
||||
```typescript
|
||||
class CreateBookingDto {
|
||||
timeSlotId: string // UUID of TimeSlot
|
||||
membershipId: string // UUID of Membership
|
||||
}
|
||||
```
|
||||
|
||||
**Transaction Flow:**
|
||||
```
|
||||
1. Fetch TimeSlot - validate status = OPEN
|
||||
2. Check unique constraint - user not already booked this slot
|
||||
3. Fetch Membership - validate:
|
||||
- Belongs to user
|
||||
- Status = ACTIVE
|
||||
- Has remaining capacity:
|
||||
* TIMES/TRIAL: remainingTimes > 0
|
||||
* DURATION: not expired
|
||||
4. Create Booking(userId, timeSlotId, membershipId) → CONFIRMED
|
||||
5. Update TimeSlot:
|
||||
- bookedCount++
|
||||
- If bookedCount >= capacity, set status = FULL
|
||||
6. Update Membership (if time-based):
|
||||
- remainingTimes--
|
||||
- If remainingTimes = 0, set status = USED_UP
|
||||
7. Return booking with relations
|
||||
```
|
||||
|
||||
**Error Handling:**
|
||||
- TimeSlot not OPEN → BadRequestException
|
||||
- Duplicate booking → ConflictException
|
||||
- Invalid membership → ForbiddenException
|
||||
- No remaining sessions → BadRequestException
|
||||
|
||||
---
|
||||
|
||||
#### `cancelBooking(userId: string, bookingId: string): Promise<CancelBookingResult>`
|
||||
|
||||
**Refund Logic:**
|
||||
```
|
||||
cancelHoursLimit = StudioConfig.cancelHoursLimit (default 2 hours)
|
||||
slotStartMs = Date(date).setUTC Hours + startTime
|
||||
deadlineMs = NOW + (cancelHoursLimit * 3600 * 1000)
|
||||
withinLimit = slotStartMs >= deadlineMs
|
||||
|
||||
IF withinLimit:
|
||||
Restore membership.remainingTimes++
|
||||
ELSE:
|
||||
No refund
|
||||
```
|
||||
|
||||
**Transaction Flow:**
|
||||
```
|
||||
1. Mark Booking → CANCELLED, set cancelledAt
|
||||
2. Decrement TimeSlot.bookedCount
|
||||
3. If slot was FULL, restore to OPEN
|
||||
4. If within cancel window:
|
||||
- For TIMES/TRIAL: increment remainingTimes
|
||||
- Restore membership status if was USED_UP
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### `getMyBookings(userId: string, status?, page, limit): Promise<PaginatedResult>`
|
||||
|
||||
Lists user's bookings with pagination, optionally filtered by status.
|
||||
|
||||
---
|
||||
|
||||
#### `getUpcomingBookings(userId: string): Promise<BookingWithRelations[]>`
|
||||
|
||||
Returns all CONFIRMED bookings for dates >= today, ordered by date.
|
||||
|
||||
---
|
||||
|
||||
## 7. Data Flow Diagrams
|
||||
|
||||
### 7.1 Slot Generation Flow
|
||||
|
||||
```
|
||||
Daily 02:00 UTC
|
||||
↓
|
||||
SchedulerService.handleSlotGeneration()
|
||||
↓
|
||||
SlotGeneratorService.generateSlots(14)
|
||||
↓
|
||||
1. Query WeekTemplate (isActive=true)
|
||||
2. For next 14 days:
|
||||
- Match templates by ISO weekday
|
||||
- Create TimeSlot entries
|
||||
3. Use createMany(skipDuplicates: true)
|
||||
↓
|
||||
Database: Insert new TimeSlot records
|
||||
↓
|
||||
Return: count of new slots
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 7.2 Booking Flow
|
||||
|
||||
```
|
||||
User Action
|
||||
↓
|
||||
POST /booking
|
||||
timeSlotId: UUID
|
||||
membershipId: UUID
|
||||
↓
|
||||
BookingService.createBooking()
|
||||
↓
|
||||
START TRANSACTION
|
||||
├─ Validate TimeSlot (status=OPEN)
|
||||
├─ Check unique(userId, timeSlotId)
|
||||
├─ Validate Membership (ACTIVE, not expired)
|
||||
├─ CREATE Booking(CONFIRMED)
|
||||
├─ UPDATE TimeSlot(bookedCount++, status=?)
|
||||
└─ UPDATE Membership(remainingTimes--)
|
||||
COMMIT
|
||||
↓
|
||||
Return: BookingWithRelations
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 7.3 Cancellation Flow
|
||||
|
||||
```
|
||||
User Action
|
||||
↓
|
||||
PUT /booking/:id/cancel
|
||||
↓
|
||||
BookingService.cancelBooking()
|
||||
↓
|
||||
Check: Now vs Slot Time + cancelHoursLimit
|
||||
↓
|
||||
START TRANSACTION
|
||||
├─ UPDATE Booking(CANCELLED, cancelledAt=NOW)
|
||||
├─ UPDATE TimeSlot(bookedCount--, status=?)
|
||||
└─ IF within cancel window:
|
||||
└─ UPDATE Membership(remainingTimes++)
|
||||
COMMIT
|
||||
↓
|
||||
Return: { booking, refunded: boolean }
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 8. DTOs & Request/Response
|
||||
|
||||
### 8.1 Time Slot DTOs
|
||||
|
||||
**Location:** `packages/server/src/time-slot/dto/`
|
||||
|
||||
#### `QuerySlotsDto`
|
||||
```typescript
|
||||
class QuerySlotsDto {
|
||||
@IsDateString()
|
||||
date!: string // Format: YYYY-MM-DD
|
||||
}
|
||||
```
|
||||
|
||||
#### `CreateManualSlotDto`
|
||||
```typescript
|
||||
class CreateManualSlotDto {
|
||||
@IsDateString()
|
||||
date!: string
|
||||
@IsString()
|
||||
startTime!: string
|
||||
@IsString()
|
||||
endTime!: string
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
capacity?: number
|
||||
}
|
||||
```
|
||||
|
||||
#### `WeekTemplateItemDto` & `UpdateWeekTemplateDto`
|
||||
```typescript
|
||||
class WeekTemplateItemDto {
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
@Max(7)
|
||||
dayOfWeek!: number // ISO: 1=Mon, 7=Sun
|
||||
@IsString()
|
||||
startTime!: string
|
||||
@IsString()
|
||||
endTime!: string
|
||||
@IsOptional()
|
||||
capacity?: number
|
||||
@IsOptional()
|
||||
isActive?: boolean
|
||||
}
|
||||
|
||||
class UpdateWeekTemplateDto {
|
||||
@ArrayNotEmpty()
|
||||
templates!: WeekTemplateItemDto[]
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 9. Shared Constants & Enums
|
||||
|
||||
**Location:** `packages/shared/src/`
|
||||
|
||||
### 9.1 Constants
|
||||
|
||||
```typescript
|
||||
// constants.ts
|
||||
export const DEFAULT_CANCEL_HOURS_LIMIT = 2
|
||||
export const DEFAULT_SLOT_CAPACITY = 1
|
||||
export const SLOT_GENERATION_DAYS = 14
|
||||
export const TIME_PERIODS = {
|
||||
MORNING: { label: '上午', start: '06:00', end: '12:00' },
|
||||
AFTERNOON: { label: '下午', start: '12:00', end: '18:00' },
|
||||
EVENING: { label: '晚上', start: '18:00', end: '22:00' },
|
||||
}
|
||||
export const DATE_SELECTOR_DAYS = 7
|
||||
export const WEEKDAY_LABELS = ['', '周一', '周二', '周三', '周四', '周五', '周六', '周日']
|
||||
```
|
||||
|
||||
### 9.2 Enums
|
||||
|
||||
```typescript
|
||||
// enums.ts
|
||||
enum TimeSlotStatus {
|
||||
OPEN = 'OPEN',
|
||||
FULL = 'FULL',
|
||||
CLOSED = 'CLOSED',
|
||||
}
|
||||
|
||||
enum TimeSlotSource {
|
||||
TEMPLATE = 'TEMPLATE',
|
||||
MANUAL = 'MANUAL',
|
||||
}
|
||||
|
||||
enum BookingStatus {
|
||||
CONFIRMED = 'CONFIRMED',
|
||||
CANCELLED = 'CANCELLED',
|
||||
COMPLETED = 'COMPLETED',
|
||||
NO_SHOW = 'NO_SHOW',
|
||||
}
|
||||
|
||||
enum MembershipStatus {
|
||||
ACTIVE = 'ACTIVE',
|
||||
EXPIRED = 'EXPIRED',
|
||||
USED_UP = 'USED_UP',
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 10. File Structure Summary
|
||||
|
||||
```
|
||||
packages/server/src/
|
||||
├── time-slot/
|
||||
│ ├── __tests__/
|
||||
│ │ ├── slot-generator.service.spec.ts (170 lines, comprehensive tests)
|
||||
│ │ └── time-slot.service.spec.ts
|
||||
│ ├── dto/
|
||||
│ │ ├── query-slots.dto.ts
|
||||
│ │ ├── create-manual-slot.dto.ts
|
||||
│ │ └── week-template.dto.ts
|
||||
│ ├── slot-generator.service.ts (172 lines, 4 key methods)
|
||||
│ ├── time-slot.service.ts (142 lines)
|
||||
│ ├── time-slot.controller.ts (93 lines, 2 controllers)
|
||||
│ └── time-slot.module.ts
|
||||
│
|
||||
├── scheduler/
|
||||
│ ├── __tests__/
|
||||
│ │ └── scheduler.service.spec.ts
|
||||
│ ├── scheduler.service.ts (55 lines, 4 cron jobs)
|
||||
│ └── scheduler.module.ts
|
||||
│
|
||||
├── booking/
|
||||
│ ├── __tests__/
|
||||
│ │ └── booking.service.spec.ts
|
||||
│ ├── dto/
|
||||
│ │ └── create-booking.dto.ts
|
||||
│ ├── booking.service.ts (367 lines)
|
||||
│ ├── booking.controller.ts (82 lines)
|
||||
│ └── booking.module.ts
|
||||
│
|
||||
├── prisma/
|
||||
│ └── schema.prisma (205 lines, includes models)
|
||||
│
|
||||
└── app.module.ts (imports TimeSlotModule, SchedulerModule)
|
||||
|
||||
packages/shared/src/
|
||||
├── types/
|
||||
│ ├── time-slot.ts
|
||||
│ └── (others)
|
||||
├── constants.ts (22 lines)
|
||||
├── enums.ts (47 lines)
|
||||
└── index.ts
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 11. Key Architectural Patterns
|
||||
|
||||
### 11.1 Idempotent Slot Generation
|
||||
|
||||
**Problem:** If scheduler crashes or delays, slots might not be generated.
|
||||
**Solution:**
|
||||
- Use `createMany(skipDuplicates: true)` with unique constraint on `[date, startTime, endTime]`
|
||||
- Safe to re-run multiple times
|
||||
- Only inserts new combinations
|
||||
|
||||
---
|
||||
|
||||
### 11.2 Atomic Transactions
|
||||
|
||||
**For Booking Creation:**
|
||||
- Create booking, update slot, update membership in single transaction
|
||||
- All-or-nothing: ensures consistency if any step fails
|
||||
|
||||
**For Cancellation:**
|
||||
- Cancel booking, restore slot, conditionally restore membership
|
||||
- Prevents race conditions
|
||||
|
||||
---
|
||||
|
||||
### 11.3 ISO Weekday Mapping
|
||||
|
||||
**Problem:** JavaScript `Date.getDay()` uses 0=Sunday, but WeekTemplate uses ISO 8601 (1=Monday).
|
||||
|
||||
**Solution:** Helper function `toIsoWeekday()`:
|
||||
```typescript
|
||||
function toIsoWeekday(jsDay: number): number {
|
||||
return jsDay === 0 ? 7 : jsDay
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 11.4 Membership Type Handling
|
||||
|
||||
**TIMES/TRIAL cardType:**
|
||||
- Deduct `remainingTimes--` on booking
|
||||
- Mark USED_UP when remainingTimes = 0
|
||||
- Refund if cancelled within window
|
||||
|
||||
**DURATION cardType:**
|
||||
- Check `expireDate` not passed
|
||||
- No deduction; just check validity
|
||||
- No refund on cancellation
|
||||
|
||||
---
|
||||
|
||||
## 12. Example Scenarios
|
||||
|
||||
### Scenario 1: Setup Studio with Mon-Fri Classes
|
||||
|
||||
**Admin Actions:**
|
||||
```json
|
||||
PUT /admin/week-template
|
||||
{
|
||||
"templates": [
|
||||
{ "dayOfWeek": 1, "startTime": "09:00", "endTime": "10:00", "capacity": 1 },
|
||||
{ "dayOfWeek": 1, "startTime": "10:30", "endTime": "11:30", "capacity": 1 },
|
||||
{ "dayOfWeek": 2, "startTime": "09:00", "endTime": "10:00", "capacity": 1 },
|
||||
{ "dayOfWeek": 3, "startTime": "09:00", "endTime": "10:00", "capacity": 1 },
|
||||
{ "dayOfWeek": 4, "startTime": "09:00", "endTime": "10:00", "capacity": 1 },
|
||||
{ "dayOfWeek": 5, "startTime": "09:00", "endTime": "10:00", "capacity": 1 },
|
||||
{ "dayOfWeek": 5, "startTime": "18:00", "endTime": "19:00", "capacity": 1 }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**Next Day (02:00 UTC):**
|
||||
- Scheduler auto-generates 14 days of slots
|
||||
- Result: 14 Mon morning + 14 Mon mid-morning + 14 Tue morning + ... + 14 Fri evening
|
||||
|
||||
**Member Action (View Availability):**
|
||||
```
|
||||
GET /time-slot/available?date=2026-04-10
|
||||
→ Returns all slots for April 10 (Friday)
|
||||
→ Includes bookings for current user
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Scenario 2: Member Books, Then Cancels
|
||||
|
||||
**Member Books:**
|
||||
```
|
||||
POST /booking
|
||||
{
|
||||
"timeSlotId": "slot-123",
|
||||
"membershipId": "mem-456"
|
||||
}
|
||||
```
|
||||
|
||||
**System:**
|
||||
1. Validates slot is OPEN, membership is ACTIVE with remaining sessions
|
||||
2. Creates Booking(CONFIRMED)
|
||||
3. Increments slot.bookedCount (1 → 2)
|
||||
4. If now at capacity, sets slot.status = FULL
|
||||
5. Decrements membership.remainingTimes (5 → 4)
|
||||
|
||||
**Member Cancels (within 2-hour window):**
|
||||
```
|
||||
PUT /booking/booking-789/cancel
|
||||
```
|
||||
|
||||
**System:**
|
||||
1. Checks if NOW + 2 hours ≤ slot start time ✓
|
||||
2. Sets booking.status = CANCELLED
|
||||
3. Decrements slot.bookedCount (2 → 1)
|
||||
4. If slot was FULL, restores to OPEN
|
||||
5. Increments membership.remainingTimes (4 → 5) ✓ refunded
|
||||
|
||||
---
|
||||
|
||||
### Scenario 3: Membership Expires
|
||||
|
||||
**Overnight at 03:00 UTC:**
|
||||
- Scheduler runs `handleCheckMemberships()`
|
||||
- Updates all ACTIVE memberships where `expireDate < NOW` to EXPIRED
|
||||
- User tries to book → BadRequestException "Membership is not active (status: EXPIRED)"
|
||||
|
||||
---
|
||||
|
||||
## 13. Testing Guide
|
||||
|
||||
### Key Test Files
|
||||
|
||||
1. **`slot-generator.service.spec.ts`** (310 lines)
|
||||
- Tests slot generation from templates
|
||||
- Tests weekday mapping (JS vs ISO)
|
||||
- Tests cleanup and expiration logic
|
||||
- Tests membership and booking expiration
|
||||
|
||||
2. **`time-slot.service.spec.ts`** (existing)
|
||||
- Tests getAvailableSlots with user booking status
|
||||
- Tests manual slot creation
|
||||
|
||||
3. **`booking.service.spec.ts`** (existing)
|
||||
- Tests booking creation with all validations
|
||||
- Tests cancellation with refund logic
|
||||
|
||||
---
|
||||
|
||||
## 14. Configuration & Environment
|
||||
|
||||
### Required Env Variables
|
||||
```
|
||||
DATABASE_URL=mysql://...
|
||||
```
|
||||
|
||||
### Studio Config (StudioConfig table)
|
||||
- `cancelHoursLimit`: Hours before slot to allow free cancellation (default 2)
|
||||
|
||||
### Constants (shared package)
|
||||
- `SLOT_GENERATION_DAYS`: 14 (days ahead to generate)
|
||||
- `DEFAULT_SLOT_CAPACITY`: 1 (private lessons)
|
||||
- `DEFAULT_CANCEL_HOURS_LIMIT`: 2
|
||||
|
||||
---
|
||||
|
||||
## 15. Performance Considerations
|
||||
|
||||
### Database Indexes
|
||||
- `TimeSlot(date)` - for date range queries
|
||||
- `TimeSlot(status)` - for status filtering
|
||||
- `Booking(userId)` - for user's bookings
|
||||
- `Booking(status)` - for status filtering
|
||||
|
||||
### Batch Operations
|
||||
- Slot generation uses `createMany()` for efficiency
|
||||
- Expiration checks use `updateMany()` instead of loops
|
||||
|
||||
### Transaction Isolation
|
||||
- All booking/cancellation operations wrapped in transactions
|
||||
- Prevents race conditions on bookedCount and remainingTimes
|
||||
|
||||
---
|
||||
|
||||
## 16. Security Notes
|
||||
|
||||
### Authorization
|
||||
- JWT guard on all endpoints
|
||||
- RolesGuard for admin endpoints (only ADMIN role)
|
||||
- Users can only modify their own bookings/memberships
|
||||
|
||||
### Validation
|
||||
- All DTOs have class-validator decorators
|
||||
- UUID validation on foreign keys
|
||||
- Date string validation (YYYY-MM-DD format)
|
||||
|
||||
### Data Integrity
|
||||
- Unique constraint on `[userId, timeSlotId]` prevents duplicate bookings
|
||||
- Unique constraint on `[date, startTime, endTime]` prevents duplicate slots
|
||||
- Foreign key constraints on relations
|
||||
|
||||
---
|
||||
|
||||
## 17. Future Enhancement Ideas
|
||||
|
||||
1. **Overbooking Buffer:**
|
||||
- Allow configurable overbooking ratio (e.g., 110% capacity)
|
||||
|
||||
2. **Waitlist Support:**
|
||||
- Add BookingStatus.WAITLISTED
|
||||
- Auto-promote when slot opens
|
||||
|
||||
3. **Recurring Cancellation:**
|
||||
- Cancel all future bookings of a series
|
||||
- Batch refunds
|
||||
|
||||
4. **Slot Availability Notifications:**
|
||||
- Alert users when slots available
|
||||
- Implement notification queue
|
||||
|
||||
5. **Dynamic Pricing:**
|
||||
- Peak vs off-peak pricing
|
||||
- Last-minute discounts
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
This time-slot and scheduling system is well-architected with:
|
||||
|
||||
✅ **Idempotent slot generation** - Safe to re-run
|
||||
✅ **Atomic transactions** - ACID compliance for bookings
|
||||
✅ **Automatic maintenance** - 4 daily cron jobs
|
||||
✅ **Flexible membership types** - TIMES, DURATION, TRIAL
|
||||
✅ **Refund policy** - Configurable cancellation window
|
||||
✅ **ISO weekday standard** - Proper international support
|
||||
✅ **Comprehensive validation** - DTOs with decorators
|
||||
✅ **Role-based access** - Admin vs member endpoints
|
||||
|
||||
The system handles:
|
||||
- Auto-generating 14 days of slots nightly
|
||||
- Accepting bookings with capacity management
|
||||
- Canceling with conditional refunds
|
||||
- Expiring memberships and marking past bookings
|
||||
- All with transactional integrity and concurrent safety.
|
||||
|
||||
@@ -106,6 +106,8 @@ async function handleLogin() {
|
||||
try {
|
||||
await userStore.login()
|
||||
await userStore.fetchMemberships()
|
||||
// 登录成功后跳转到个人中心,让用户完善信息
|
||||
uni.navigateTo({ url: '/pages/profile/info' })
|
||||
} catch {
|
||||
uni.showToast({ title: '登录失败,请重试', icon: 'none' })
|
||||
} finally {
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed } from 'vue'
|
||||
import { ref, computed, watch } from 'vue'
|
||||
import type { UserProfileResponse, UserStatsResponse, MembershipWithCardType } from '@mp-pilates/shared'
|
||||
import { MembershipStatus } from '@mp-pilates/shared'
|
||||
|
||||
@@ -91,6 +91,16 @@ const emit = defineEmits<{
|
||||
|
||||
const avatarFailed = ref(false)
|
||||
|
||||
// 头像 URL 变化时重置加载错误状态,避免新头像因偶发加载失败而被永久隐藏
|
||||
watch(
|
||||
() => props.user?.avatarUrl,
|
||||
(newUrl, oldUrl) => {
|
||||
if (newUrl && newUrl !== oldUrl) {
|
||||
avatarFailed.value = false
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
const avatarSrc = computed(() => {
|
||||
if (avatarFailed.value || !props.user?.avatarUrl) {
|
||||
return '/static/default-avatar.png'
|
||||
|
||||
@@ -49,10 +49,16 @@
|
||||
"navigationBarTitleText": "管理中心"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/admin/schedule",
|
||||
"style": {
|
||||
"navigationBarTitleText": "排课管理"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/admin/week-template",
|
||||
"style": {
|
||||
"navigationBarTitleText": "排课设置"
|
||||
"navigationBarTitleText": "排课模板"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -49,8 +49,8 @@ const statsLoading = ref(false)
|
||||
const stats = ref<AdminStats>({ todayBookings: 0, totalOrders: 0, totalBookings: 0 })
|
||||
|
||||
const navItems = [
|
||||
{ icon: '📅', label: '排课设置', path: '/pages/admin/week-template' },
|
||||
{ icon: '🔧', label: '临时调整', path: '/pages/admin/slot-adjust' },
|
||||
{ icon: '📅', label: '排课管理', path: '/pages/admin/schedule' },
|
||||
{ icon: '📋', label: '排课模板', path: '/pages/admin/week-template' },
|
||||
{ icon: '👥', label: '会员管理', path: '/pages/admin/members' },
|
||||
{ icon: '📋', label: '订单管理', path: '/pages/admin/orders' },
|
||||
{ icon: '💳', label: '卡种管理', path: '/pages/admin/card-types' },
|
||||
|
||||
755
packages/app/src/pages/admin/schedule.vue
Normal file
755
packages/app/src/pages/admin/schedule.vue
Normal file
@@ -0,0 +1,755 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- Date selector -->
|
||||
<view class="sticky-header">
|
||||
<DateSelector v-model="selectedDate" @select="onDateSelect" />
|
||||
</view>
|
||||
|
||||
<!-- Loading skeleton -->
|
||||
<view v-if="loading" class="skeleton-list">
|
||||
<view v-for="i in 4" :key="i" class="skeleton-item" />
|
||||
</view>
|
||||
|
||||
<!-- Empty state -->
|
||||
<view v-else-if="editableSlots.length === 0" class="empty-state">
|
||||
<text class="empty-icon">📭</text>
|
||||
<text class="empty-text">当日暂无排课</text>
|
||||
<text class="empty-sub">无模板匹配,请手动添加时段或先配置排课模板</text>
|
||||
</view>
|
||||
|
||||
<!-- Slot list -->
|
||||
<view v-else class="slot-list">
|
||||
<view
|
||||
v-for="slot in visibleSlots"
|
||||
:key="slot.key"
|
||||
class="slot-card"
|
||||
:class="slotCardClass(slot)"
|
||||
>
|
||||
<!-- Status badge -->
|
||||
<view class="slot-header">
|
||||
<view class="slot-badge" :class="slotBadgeClass(slot)">
|
||||
<text class="slot-badge-text">{{ slotBadgeText(slot) }}</text>
|
||||
</view>
|
||||
<view v-if="slot.bookedCount > 0" class="booked-info">
|
||||
<text class="booked-text">{{ slot.bookedCount }} 人已预约</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- Time display / edit -->
|
||||
<view class="slot-body">
|
||||
<view class="time-section">
|
||||
<picker
|
||||
mode="time"
|
||||
:value="slot.startTime"
|
||||
@change="(e: any) => updateSlotTime(slot, 'startTime', e.detail.value)"
|
||||
>
|
||||
<view class="time-display">
|
||||
<text class="time-text">{{ slot.startTime }}</text>
|
||||
</view>
|
||||
</picker>
|
||||
<text class="time-separator">–</text>
|
||||
<picker
|
||||
mode="time"
|
||||
:value="slot.endTime"
|
||||
@change="(e: any) => updateSlotTime(slot, 'endTime', e.detail.value)"
|
||||
>
|
||||
<view class="time-display">
|
||||
<text class="time-text">{{ slot.endTime }}</text>
|
||||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
|
||||
<view class="capacity-section">
|
||||
<text class="capacity-label">容量</text>
|
||||
<view class="capacity-control">
|
||||
<view class="capacity-btn" @tap="adjustCapacity(slot, -1)">
|
||||
<text class="capacity-btn-text">−</text>
|
||||
</view>
|
||||
<text class="capacity-value">{{ slot.capacity }}</text>
|
||||
<view class="capacity-btn" @tap="adjustCapacity(slot, 1)">
|
||||
<text class="capacity-btn-text">+</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="delete-section">
|
||||
<view
|
||||
class="delete-btn"
|
||||
:class="{ 'delete-btn--warn': slot.bookedCount > 0 }"
|
||||
@tap="removeSlot(slot)"
|
||||
>
|
||||
<text class="delete-btn-text">✕</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- Add slot button -->
|
||||
<view class="add-wrap" @tap="openAddModal">
|
||||
<text class="add-text">+ 添加时段</text>
|
||||
</view>
|
||||
|
||||
<!-- Bottom action bar -->
|
||||
<view class="action-bar">
|
||||
<view
|
||||
class="publish-btn"
|
||||
:class="{ 'publish-btn--loading': publishing }"
|
||||
@tap="handlePublish"
|
||||
>
|
||||
<text class="publish-btn-text">
|
||||
{{ publishing ? '发布中...' : (hasPublished ? '更新当日排课' : '发布当日排课') }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- Add slot modal -->
|
||||
<view v-if="showAddModal" class="modal-mask" @tap="onMaskTap">
|
||||
<view class="modal" @tap.stop>
|
||||
<text class="modal-title">添加时段</text>
|
||||
|
||||
<view class="modal-field">
|
||||
<text class="modal-label">开始时间</text>
|
||||
<picker
|
||||
mode="time"
|
||||
:value="addForm.startTime"
|
||||
@change="onAddStartTimeChange"
|
||||
>
|
||||
<view class="picker-display">
|
||||
<text class="picker-text">{{ addForm.startTime }}</text>
|
||||
<text class="picker-arrow">›</text>
|
||||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
|
||||
<view class="modal-field">
|
||||
<text class="modal-label">结束时间</text>
|
||||
<view class="picker-display picker-display--disabled">
|
||||
<text class="picker-text picker-text--muted">{{ addForm.endTime }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="modal-field modal-field--last">
|
||||
<text class="modal-label">容量</text>
|
||||
<input
|
||||
class="modal-input"
|
||||
type="number"
|
||||
v-model="addForm.capacityStr"
|
||||
placeholder="如:1"
|
||||
placeholder-style="color:#bbb"
|
||||
/>
|
||||
</view>
|
||||
|
||||
<view class="modal-actions">
|
||||
<view class="modal-cancel" @tap="closeAddModal">
|
||||
<text class="modal-cancel-text">取消</text>
|
||||
</view>
|
||||
<view class="modal-confirm" @tap="submitAdd">
|
||||
<text class="modal-confirm-text">确认</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import type { ScheduleSlotPreview } from '@mp-pilates/shared'
|
||||
import { useAdminStore } from '../../stores/admin'
|
||||
import { formatDate } from '../../utils/format'
|
||||
import DateSelector from '../../components/DateSelector.vue'
|
||||
|
||||
interface EditableSlot {
|
||||
readonly key: string
|
||||
existingSlotId: string | null
|
||||
startTime: string
|
||||
endTime: string
|
||||
capacity: number
|
||||
bookedCount: number
|
||||
isPublished: boolean
|
||||
isNew: boolean
|
||||
isRemoved: boolean
|
||||
templateId: string | null
|
||||
}
|
||||
|
||||
const adminStore = useAdminStore()
|
||||
const selectedDate = ref(formatDate(new Date()))
|
||||
const loading = ref(false)
|
||||
const publishing = ref(false)
|
||||
const showAddModal = ref(false)
|
||||
|
||||
const editableSlots = ref<EditableSlot[]>([])
|
||||
|
||||
const addForm = ref({
|
||||
startTime: '09:00',
|
||||
endTime: '10:00',
|
||||
capacityStr: '1',
|
||||
})
|
||||
|
||||
// ── Computed ──────────────────────────────────────────────
|
||||
|
||||
const visibleSlots = computed(() =>
|
||||
editableSlots.value.filter((s) => !s.isRemoved),
|
||||
)
|
||||
|
||||
const hasPublished = computed(() =>
|
||||
editableSlots.value.some((s) => s.isPublished),
|
||||
)
|
||||
|
||||
// ── Data loading ──────────────────────────────────────────
|
||||
|
||||
function mapPreviewToEditable(previews: readonly ScheduleSlotPreview[]): EditableSlot[] {
|
||||
return previews.map((p) => ({
|
||||
key: p.id ?? `tpl-${p.templateId}-${p.startTime}`,
|
||||
existingSlotId: p.id,
|
||||
startTime: p.startTime,
|
||||
endTime: p.endTime,
|
||||
capacity: p.capacity,
|
||||
bookedCount: p.bookedCount,
|
||||
isPublished: p.isPublished,
|
||||
isNew: false,
|
||||
isRemoved: false,
|
||||
templateId: p.templateId,
|
||||
}))
|
||||
}
|
||||
|
||||
async function loadPreview(date: string) {
|
||||
loading.value = true
|
||||
try {
|
||||
const previews = await adminStore.fetchSchedulePreview(date)
|
||||
editableSlots.value = mapPreviewToEditable(previews)
|
||||
} catch {
|
||||
uni.showToast({ title: '加载失败', icon: 'none' })
|
||||
editableSlots.value = []
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function onDateSelect(date: string) {
|
||||
selectedDate.value = date
|
||||
loadPreview(date)
|
||||
}
|
||||
|
||||
// ── Slot editing ──────────────────────────────────────────
|
||||
|
||||
function updateSlotTime(slot: EditableSlot, field: 'startTime' | 'endTime', value: string) {
|
||||
slot[field] = value
|
||||
}
|
||||
|
||||
function adjustCapacity(slot: EditableSlot, delta: number) {
|
||||
const minCapacity = Math.max(1, slot.bookedCount)
|
||||
const newVal = slot.capacity + delta
|
||||
if (newVal >= minCapacity) {
|
||||
slot.capacity = newVal
|
||||
}
|
||||
}
|
||||
|
||||
function removeSlot(slot: EditableSlot) {
|
||||
if (slot.bookedCount > 0) {
|
||||
uni.showModal({
|
||||
title: '该时段有预约',
|
||||
content: `已有 ${slot.bookedCount} 人预约此时段,移除后该时段将被关闭(已有预约保留)。确认移除?`,
|
||||
confirmText: '确认移除',
|
||||
confirmColor: '#c0392b',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
slot.isRemoved = true
|
||||
}
|
||||
},
|
||||
})
|
||||
} else {
|
||||
slot.isRemoved = true
|
||||
}
|
||||
}
|
||||
|
||||
// ── Add slot ──────────────────────────────────────────────
|
||||
|
||||
/** 将 "HH:mm" 加一小时,最大 23:59 */
|
||||
function addOneHour(time: string): string {
|
||||
const [h, m] = time.split(':').map(Number)
|
||||
const newH = Math.min(h + 1, 23)
|
||||
// 如果原本就是 23:xx,结束时间设为 23:59
|
||||
if (h >= 23) return '23:59'
|
||||
return String(newH).padStart(2, '0') + ':' + String(m).padStart(2, '0')
|
||||
}
|
||||
|
||||
function onAddStartTimeChange(e: any) {
|
||||
const start = e.detail.value as string
|
||||
addForm.value.startTime = start
|
||||
addForm.value.endTime = addOneHour(start)
|
||||
}
|
||||
|
||||
function openAddModal() {
|
||||
addForm.value = { startTime: '09:00', endTime: '10:00', capacityStr: '1' }
|
||||
showAddModal.value = true
|
||||
}
|
||||
|
||||
function closeAddModal() {
|
||||
showAddModal.value = false
|
||||
}
|
||||
|
||||
/** 点击遮罩关闭弹窗 — tap.stop 在 modal 上阻止了内部点击冒泡到此 */
|
||||
function onMaskTap() {
|
||||
closeAddModal()
|
||||
}
|
||||
|
||||
function submitAdd() {
|
||||
const capacity = parseInt(addForm.value.capacityStr, 10)
|
||||
if (!addForm.value.startTime || !addForm.value.endTime) {
|
||||
uni.showToast({ title: '请选择时间', icon: 'none' })
|
||||
return
|
||||
}
|
||||
if (isNaN(capacity) || capacity < 1) {
|
||||
uni.showToast({ title: '请填写有效容量', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
editableSlots.value.push({
|
||||
key: `new-${Date.now()}`,
|
||||
existingSlotId: null,
|
||||
startTime: addForm.value.startTime,
|
||||
endTime: addForm.value.endTime,
|
||||
capacity,
|
||||
bookedCount: 0,
|
||||
isPublished: false,
|
||||
isNew: true,
|
||||
isRemoved: false,
|
||||
templateId: null,
|
||||
})
|
||||
|
||||
closeAddModal()
|
||||
}
|
||||
|
||||
// ── Publish ───────────────────────────────────────────────
|
||||
|
||||
async function handlePublish() {
|
||||
if (publishing.value) return
|
||||
|
||||
const slotsToPublish = visibleSlots.value
|
||||
if (slotsToPublish.length === 0) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '当前没有时段,确认清空当日排课?',
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
await doPublish([])
|
||||
}
|
||||
},
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// Validate times
|
||||
for (const slot of slotsToPublish) {
|
||||
if (slot.startTime >= slot.endTime) {
|
||||
uni.showToast({ title: `时段 ${slot.startTime}-${slot.endTime} 时间无效`, icon: 'none' })
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
uni.showModal({
|
||||
title: '确认发布',
|
||||
content: `确认${hasPublished.value ? '更新' : '发布'} ${selectedDate.value} 的排课?共 ${slotsToPublish.length} 个时段`,
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
await doPublish(slotsToPublish)
|
||||
}
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
async function doPublish(slots: readonly EditableSlot[]) {
|
||||
publishing.value = true
|
||||
try {
|
||||
await adminStore.publishDaySlots({
|
||||
date: selectedDate.value,
|
||||
slots: slots.map((s) => ({
|
||||
existingSlotId: s.existingSlotId ?? undefined,
|
||||
startTime: s.startTime,
|
||||
endTime: s.endTime,
|
||||
capacity: s.capacity,
|
||||
})),
|
||||
})
|
||||
uni.showToast({ title: '发布成功', icon: 'success' })
|
||||
// Reload to show fresh state
|
||||
editableSlots.value = mapPreviewToEditable(adminStore.schedulePreview)
|
||||
} catch (e: unknown) {
|
||||
const message = e instanceof Error ? e.message : '发布失败'
|
||||
uni.showToast({ title: message, icon: 'none' })
|
||||
} finally {
|
||||
publishing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// ── Style helpers ─────────────────────────────────────────
|
||||
|
||||
function slotCardClass(slot: EditableSlot): string {
|
||||
if (slot.isNew) return 'slot-card--new'
|
||||
if (slot.isPublished) return 'slot-card--published'
|
||||
return 'slot-card--template'
|
||||
}
|
||||
|
||||
function slotBadgeClass(slot: EditableSlot): string {
|
||||
if (slot.isNew) return 'badge--new'
|
||||
if (slot.isPublished) return 'badge--published'
|
||||
return 'badge--template'
|
||||
}
|
||||
|
||||
function slotBadgeText(slot: EditableSlot): string {
|
||||
if (slot.isNew) return '新增'
|
||||
if (slot.isPublished) return '已发布'
|
||||
return '来自模板'
|
||||
}
|
||||
|
||||
// ── Lifecycle ─────────────────────────────────────────────
|
||||
|
||||
onMounted(() => loadPreview(selectedDate.value))
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.page {
|
||||
min-height: 100vh;
|
||||
background: #f5f3f0;
|
||||
padding-bottom: 180rpx;
|
||||
}
|
||||
|
||||
/* ── Sticky header ───────────────────────── */
|
||||
.sticky-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 100;
|
||||
background: #fff;
|
||||
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
|
||||
}
|
||||
|
||||
/* ── Loading skeleton ────────────────────── */
|
||||
.skeleton-list {
|
||||
padding: 24rpx;
|
||||
}
|
||||
|
||||
.skeleton-item {
|
||||
height: 160rpx;
|
||||
border-radius: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
|
||||
background-size: 400% 100%;
|
||||
animation: shimmer 1.4s infinite;
|
||||
}
|
||||
|
||||
@keyframes shimmer {
|
||||
0% { background-position: 100% 0; }
|
||||
100% { background-position: -100% 0; }
|
||||
}
|
||||
|
||||
/* ── Empty state ─────────────────────────── */
|
||||
.empty-state {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 100rpx 40rpx;
|
||||
gap: 16rpx;
|
||||
}
|
||||
|
||||
.empty-icon { font-size: 80rpx; }
|
||||
.empty-text { font-size: 30rpx; color: #666; font-weight: 600; }
|
||||
.empty-sub { font-size: 24rpx; color: #bbb; text-align: center; }
|
||||
|
||||
/* ── Slot list ───────────────────────────── */
|
||||
.slot-list {
|
||||
padding: 24rpx 24rpx 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20rpx;
|
||||
}
|
||||
|
||||
/* ── Slot card ───────────────────────────── */
|
||||
.slot-card {
|
||||
background: #ffffff;
|
||||
border-radius: 20rpx;
|
||||
padding: 24rpx;
|
||||
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
|
||||
border: 2rpx solid transparent;
|
||||
|
||||
&--published {
|
||||
border-color: rgba(39, 174, 96, 0.3);
|
||||
}
|
||||
|
||||
&--template {
|
||||
border-style: dashed;
|
||||
border-color: #c9a87c;
|
||||
background: rgba(201, 168, 124, 0.04);
|
||||
}
|
||||
|
||||
&--new {
|
||||
border-style: dashed;
|
||||
border-color: #3498db;
|
||||
background: rgba(52, 152, 219, 0.04);
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Slot header ─────────────────────────── */
|
||||
.slot-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.slot-badge {
|
||||
border-radius: 16rpx;
|
||||
padding: 4rpx 16rpx;
|
||||
}
|
||||
|
||||
.badge--published { background: rgba(39, 174, 96, 0.1); }
|
||||
.badge--published .slot-badge-text { font-size: 22rpx; color: #27ae60; font-weight: 600; }
|
||||
.badge--template { background: rgba(201, 168, 124, 0.15); }
|
||||
.badge--template .slot-badge-text { font-size: 22rpx; color: #b8860b; font-weight: 600; }
|
||||
.badge--new { background: rgba(52, 152, 219, 0.1); }
|
||||
.badge--new .slot-badge-text { font-size: 22rpx; color: #3498db; font-weight: 600; }
|
||||
|
||||
.booked-info { }
|
||||
.booked-text { font-size: 22rpx; color: #e67e22; }
|
||||
|
||||
/* ── Slot body ───────────────────────────── */
|
||||
.slot-body {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16rpx;
|
||||
}
|
||||
|
||||
.time-section {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.time-display {
|
||||
background: #f7f4f0;
|
||||
border-radius: 12rpx;
|
||||
padding: 12rpx 20rpx;
|
||||
}
|
||||
|
||||
.time-text {
|
||||
font-size: 32rpx;
|
||||
font-weight: 700;
|
||||
color: #1a1a2e;
|
||||
}
|
||||
|
||||
.time-separator {
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.capacity-section {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
}
|
||||
|
||||
.capacity-label {
|
||||
font-size: 22rpx;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.capacity-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4rpx;
|
||||
}
|
||||
|
||||
.capacity-btn {
|
||||
width: 48rpx;
|
||||
height: 48rpx;
|
||||
border-radius: 24rpx;
|
||||
background: #f0ece8;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&:active { opacity: 0.6; }
|
||||
}
|
||||
|
||||
.capacity-btn-text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
color: #1a1a2e;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.capacity-value {
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
color: #1a1a2e;
|
||||
min-width: 40rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.delete-section {
|
||||
margin-left: 8rpx;
|
||||
}
|
||||
|
||||
.delete-btn {
|
||||
width: 48rpx;
|
||||
height: 48rpx;
|
||||
border-radius: 24rpx;
|
||||
background: rgba(192, 57, 43, 0.08);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&--warn {
|
||||
background: rgba(192, 57, 43, 0.2);
|
||||
}
|
||||
|
||||
&:active { opacity: 0.6; }
|
||||
}
|
||||
|
||||
.delete-btn-text {
|
||||
font-size: 24rpx;
|
||||
color: #c0392b;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
/* ── Add button ──────────────────────────── */
|
||||
.add-wrap {
|
||||
margin: 24rpx;
|
||||
padding: 24rpx;
|
||||
border: 2rpx dashed #c9a87c;
|
||||
border-radius: 16rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&:active { opacity: 0.6; }
|
||||
}
|
||||
|
||||
.add-text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: #c9a87c;
|
||||
}
|
||||
|
||||
/* ── Action bar ──────────────────────────── */
|
||||
.action-bar {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
padding: 20rpx 24rpx 48rpx;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
|
||||
.publish-btn {
|
||||
width: 100%;
|
||||
height: 96rpx;
|
||||
border-radius: 48rpx;
|
||||
background: linear-gradient(90deg, #1a1a2e, #2d2d5e);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&--loading { opacity: 0.6; }
|
||||
|
||||
&:active { opacity: 0.85; }
|
||||
}
|
||||
|
||||
.publish-btn-text {
|
||||
font-size: 30rpx;
|
||||
font-weight: 700;
|
||||
color: #c9a87c;
|
||||
}
|
||||
|
||||
/* ── Modal ───────────────────────────────── */
|
||||
.modal-mask {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
z-index: 200;
|
||||
}
|
||||
|
||||
.modal {
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
border-radius: 24rpx 24rpx 0 0;
|
||||
padding: 40rpx 32rpx 60rpx;
|
||||
}
|
||||
|
||||
.modal-title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 700;
|
||||
color: #1a1a2e;
|
||||
display: block;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
|
||||
.modal-field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 24rpx 0;
|
||||
border-bottom: 1rpx solid #f5f5f5;
|
||||
|
||||
&--last { border-bottom: none; }
|
||||
}
|
||||
|
||||
.modal-label {
|
||||
font-size: 26rpx;
|
||||
color: #555;
|
||||
width: 140rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.modal-input {
|
||||
flex: 1;
|
||||
text-align: right;
|
||||
font-size: 26rpx;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
.picker-display {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
}
|
||||
|
||||
.picker-text { font-size: 26rpx; color: #222; }
|
||||
.picker-text--muted { color: #999; }
|
||||
.picker-arrow { font-size: 26rpx; color: #bbb; }
|
||||
.picker-display--disabled { opacity: 0.6; }
|
||||
|
||||
.modal-actions {
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
margin-top: 32rpx;
|
||||
}
|
||||
|
||||
.modal-cancel {
|
||||
flex: 1;
|
||||
height: 88rpx;
|
||||
background: #f0f0f0;
|
||||
border-radius: 44rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.modal-cancel-text { font-size: 28rpx; color: #555; }
|
||||
|
||||
.modal-confirm {
|
||||
flex: 2;
|
||||
height: 88rpx;
|
||||
background: linear-gradient(90deg, #1a1a2e, #2d2d5e);
|
||||
border-radius: 44rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.modal-confirm-text { font-size: 28rpx; font-weight: 700; color: #c9a87c; }
|
||||
</style>
|
||||
@@ -163,9 +163,9 @@ const dayOptions = [1, 2, 3, 4, 5, 6, 7].map((d) => ({ label: WEEKDAY_LABELS[d],
|
||||
|
||||
const form = ref({
|
||||
dayIdx: 0,
|
||||
startTime: '09:00',
|
||||
endTime: '10:00',
|
||||
capacityStr: '10',
|
||||
startTime: '08:00',
|
||||
endTime: '09:00',
|
||||
capacityStr: '1',
|
||||
})
|
||||
|
||||
const grouped = computed(() => {
|
||||
@@ -180,11 +180,38 @@ const grouped = computed(() => {
|
||||
)
|
||||
})
|
||||
|
||||
/** 生成默认模板:周一到周日,8:00-22:00 每小时一个时段 */
|
||||
function generateDefaultTemplates(): LocalTemplate[] {
|
||||
const defaults: LocalTemplate[] = []
|
||||
for (let day = 1; day <= 7; day++) {
|
||||
for (let hour = 8; hour < 22; hour++) {
|
||||
const start = String(hour).padStart(2, '0') + ':00'
|
||||
const end = String(hour + 1).padStart(2, '0') + ':00'
|
||||
defaults.push({
|
||||
_key: `default-${day}-${start}`,
|
||||
dayOfWeek: day,
|
||||
startTime: start,
|
||||
endTime: end,
|
||||
capacity: 1,
|
||||
isActive: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
return defaults
|
||||
}
|
||||
|
||||
async function fetchTemplates() {
|
||||
loading.value = true
|
||||
try {
|
||||
templates.value = await adminStore.fetchWeekTemplates()
|
||||
isDirty.value = false
|
||||
const data = await adminStore.fetchWeekTemplates()
|
||||
if (data.length === 0) {
|
||||
// No templates yet — pre-fill with defaults
|
||||
templates.value = generateDefaultTemplates()
|
||||
isDirty.value = true
|
||||
} else {
|
||||
templates.value = data
|
||||
isDirty.value = false
|
||||
}
|
||||
} catch {
|
||||
uni.showToast({ title: '加载失败', icon: 'none' })
|
||||
} finally {
|
||||
@@ -194,7 +221,7 @@ async function fetchTemplates() {
|
||||
|
||||
function openAdd() {
|
||||
editTarget.value = null
|
||||
form.value = { dayIdx: 0, startTime: '09:00', endTime: '10:00', capacityStr: '10' }
|
||||
form.value = { dayIdx: 0, startTime: '08:00', endTime: '09:00', capacityStr: '1' }
|
||||
showModal.value = true
|
||||
}
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
|
||||
<view class="avatar-wrap">
|
||||
<image
|
||||
v-if="avatarUrl"
|
||||
v-if="displayAvatarUrl"
|
||||
class="avatar"
|
||||
:src="avatarUrl"
|
||||
:src="displayAvatarUrl"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view v-else class="avatar-placeholder">
|
||||
@@ -125,6 +125,17 @@ const activeMembershipCount = computed(
|
||||
() => userStore.user?.activeMembershipCount ?? userStore.activeMemberships.length,
|
||||
)
|
||||
|
||||
// ─── Default avatar ───────────────────────────────────────
|
||||
const defaultAvatarUrl = computed(() => {
|
||||
const nickname = form.value.nickname || 'user'
|
||||
// 使用 dicebear 生成基于昵称的随机头像
|
||||
return `https://api.dicebear.com/7.x/identicon/svg?seed=${encodeURIComponent(nickname)}&backgroundColor=c9a87c,e8c88a`
|
||||
})
|
||||
|
||||
const displayAvatarUrl = computed(() => {
|
||||
return avatarUrl.value || defaultAvatarUrl.value
|
||||
})
|
||||
|
||||
// ─── Avatar upload ────────────────────────────────────────
|
||||
async function handleChooseAvatar(e: { detail: { avatarUrl: string } }) {
|
||||
const { avatarUrl } = e.detail
|
||||
|
||||
@@ -13,6 +13,8 @@ import type {
|
||||
TimeSlot,
|
||||
CreateManualSlotDto,
|
||||
PaginatedData,
|
||||
ScheduleSlotPreview,
|
||||
PublishDaySlotsDto,
|
||||
} from '@mp-pilates/shared'
|
||||
|
||||
export interface AdminStats {
|
||||
@@ -42,7 +44,7 @@ export const useAdminStore = defineStore('admin', () => {
|
||||
}
|
||||
|
||||
async function saveWeekTemplates(templates: WeekTemplateInput[]): Promise<WeekTemplate[]> {
|
||||
const data = await put<WeekTemplate[]>('/admin/week-template', templates)
|
||||
const data = await put<WeekTemplate[]>('/admin/week-template', { templates })
|
||||
weekTemplates.value = data
|
||||
return data
|
||||
}
|
||||
@@ -132,6 +134,26 @@ export const useAdminStore = defineStore('admin', () => {
|
||||
return post<{ count: number }>('/admin/generate-slots', { startDate, endDate })
|
||||
}
|
||||
|
||||
// ── Schedule management ─────────────────────────────────────────
|
||||
const schedulePreview = ref<ScheduleSlotPreview[]>([])
|
||||
const scheduleLoading = ref(false)
|
||||
|
||||
async function fetchSchedulePreview(date: string): Promise<ScheduleSlotPreview[]> {
|
||||
scheduleLoading.value = true
|
||||
try {
|
||||
const data = await get<ScheduleSlotPreview[]>('/admin/schedule/preview', { date })
|
||||
schedulePreview.value = data
|
||||
return data
|
||||
} finally {
|
||||
scheduleLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function publishDaySlots(dto: PublishDaySlotsDto): Promise<void> {
|
||||
await post('/admin/schedule/publish', dto as unknown as Record<string, unknown>)
|
||||
await fetchSchedulePreview(dto.date)
|
||||
}
|
||||
|
||||
// ── Dashboard stats ──────────────────────────────────────────────
|
||||
async function fetchDashboardStats(): Promise<AdminStats> {
|
||||
return get<AdminStats>('/admin/stats')
|
||||
@@ -142,6 +164,8 @@ export const useAdminStore = defineStore('admin', () => {
|
||||
weekTemplates,
|
||||
cardTypes,
|
||||
studioConfig,
|
||||
schedulePreview,
|
||||
scheduleLoading,
|
||||
// Week templates
|
||||
fetchWeekTemplates,
|
||||
saveWeekTemplates,
|
||||
@@ -164,6 +188,9 @@ export const useAdminStore = defineStore('admin', () => {
|
||||
createManualSlot,
|
||||
closeSlot,
|
||||
generateSlots,
|
||||
// Schedule
|
||||
fetchSchedulePreview,
|
||||
publishDaySlots,
|
||||
// Stats
|
||||
fetchDashboardStats,
|
||||
}
|
||||
|
||||
37
packages/server/src/time-slot/dto/publish-day-slots.dto.ts
Normal file
37
packages/server/src/time-slot/dto/publish-day-slots.dto.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import {
|
||||
IsString,
|
||||
IsOptional,
|
||||
IsInt,
|
||||
IsArray,
|
||||
IsDateString,
|
||||
Min,
|
||||
ValidateNested,
|
||||
} from 'class-validator'
|
||||
import { Type } from 'class-transformer'
|
||||
|
||||
export class PublishDaySlotItemDto {
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
readonly existingSlotId?: string
|
||||
|
||||
@IsString()
|
||||
readonly startTime!: string
|
||||
|
||||
@IsString()
|
||||
readonly endTime!: string
|
||||
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
@Type(() => Number)
|
||||
readonly capacity!: number
|
||||
}
|
||||
|
||||
export class PublishDaySlotsDto {
|
||||
@IsDateString()
|
||||
readonly date!: string
|
||||
|
||||
@IsArray()
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => PublishDaySlotItemDto)
|
||||
readonly slots!: PublishDaySlotItemDto[]
|
||||
}
|
||||
@@ -20,6 +20,7 @@ import { SlotGeneratorService } from './slot-generator.service'
|
||||
import { QuerySlotsDto } from './dto/query-slots.dto'
|
||||
import { CreateManualSlotDto } from './dto/create-manual-slot.dto'
|
||||
import { UpdateWeekTemplateDto } from './dto/week-template.dto'
|
||||
import { PublishDaySlotsDto } from './dto/publish-day-slots.dto'
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Member endpoints
|
||||
@@ -89,4 +90,17 @@ export class AdminTimeSlotController {
|
||||
generateSlots() {
|
||||
return this.slotGeneratorService.generateSlots()
|
||||
}
|
||||
|
||||
// Schedule preview & publish
|
||||
|
||||
@Get('schedule/preview')
|
||||
getSchedulePreview(@Query('date') date: string) {
|
||||
return this.timeSlotService.getSchedulePreview(date)
|
||||
}
|
||||
|
||||
@Post('schedule/publish')
|
||||
@HttpCode(HttpStatus.OK)
|
||||
publishDaySlots(@Body() dto: PublishDaySlotsDto) {
|
||||
return this.timeSlotService.publishDaySlots(dto)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { Injectable, NotFoundException } from '@nestjs/common'
|
||||
import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common'
|
||||
import { TimeSlotStatus, BookingStatus, DEFAULT_SLOT_CAPACITY } from '@mp-pilates/shared'
|
||||
import { TimeSlotSource } from '@mp-pilates/shared'
|
||||
import { PrismaService } from '../prisma/prisma.service'
|
||||
import type { TimeSlotWithBookingStatus } from '@mp-pilates/shared'
|
||||
import type { TimeSlotWithBookingStatus, ScheduleSlotPreview } from '@mp-pilates/shared'
|
||||
import type { CreateManualSlotDto } from './dto/create-manual-slot.dto'
|
||||
import type { PublishDaySlotsDto } from './dto/publish-day-slots.dto'
|
||||
|
||||
@Injectable()
|
||||
export class TimeSlotService {
|
||||
@@ -125,7 +126,7 @@ export class TimeSlotService {
|
||||
return this.prisma.$transaction(async (tx) => {
|
||||
await tx.weekTemplate.deleteMany()
|
||||
|
||||
const created = await tx.weekTemplate.createMany({
|
||||
await tx.weekTemplate.createMany({
|
||||
data: items.map((item) => ({
|
||||
dayOfWeek: item.dayOfWeek,
|
||||
startTime: item.startTime,
|
||||
@@ -135,7 +136,166 @@ export class TimeSlotService {
|
||||
})),
|
||||
})
|
||||
|
||||
return created
|
||||
return tx.weekTemplate.findMany({
|
||||
orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// ── Schedule preview & publish ──────────────────────────────
|
||||
|
||||
/** Convert JS getDay() (0=Sun … 6=Sat) to ISO weekday (1=Mon … 7=Sun) */
|
||||
private toIsoWeekday(jsDay: number): number {
|
||||
return jsDay === 0 ? 7 : jsDay
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a schedule preview for a given date.
|
||||
* If TimeSlot records already exist → return them (isPublished: true).
|
||||
* Otherwise → derive from active WeekTemplates (isPublished: false).
|
||||
*/
|
||||
async getSchedulePreview(date: string): Promise<ScheduleSlotPreview[]> {
|
||||
const parsedDate = new Date(date)
|
||||
const startOfDay = new Date(parsedDate)
|
||||
startOfDay.setUTCHours(0, 0, 0, 0)
|
||||
const endOfDay = new Date(parsedDate)
|
||||
endOfDay.setUTCHours(23, 59, 59, 999)
|
||||
|
||||
// 1. Check for existing TimeSlot records (all statuses)
|
||||
const existingSlots = await this.prisma.timeSlot.findMany({
|
||||
where: {
|
||||
date: { gte: startOfDay, lte: endOfDay },
|
||||
},
|
||||
orderBy: { startTime: 'asc' },
|
||||
})
|
||||
|
||||
if (existingSlots.length > 0) {
|
||||
return existingSlots.map((slot) => ({
|
||||
id: slot.id,
|
||||
date: date,
|
||||
startTime: slot.startTime,
|
||||
endTime: slot.endTime,
|
||||
capacity: slot.capacity,
|
||||
bookedCount: slot.bookedCount,
|
||||
status: slot.status as TimeSlotStatus,
|
||||
source: slot.source as TimeSlotSource,
|
||||
templateId: slot.templateId,
|
||||
isPublished: true,
|
||||
}))
|
||||
}
|
||||
|
||||
// 2. No existing slots — derive from WeekTemplate
|
||||
const isoWeekday = this.toIsoWeekday(parsedDate.getUTCDay())
|
||||
const templates = await this.prisma.weekTemplate.findMany({
|
||||
where: { dayOfWeek: isoWeekday, isActive: true },
|
||||
orderBy: { startTime: 'asc' },
|
||||
})
|
||||
|
||||
return templates.map((tpl) => ({
|
||||
id: null,
|
||||
date: date,
|
||||
startTime: tpl.startTime,
|
||||
endTime: tpl.endTime,
|
||||
capacity: tpl.capacity,
|
||||
bookedCount: 0,
|
||||
status: TimeSlotStatus.OPEN,
|
||||
source: TimeSlotSource.TEMPLATE,
|
||||
templateId: tpl.id,
|
||||
isPublished: false,
|
||||
}))
|
||||
}
|
||||
|
||||
/**
|
||||
* Publish (create/update/remove) time slots for a specific date.
|
||||
* - Slots with existingSlotId → update
|
||||
* - New slots → create
|
||||
* - Existing DB slots not referenced → delete (or CLOSE if they have bookings)
|
||||
*/
|
||||
async publishDaySlots(dto: PublishDaySlotsDto) {
|
||||
const parsedDate = new Date(dto.date)
|
||||
parsedDate.setUTCHours(0, 0, 0, 0)
|
||||
|
||||
const startOfDay = new Date(parsedDate)
|
||||
const endOfDay = new Date(parsedDate)
|
||||
endOfDay.setUTCHours(23, 59, 59, 999)
|
||||
|
||||
return this.prisma.$transaction(async (tx) => {
|
||||
// 1. Get existing slots for this date
|
||||
const existing = await tx.timeSlot.findMany({
|
||||
where: { date: { gte: startOfDay, lte: endOfDay } },
|
||||
})
|
||||
const existingMap = new Map(existing.map((s) => [s.id, s]))
|
||||
const keptIds = new Set<string>()
|
||||
|
||||
const results: Array<{
|
||||
id: string
|
||||
date: Date
|
||||
startTime: string
|
||||
endTime: string
|
||||
capacity: number
|
||||
bookedCount: number
|
||||
status: string
|
||||
source: string
|
||||
}> = []
|
||||
|
||||
// 2. Process each slot in the request
|
||||
for (const item of dto.slots) {
|
||||
if (item.existingSlotId && existingMap.has(item.existingSlotId)) {
|
||||
// Update existing slot
|
||||
const existingSlot = existingMap.get(item.existingSlotId)!
|
||||
const safeCapacity = Math.max(item.capacity, existingSlot.bookedCount)
|
||||
|
||||
const updated = await tx.timeSlot.update({
|
||||
where: { id: item.existingSlotId },
|
||||
data: {
|
||||
startTime: item.startTime,
|
||||
endTime: item.endTime,
|
||||
capacity: safeCapacity,
|
||||
},
|
||||
})
|
||||
keptIds.add(item.existingSlotId)
|
||||
results.push(updated)
|
||||
} else {
|
||||
// Create new slot
|
||||
const created = await tx.timeSlot.create({
|
||||
data: {
|
||||
date: parsedDate,
|
||||
startTime: item.startTime,
|
||||
endTime: item.endTime,
|
||||
capacity: item.capacity,
|
||||
source: TimeSlotSource.MANUAL,
|
||||
status: TimeSlotStatus.OPEN,
|
||||
},
|
||||
})
|
||||
results.push(created)
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Handle orphaned existing slots (not in request)
|
||||
for (const slot of existing) {
|
||||
if (!keptIds.has(slot.id)) {
|
||||
if (slot.bookedCount > 0) {
|
||||
// Has bookings → close instead of delete
|
||||
await tx.timeSlot.update({
|
||||
where: { id: slot.id },
|
||||
data: { status: TimeSlotStatus.CLOSED },
|
||||
})
|
||||
} else {
|
||||
await tx.timeSlot.delete({ where: { id: slot.id } })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return results.map((slot) => ({
|
||||
id: slot.id,
|
||||
date: slot.date.toISOString().split('T')[0],
|
||||
startTime: slot.startTime,
|
||||
endTime: slot.endTime,
|
||||
capacity: slot.capacity,
|
||||
bookedCount: slot.bookedCount,
|
||||
status: slot.status,
|
||||
source: slot.source,
|
||||
}))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -35,6 +35,9 @@ export type {
|
||||
TimeSlot,
|
||||
TimeSlotWithBookingStatus,
|
||||
CreateManualSlotDto,
|
||||
ScheduleSlotPreview,
|
||||
PublishDaySlotItem,
|
||||
PublishDaySlotsDto,
|
||||
Booking,
|
||||
BookingWithDetails,
|
||||
CreateBookingDto,
|
||||
|
||||
@@ -2,7 +2,7 @@ export type { User, UserProfileResponse, UpdateProfileDto, UserStatsResponse } f
|
||||
export type { CardType, CreateCardTypeDto, UpdateCardTypeDto } from './card-type'
|
||||
export type { Membership, MembershipWithCardType } from './membership'
|
||||
export type { WeekTemplate, WeekTemplateInput } from './week-template'
|
||||
export type { TimeSlot, TimeSlotWithBookingStatus, CreateManualSlotDto } from './time-slot'
|
||||
export type { TimeSlot, TimeSlotWithBookingStatus, CreateManualSlotDto, ScheduleSlotPreview, PublishDaySlotItem, PublishDaySlotsDto } from './time-slot'
|
||||
export type { Booking, BookingWithDetails, CreateBookingDto } from './booking'
|
||||
export type { Order, OrderWithDetails, CreateOrderDto, PaymentParams, CreateOrderResponse } from './order'
|
||||
export type { StudioConfig, UpdateStudioConfigDto } from './studio'
|
||||
|
||||
@@ -27,3 +27,35 @@ export interface CreateManualSlotDto {
|
||||
readonly endTime: string
|
||||
readonly capacity?: number
|
||||
}
|
||||
|
||||
/** 排课预览项(已发布的 TimeSlot 或模板派生的预览) */
|
||||
export interface ScheduleSlotPreview {
|
||||
/** 已发布则有 ID,模板预览为 null */
|
||||
readonly id: string | null
|
||||
readonly date: string
|
||||
readonly startTime: string
|
||||
readonly endTime: string
|
||||
readonly capacity: number
|
||||
readonly bookedCount: number
|
||||
readonly status: TimeSlotStatus
|
||||
readonly source: TimeSlotSource
|
||||
readonly templateId: string | null
|
||||
/** true = DB 中已有 TimeSlot 记录 */
|
||||
readonly isPublished: boolean
|
||||
}
|
||||
|
||||
/** 发布某天排课时的单个时段 */
|
||||
export interface PublishDaySlotItem {
|
||||
/** 保留/修改已有时段时传入 */
|
||||
readonly existingSlotId?: string
|
||||
readonly startTime: string
|
||||
readonly endTime: string
|
||||
readonly capacity: number
|
||||
}
|
||||
|
||||
/** 发布某天排课的请求体 */
|
||||
export interface PublishDaySlotsDto {
|
||||
/** YYYY-MM-DD */
|
||||
readonly date: string
|
||||
readonly slots: readonly PublishDaySlotItem[]
|
||||
}
|
||||
|
||||
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@@ -138,6 +138,9 @@ importers:
|
||||
'@types/jest':
|
||||
specifier: ^29.5.12
|
||||
version: 29.5.14
|
||||
'@types/multer':
|
||||
specifier: ^1.4.12
|
||||
version: 1.4.13
|
||||
'@types/passport-jwt':
|
||||
specifier: ^4.0.1
|
||||
version: 4.0.1
|
||||
@@ -1920,6 +1923,9 @@ packages:
|
||||
'@types/ms@2.1.0':
|
||||
resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
|
||||
|
||||
'@types/multer@1.4.13':
|
||||
resolution: {integrity: sha512-bhhdtPw7JqCiEfC9Jimx5LqX9BDIPJEh2q/fQ4bqbBPtyEZYr3cvF22NwG0DmPZNYA0CAf2CnqDB4KIGGpJcaw==}
|
||||
|
||||
'@types/node@20.19.37':
|
||||
resolution: {integrity: sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==}
|
||||
|
||||
@@ -7168,6 +7174,10 @@ snapshots:
|
||||
|
||||
'@types/ms@2.1.0': {}
|
||||
|
||||
'@types/multer@1.4.13':
|
||||
dependencies:
|
||||
'@types/express': 4.17.25
|
||||
|
||||
'@types/node@20.19.37':
|
||||
dependencies:
|
||||
undici-types: 6.21.0
|
||||
|
||||
Reference in New Issue
Block a user