Major: Unified Activity System with Multi-VIP Support & Enhanced Search/Filtering
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>
This commit is contained in:
2026-01-31 16:35:24 +01:00
parent 868f7efc23
commit d2754db377
63 changed files with 7345 additions and 667 deletions

View File

@@ -0,0 +1,16 @@
import { IsArray, IsUUID, IsString, IsOptional, IsInt, Min } from 'class-validator';
export class AddVipsToEventDto {
@IsArray()
@IsUUID('4', { each: true })
vipIds: string[];
@IsInt()
@Min(1)
@IsOptional()
pickupMinutesBeforeEvent?: number; // How many minutes before event should pickup happen (default: 15)
@IsString()
@IsOptional()
pickupLocationOverride?: string; // Override default pickup location
}

View File

@@ -8,8 +8,8 @@ import {
import { EventType, EventStatus } from '@prisma/client';
export class CreateEventDto {
@IsUUID()
vipId: string;
@IsUUID('4', { each: true })
vipIds: string[]; // Array of VIP IDs for multi-passenger trips
@IsString()
title: string;

View File

@@ -1,3 +1,4 @@
export * from './create-event.dto';
export * from './update-event.dto';
export * from './update-event-status.dto';
export * from './add-vips-to-event.dto';

View File

@@ -1,4 +1,9 @@
import { PartialType } from '@nestjs/mapped-types';
import { IsBoolean, IsOptional } from 'class-validator';
import { CreateEventDto } from './create-event.dto';
export class UpdateEventDto extends PartialType(CreateEventDto) {}
export class UpdateEventDto extends PartialType(CreateEventDto) {
@IsBoolean()
@IsOptional()
forceAssign?: boolean; // Allow double-booking drivers with confirmation
}

View File

@@ -3,8 +3,14 @@ import { EventsController } from './events.controller';
import { EventsService } from './events.service';
@Module({
controllers: [EventsController],
providers: [EventsService],
exports: [EventsService],
controllers: [
EventsController,
],
providers: [
EventsService,
],
exports: [
EventsService,
],
})
export class EventsModule {}

View File

@@ -16,6 +16,28 @@ export class EventsService {
async create(createEventDto: CreateEventDto) {
this.logger.log(`Creating event: ${createEventDto.title}`);
// Validate VIPs exist
if (createEventDto.vipIds && createEventDto.vipIds.length > 0) {
const vips = await this.prisma.vIP.findMany({
where: {
id: { in: createEventDto.vipIds },
deletedAt: null,
},
});
if (vips.length !== createEventDto.vipIds.length) {
throw new BadRequestException('One or more VIPs not found');
}
}
// Check vehicle capacity if vehicle is assigned
if (createEventDto.vehicleId && createEventDto.vipIds) {
await this.checkVehicleCapacity(
createEventDto.vehicleId,
createEventDto.vipIds.length,
);
}
// Check for conflicts if driver is assigned
if (createEventDto.driverId) {
const conflicts = await this.checkConflicts(
@@ -40,37 +62,38 @@ export class EventsService {
}
}
return this.prisma.scheduleEvent.create({
const event = await this.prisma.scheduleEvent.create({
data: {
...createEventDto,
startTime: new Date(createEventDto.startTime),
endTime: new Date(createEventDto.endTime),
},
include: {
vip: true,
driver: true,
vehicle: true,
},
});
return this.enrichEventWithVips(event);
}
async findAll() {
return this.prisma.scheduleEvent.findMany({
const events = await this.prisma.scheduleEvent.findMany({
where: { deletedAt: null },
include: {
vip: true,
driver: true,
vehicle: true,
},
orderBy: { startTime: 'asc' },
});
return Promise.all(events.map((event) => this.enrichEventWithVips(event)));
}
async findOne(id: string) {
const event = await this.prisma.scheduleEvent.findFirst({
where: { id, deletedAt: null },
include: {
vip: true,
driver: true,
vehicle: true,
},
@@ -80,17 +103,42 @@ export class EventsService {
throw new NotFoundException(`Event with ID ${id} not found`);
}
return event;
return this.enrichEventWithVips(event);
}
async update(id: string, updateEventDto: UpdateEventDto) {
const event = await this.findOne(id);
// Check for conflicts if driver or times are being updated
// Validate VIPs if being updated
if (updateEventDto.vipIds && updateEventDto.vipIds.length > 0) {
const vips = await this.prisma.vIP.findMany({
where: {
id: { in: updateEventDto.vipIds },
deletedAt: null,
},
});
if (vips.length !== updateEventDto.vipIds.length) {
throw new BadRequestException('One or more VIPs not found');
}
}
// Check vehicle capacity if vehicle or VIPs are being updated
const vehicleId = updateEventDto.vehicleId || event.vehicleId;
const vipCount = updateEventDto.vipIds
? updateEventDto.vipIds.length
: event.vipIds.length;
if (vehicleId && vipCount > 0 && !updateEventDto.forceAssign) {
await this.checkVehicleCapacity(vehicleId, vipCount);
}
// Check for conflicts if driver or times are being updated (unless forceAssign is true)
if (
updateEventDto.driverId ||
updateEventDto.startTime ||
updateEventDto.endTime
!updateEventDto.forceAssign &&
(updateEventDto.driverId ||
updateEventDto.startTime ||
updateEventDto.endTime)
) {
const driverId = updateEventDto.driverId || event.driverId;
const startTime = updateEventDto.startTime
@@ -133,15 +181,19 @@ export class EventsService {
updateData.endTime = new Date(updateEventDto.endTime);
}
return this.prisma.scheduleEvent.update({
// Remove forceAssign from data as it's not a database field
delete updateData.forceAssign;
const updatedEvent = await this.prisma.scheduleEvent.update({
where: { id: event.id },
data: updateData,
include: {
vip: true,
driver: true,
vehicle: true,
},
});
return this.enrichEventWithVips(updatedEvent);
}
async updateStatus(id: string, updateEventStatusDto: UpdateEventStatusDto) {
@@ -151,15 +203,16 @@ export class EventsService {
`Updating event status ${id}: ${event.title} -> ${updateEventStatusDto.status}`,
);
return this.prisma.scheduleEvent.update({
const updatedEvent = await this.prisma.scheduleEvent.update({
where: { id: event.id },
data: { status: updateEventStatusDto.status },
include: {
vip: true,
driver: true,
vehicle: true,
},
});
return this.enrichEventWithVips(updatedEvent);
}
async remove(id: string, hardDelete = false) {
@@ -179,6 +232,31 @@ export class EventsService {
});
}
/**
* Check vehicle capacity
*/
private async checkVehicleCapacity(vehicleId: string, vipCount: number) {
const vehicle = await this.prisma.vehicle.findFirst({
where: { id: vehicleId, deletedAt: null },
});
if (!vehicle) {
throw new NotFoundException('Vehicle not found');
}
if (vipCount > vehicle.seatCapacity) {
this.logger.warn(
`Vehicle capacity exceeded: ${vipCount} VIPs > ${vehicle.seatCapacity} seats`,
);
throw new BadRequestException({
message: `Vehicle capacity exceeded: ${vipCount} VIPs require more than ${vehicle.seatCapacity} available seats`,
capacity: vehicle.seatCapacity,
requested: vipCount,
exceeded: true,
});
}
}
/**
* Check for conflicting events for a driver
*/
@@ -219,4 +297,22 @@ export class EventsService {
},
});
}
/**
* Enrich event with VIP details fetched separately
*/
private async enrichEventWithVips(event: any) {
if (!event.vipIds || event.vipIds.length === 0) {
return { ...event, vips: [] };
}
const vips = await this.prisma.vIP.findMany({
where: {
id: { in: event.vipIds },
deletedAt: null,
},
});
return { ...event, vips };
}
}