Add lessons Phase 3: enrollments with capacity and time conflict checks
Links members to schedule slots via enrollments. Enforces max_students capacity on slots and prevents members from double-booking the same day/time. Supports status transitions and filtering. 11 new tests (51 total lessons tests).
This commit is contained in:
19
packages/backend/src/db/migrations/0030_enrollments.sql
Normal file
19
packages/backend/src/db/migrations/0030_enrollments.sql
Normal file
@@ -0,0 +1,19 @@
|
||||
-- Phase 3: Enrollments — member enrollment in a schedule slot
|
||||
|
||||
CREATE TYPE "enrollment_status" AS ENUM ('active', 'paused', 'cancelled', 'completed');
|
||||
|
||||
CREATE TABLE "enrollment" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
"member_id" uuid NOT NULL REFERENCES "member"("id"),
|
||||
"account_id" uuid NOT NULL REFERENCES "account"("id"),
|
||||
"schedule_slot_id" uuid NOT NULL REFERENCES "schedule_slot"("id"),
|
||||
"instructor_id" uuid NOT NULL REFERENCES "instructor"("id"),
|
||||
"status" enrollment_status NOT NULL DEFAULT 'active',
|
||||
"start_date" date NOT NULL,
|
||||
"end_date" date,
|
||||
"monthly_rate" numeric(10,2),
|
||||
"makeup_credits" integer NOT NULL DEFAULT 0,
|
||||
"notes" text,
|
||||
"created_at" timestamptz NOT NULL DEFAULT now(),
|
||||
"updated_at" timestamptz NOT NULL DEFAULT now()
|
||||
);
|
||||
@@ -211,6 +211,13 @@
|
||||
"when": 1774890000000,
|
||||
"tag": "0029_schedule_slots",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 30,
|
||||
"version": "7",
|
||||
"when": 1774900000000,
|
||||
"tag": "0030_enrollments",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -4,12 +4,15 @@ import {
|
||||
varchar,
|
||||
text,
|
||||
time,
|
||||
date,
|
||||
numeric,
|
||||
timestamp,
|
||||
boolean,
|
||||
integer,
|
||||
pgEnum,
|
||||
} from 'drizzle-orm/pg-core'
|
||||
import { users } from './users.js'
|
||||
import { accounts, members } from './accounts.js'
|
||||
|
||||
// --- Enums ---
|
||||
|
||||
@@ -57,6 +60,37 @@ export const scheduleSlots = pgTable('schedule_slot', {
|
||||
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
})
|
||||
|
||||
export const enrollmentStatusEnum = pgEnum('enrollment_status', [
|
||||
'active',
|
||||
'paused',
|
||||
'cancelled',
|
||||
'completed',
|
||||
])
|
||||
|
||||
export const enrollments = pgTable('enrollment', {
|
||||
id: uuid('id').primaryKey().defaultRandom(),
|
||||
memberId: uuid('member_id')
|
||||
.notNull()
|
||||
.references(() => members.id),
|
||||
accountId: uuid('account_id')
|
||||
.notNull()
|
||||
.references(() => accounts.id),
|
||||
scheduleSlotId: uuid('schedule_slot_id')
|
||||
.notNull()
|
||||
.references(() => scheduleSlots.id),
|
||||
instructorId: uuid('instructor_id')
|
||||
.notNull()
|
||||
.references(() => instructors.id),
|
||||
status: enrollmentStatusEnum('status').notNull().default('active'),
|
||||
startDate: date('start_date').notNull(),
|
||||
endDate: date('end_date'),
|
||||
monthlyRate: numeric('monthly_rate', { precision: 10, scale: 2 }),
|
||||
makeupCredits: integer('makeup_credits').notNull().default(0),
|
||||
notes: text('notes'),
|
||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
})
|
||||
|
||||
// --- Type exports ---
|
||||
|
||||
export type Instructor = typeof instructors.$inferSelect
|
||||
@@ -65,3 +99,5 @@ export type LessonType = typeof lessonTypes.$inferSelect
|
||||
export type LessonTypeInsert = typeof lessonTypes.$inferInsert
|
||||
export type ScheduleSlot = typeof scheduleSlots.$inferSelect
|
||||
export type ScheduleSlotInsert = typeof scheduleSlots.$inferInsert
|
||||
export type Enrollment = typeof enrollments.$inferSelect
|
||||
export type EnrollmentInsert = typeof enrollments.$inferInsert
|
||||
|
||||
Reference in New Issue
Block a user