Some checks failed
CI/CD Pipeline / Backend Tests (push) Has been cancelled
CI/CD Pipeline / Frontend Tests (push) Has been cancelled
CI/CD Pipeline / Build Docker Images (push) Has been cancelled
CI/CD Pipeline / Security Scan (push) Has been cancelled
CI/CD Pipeline / Deploy to Staging (push) Has been cancelled
CI/CD Pipeline / Deploy to Production (push) Has been cancelled
## Overview
Complete architectural overhaul merging dual event systems into a unified activity model
with multi-VIP support, enhanced search capabilities, and improved UX throughout.
## Database & Schema Changes
### Unified Activity Model (Breaking Change)
- Merged Event/EventTemplate/EventAttendance into single ScheduleEvent model
- Dropped duplicate tables: Event, EventAttendance, EventTemplate
- Single source of truth for all activities (transport, meals, meetings, events)
- Migration: 20260131180000_drop_duplicate_event_tables
### Multi-VIP Support (Breaking Change)
- Changed schema from single vipId to vipIds array (String[])
- Enables multiple VIPs per activity (ridesharing, group events)
- Migration: 20260131122613_multi_vip_support
- Updated all backend services to handle multi-VIP queries
### Seed Data Updates
- Rebuilt seed.ts with unified activity model
- Added multi-VIP rideshare examples (3 VIPs in SUV, 4 VIPs in van)
- Includes mix of transport + non-transport activities
- Balanced VIP test data (50% OFFICE_OF_DEVELOPMENT, 50% ADMIN)
## Backend Changes
### Services Cleanup
- Removed deprecated common-events endpoints
- Updated EventsService for multi-VIP support
- Enhanced VipsService with multi-VIP activity queries
- Updated DriversService, VehiclesService for unified model
- Added add-vips-to-event.dto for bulk VIP assignment
### Abilities & Permissions
- Updated ability.factory.ts: Event → ScheduleEvent subject
- Enhanced guards for unified activity permissions
- Maintained RBAC (Administrator, Coordinator, Driver roles)
### DTOs
- Updated create-event.dto: vipId → vipIds array
- Updated update-event.dto: vipId → vipIds array
- Added add-vips-to-event.dto for bulk operations
- Removed obsolete event-template DTOs
## Frontend Changes
### UI/UX Improvements
**Renamed "Schedule" → "Activities" Throughout**
- More intuitive terminology for coordinators
- Updated navigation, page titles, buttons
- Changed "Schedule Events" to "Activities" in Admin Tools
**Activities Page Enhancements**
- Added comprehensive search bar (searches: title, location, description, VIP names, driver, vehicle)
- Added sortable columns: Title, Type, VIPs, Start Time, Status
- Visual sort indicators (↑↓ arrows)
- Real-time result count when searching
- Empty state with helpful messaging
**Admin Tools Updates**
- Balanced VIP test data: 10 OFFICE_OF_DEVELOPMENT + 10 ADMIN
- More BSA-relevant organizations (Coca-Cola, AT&T, Walmart vs generic orgs)
- BSA leadership titles (National President, Chief Scout Executive, Regional Directors)
- Relabeled "Schedule Events" → "Activities"
### Component Updates
**EventList.tsx (Activities Page)**
- Added search state management with real-time filtering
- Implemented multi-field sorting with direction toggle
- Enhanced empty states for search + no data scenarios
- Filter tabs + search work together seamlessly
**VIPSchedule.tsx**
- Updated for multi-VIP schema (vipIds array)
- Shows complete itinerary timeline per VIP
- Displays all activities for selected VIP
- Groups by day with formatted dates
**EventForm.tsx**
- Updated to handle vipIds array instead of single vipId
- Multi-select VIP assignment
- Maintains backward compatibility
**AdminTools.tsx**
- New balanced VIP test data (10/10 split)
- BSA-context organizations
- Updated button labels ("Add Test Activities")
### Routing & Navigation
- Removed /common-events routes
- Updated navigation menu labels
- Maintained protected route structure
- Cleaner URL structure
## New Features
### Multi-VIP Activity Support
- Activities can have multiple VIPs (ridesharing, group events)
- Efficient seat utilization tracking (3/6 seats, 4/12 seats)
- Better coordination for shared transport
### Advanced Search & Filtering
- Full-text search across multiple fields
- Instant filtering as you type
- Search + type filters work together
- Clear visual feedback (result counts)
### Sortable Data Tables
- Click column headers to sort
- Toggle ascending/descending
- Visual indicators for active sort
- Sorts persist with search/filter
### Enhanced Admin Tools
- One-click test data generation
- Realistic BSA Jamboree scenario data
- Balanced department representation
- Complete 3-day itineraries per VIP
## Testing & Validation
### Playwright E2E Tests
- Added e2e/ directory structure
- playwright.config.ts configured
- PLAYWRIGHT_GUIDE.md documentation
- Ready for comprehensive E2E testing
### Manual Testing Performed
- Multi-VIP activity creation ✓
- Search across all fields ✓
- Column sorting (all fields) ✓
- Filter tabs + search combination ✓
- Admin Tools data generation ✓
- Database migrations ✓
## Breaking Changes & Migration
**Database Schema Changes**
1. Run migrations: `npx prisma migrate deploy`
2. Reseed database: `npx prisma db seed`
3. Existing data incompatible (dev environment - safe to nuke)
**API Changes**
- POST /events now requires vipIds array (not vipId string)
- GET /events returns vipIds array
- GET /vips/:id/schedule updated for multi-VIP
- Removed /common-events/* endpoints
**Frontend Type Changes**
- ScheduleEvent.vipIds: string[] (was vipId: string)
- EventFormData updated accordingly
- All pages handle array-based VIP assignment
## File Changes Summary
**Added:**
- backend/prisma/migrations/20260131180000_drop_duplicate_event_tables/
- backend/src/events/dto/add-vips-to-event.dto.ts
- frontend/src/components/InlineDriverSelector.tsx
- frontend/e2e/ (Playwright test structure)
- Documentation: NAVIGATION_UX_IMPROVEMENTS.md, PLAYWRIGHT_GUIDE.md
**Modified:**
- 30+ backend files (schema, services, DTOs, abilities)
- 20+ frontend files (pages, components, types)
- Admin tools, seed data, navigation
**Removed:**
- Event/EventAttendance/EventTemplate database tables
- Common events frontend pages
- Obsolete event template DTOs
## Next Steps
**Pending (Phase 3):**
- Activity Templates for bulk event creation
- Operations Dashboard (today's activities + conflicts)
- Complete workflow testing with real users
- Additional E2E test coverage
## Notes
- Development environment - no production data affected
- Database can be reset anytime: `npx prisma migrate reset`
- All servers tested and running successfully
- HMR working correctly for frontend changes
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
226 lines
5.9 KiB
Plaintext
226 lines
5.9 KiB
Plaintext
// VIP Coordinator - Prisma Schema
|
|
// This is your database schema (source of truth)
|
|
|
|
generator client {
|
|
provider = "prisma-client-js"
|
|
}
|
|
|
|
datasource db {
|
|
provider = "postgresql"
|
|
url = env("DATABASE_URL")
|
|
}
|
|
|
|
// ============================================
|
|
// User Management
|
|
// ============================================
|
|
|
|
model User {
|
|
id String @id @default(uuid())
|
|
auth0Id String @unique // Auth0 sub claim
|
|
email String @unique
|
|
name String?
|
|
picture String?
|
|
role Role @default(COORDINATOR)
|
|
isApproved Boolean @default(false)
|
|
driver Driver? // Optional linked driver account
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
deletedAt DateTime? // Soft delete
|
|
|
|
@@map("users")
|
|
}
|
|
|
|
enum Role {
|
|
ADMINISTRATOR
|
|
COORDINATOR
|
|
DRIVER
|
|
}
|
|
|
|
// ============================================
|
|
// VIP Management
|
|
// ============================================
|
|
|
|
model VIP {
|
|
id String @id @default(uuid())
|
|
name String
|
|
organization String?
|
|
department Department
|
|
arrivalMode ArrivalMode
|
|
expectedArrival DateTime? // For self-driving arrivals
|
|
airportPickup Boolean @default(false)
|
|
venueTransport Boolean @default(false)
|
|
notes String? @db.Text
|
|
flights Flight[]
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
deletedAt DateTime? // Soft delete
|
|
|
|
@@map("vips")
|
|
}
|
|
|
|
enum Department {
|
|
OFFICE_OF_DEVELOPMENT
|
|
ADMIN
|
|
}
|
|
|
|
enum ArrivalMode {
|
|
FLIGHT
|
|
SELF_DRIVING
|
|
}
|
|
|
|
// ============================================
|
|
// Flight Tracking
|
|
// ============================================
|
|
|
|
model Flight {
|
|
id String @id @default(uuid())
|
|
vipId String
|
|
vip VIP @relation(fields: [vipId], references: [id], onDelete: Cascade)
|
|
flightNumber String
|
|
flightDate DateTime
|
|
segment Int @default(1) // For multi-segment itineraries
|
|
departureAirport String // IATA code (e.g., "JFK")
|
|
arrivalAirport String // IATA code (e.g., "LAX")
|
|
scheduledDeparture DateTime?
|
|
scheduledArrival DateTime?
|
|
actualDeparture DateTime?
|
|
actualArrival DateTime?
|
|
status String? // scheduled, delayed, landed, etc.
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
|
|
@@map("flights")
|
|
@@index([vipId])
|
|
@@index([flightNumber, flightDate])
|
|
}
|
|
|
|
// ============================================
|
|
// Driver Management
|
|
// ============================================
|
|
|
|
model Driver {
|
|
id String @id @default(uuid())
|
|
name String
|
|
phone String
|
|
department Department?
|
|
userId String? @unique
|
|
user User? @relation(fields: [userId], references: [id])
|
|
|
|
// Shift/Availability
|
|
shiftStartTime DateTime? // When driver's shift starts
|
|
shiftEndTime DateTime? // When driver's shift ends
|
|
isAvailable Boolean @default(true)
|
|
|
|
events ScheduleEvent[]
|
|
assignedVehicle Vehicle? @relation("AssignedDriver")
|
|
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
deletedAt DateTime? // Soft delete
|
|
|
|
@@map("drivers")
|
|
}
|
|
|
|
// ============================================
|
|
// Vehicle Management
|
|
// ============================================
|
|
|
|
model Vehicle {
|
|
id String @id @default(uuid())
|
|
name String // "Blue Van", "Suburban #3"
|
|
type VehicleType @default(VAN)
|
|
licensePlate String?
|
|
seatCapacity Int // Total seats (e.g., 8)
|
|
status VehicleStatus @default(AVAILABLE)
|
|
|
|
// Current assignment
|
|
currentDriverId String? @unique
|
|
currentDriver Driver? @relation("AssignedDriver", fields: [currentDriverId], references: [id])
|
|
|
|
// Relationships
|
|
events ScheduleEvent[]
|
|
|
|
notes String? @db.Text
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
deletedAt DateTime? // Soft delete
|
|
|
|
@@map("vehicles")
|
|
}
|
|
|
|
enum VehicleType {
|
|
VAN // 7-15 seats
|
|
SUV // 5-8 seats
|
|
SEDAN // 4-5 seats
|
|
BUS // 15+ seats
|
|
GOLF_CART // 2-6 seats
|
|
TRUCK // For equipment/supplies
|
|
}
|
|
|
|
enum VehicleStatus {
|
|
AVAILABLE // Ready to use
|
|
IN_USE // Currently on a trip
|
|
MAINTENANCE // Out of service
|
|
RESERVED // Scheduled for upcoming trip
|
|
}
|
|
|
|
// ============================================
|
|
// Schedule & Event Management
|
|
// ============================================
|
|
|
|
model ScheduleEvent {
|
|
id String @id @default(uuid())
|
|
vipIds String[] // Array of VIP IDs for multi-passenger trips
|
|
title String
|
|
|
|
// Location details
|
|
pickupLocation String?
|
|
dropoffLocation String?
|
|
location String? // For non-transport events
|
|
|
|
// Timing
|
|
startTime DateTime
|
|
endTime DateTime
|
|
actualStartTime DateTime?
|
|
actualEndTime DateTime?
|
|
|
|
description String? @db.Text
|
|
type EventType @default(TRANSPORT)
|
|
status EventStatus @default(SCHEDULED)
|
|
|
|
// Assignments
|
|
driverId String?
|
|
driver Driver? @relation(fields: [driverId], references: [id], onDelete: SetNull)
|
|
vehicleId String?
|
|
vehicle Vehicle? @relation(fields: [vehicleId], references: [id], onDelete: SetNull)
|
|
|
|
// Metadata
|
|
notes String? @db.Text
|
|
|
|
createdAt DateTime @default(now())
|
|
updatedAt DateTime @updatedAt
|
|
deletedAt DateTime? // Soft delete
|
|
|
|
@@map("schedule_events")
|
|
@@index([driverId])
|
|
@@index([vehicleId])
|
|
@@index([startTime, endTime])
|
|
@@index([status])
|
|
}
|
|
|
|
enum EventType {
|
|
TRANSPORT
|
|
MEETING
|
|
EVENT
|
|
MEAL
|
|
ACCOMMODATION
|
|
}
|
|
|
|
enum EventStatus {
|
|
SCHEDULED
|
|
IN_PROGRESS
|
|
COMPLETED
|
|
CANCELLED
|
|
}
|
|
|