Merge pull request #93 from hack4impact/new-kids-adults-services-schemas

Feature/83 create schemas to differentiate services

Author: martin0024

.gitignore

@@ -50,8 +50,6 @@ next-env.d.ts
 *.swo
 *~
 
-# drizzle
-drizzle/meta/
 
 # supabase
 .supabase/

app/(authenticated)/forms/_components/form-question-shared.ts

@@ -1,4 +1,4 @@
-import type { ExtraQuestionType } from "../queries";
+import type { FormQuestionType } from "../queries";
 
 export type DraftOption = {
    id: string;
@@ -8,12 +8,12 @@ export type DraftOption = {
 
 export type DraftQuestion = {
    clientId: string;
-   type: ExtraQuestionType;
+   type: FormQuestionType;
    prompt: string;
    options?: DraftOption[];
 };
 
-export const QUESTION_TYPE_LABELS: Record<ExtraQuestionType, string> = {
+export const QUESTION_TYPE_LABELS: Record<FormQuestionType, string> = {
    text: "Text",
    multiple_choices: "Multiple choice",
    checkboxes: "Checkboxes",
@@ -28,7 +28,7 @@ export function emptyQuestion(): DraftQuestion {
    };
 }
 
-export function needsOptions(type: ExtraQuestionType): boolean {
+export function needsOptions(type: FormQuestionType): boolean {
    return type === "multiple_choices" || type === "checkboxes";
 }
 

app/(authenticated)/forms/_components/question-edit-dialog.tsx

@@ -29,7 +29,7 @@ import {
    needsOptions,
    QUESTION_TYPE_LABELS,
 } from "./form-question-shared";
-import type { ExtraQuestionType } from "../queries";
+import type { FormQuestionType } from "../queries";
 
 function FieldError({ messages }: { messages?: string[] }) {
    if (!messages?.length) return null;
@@ -207,7 +207,7 @@ export function QuestionEditDialog({
                   <Select
                      value={draft.type}
                      onValueChange={(v) => {
-                        const type = v as ExtraQuestionType;
+                        const type = v as FormQuestionType;
                         setDraft((prev) => {
                            if (!prev) return prev;
                            return {
@@ -227,7 +227,7 @@ export function QuestionEditDialog({
                      </SelectTrigger>
                      <SelectContent>
                         {(
-                           Object.keys(QUESTION_TYPE_LABELS) as ExtraQuestionType[]
+                           Object.keys(QUESTION_TYPE_LABELS) as FormQuestionType[]
                         ).map((t) => (
                            <SelectItem key={t} value={t}>
                               {QUESTION_TYPE_LABELS[t]}

app/(authenticated)/forms/actions.ts

@@ -4,7 +4,7 @@ import { revalidatePath, updateTag } from "next/cache";
 import { count, eq } from "drizzle-orm";
 import { z } from "zod";
 import { db } from "@/lib/db";
-import { extraQuestions, forms, services } from "@/lib/db/schema";
+import { formQuestions, forms, services } from "@/lib/db/schema";
 import { requireAdmin } from "@/lib/auth/require-admin";
 import {
    createFormSchema,
@@ -93,7 +93,7 @@ async function insertQuestions(
 ) {
    if (questions.length === 0) return;
 
-   await client.insert(extraQuestions).values(
+   await client.insert(formQuestions).values(
       questions.map((q, index) => ({
          formId,
          sortOrder: index,
@@ -185,8 +185,8 @@ export async function updateForm(
             .where(eq(forms.id, form_id));
 
          await tx
-            .delete(extraQuestions)
-            .where(eq(extraQuestions.formId, form_id));
+            .delete(formQuestions)
+            .where(eq(formQuestions.formId, form_id));
          await insertQuestions(form_id, questions, tx);
       });
    } catch {

app/(authenticated)/forms/queries.ts

@@ -1,21 +1,21 @@
 import {
-   ExtraQuestionOption,
-   extraQuestions,
+   FormQuestionOption,
+   formQuestions,
    forms,
    services,
 } from "@/lib/db/schema";
 import { cacheTag } from "next/cache";
 import { db } from "@/lib/db";
 import { asc, count, desc, eq, sql } from "drizzle-orm";
 
-export type ExtraQuestionType = "text" | "multiple_choices" | "checkboxes" | "user_agreement";
+export type FormQuestionType = "text" | "multiple_choices" | "checkboxes" | "user_agreement";
 
 export type QuestionView = {
     id: string;
     sortOrder: number;
-    type: ExtraQuestionType;
+    type: FormQuestionType;
     prompt: string;
-    options: ExtraQuestionOption[] | null;
+    options: FormQuestionOption[] | null;
 }
 
 export type FormListItem = {
@@ -42,11 +42,11 @@ export async function listForms(): Promise<FormListItem[]> {
          name: forms.name,
          createdAt: forms.createdAt,
          updatedAt: forms.updatedAt,
-         questionCount: sql<number>`cast(count(distinct ${extraQuestions.id}) as integer)`,
+         questionCount: sql<number>`cast(count(distinct ${formQuestions.id}) as integer)`,
          attachedServiceCount: sql<number>`cast(count(distinct ${services.id}) as integer)`,
       })
       .from(forms)
-      .leftJoin(extraQuestions, eq(extraQuestions.formId, forms.id))
+      .leftJoin(formQuestions, eq(formQuestions.formId, forms.id))
       .leftJoin(services, eq(services.formId, forms.id))
       .groupBy(forms.id, forms.name, forms.createdAt, forms.updatedAt)
       .orderBy(desc(forms.createdAt));
@@ -76,15 +76,15 @@ export async function getForm(id: string): Promise<FormView | null> {
 
     const questionRows = await db
       .select({
-        id: extraQuestions.id,
-        sortOrder: extraQuestions.sortOrder,
-        type: extraQuestions.type,
-        prompt: extraQuestions.prompt,
-        options: extraQuestions.options,
+        id: formQuestions.id,
+        sortOrder: formQuestions.sortOrder,
+        type: formQuestions.type,
+        prompt: formQuestions.prompt,
+        options: formQuestions.options,
       })
-      .from(extraQuestions)
-      .where(eq(extraQuestions.formId, id))
-      .orderBy(asc(extraQuestions.sortOrder));
+      .from(formQuestions)
+      .where(eq(formQuestions.formId, id))
+      .orderBy(asc(formQuestions.sortOrder));
 
     const [serviceRow] = await db
       .select({ count: count() })

docs/schema-overview.md

@@ -7,19 +7,31 @@ erDiagram
         text first_name
         text last_name
         role role
+        text stripe_customer_id
+        timestamp last_login_at
+        timestamp created_at
+        timestamp updated_at
+    }
+
+    forms {
+        uuid id PK
+        text name
         timestamp created_at
         timestamp updated_at
     }
 
     services {
         uuid id PK
-        text title
-        text description
         service_type type
-        jsonb scheduled_at "null for coaching_session"
+        date start_date "null for private_lessons"
+        date end_date "null for private_lessons"
+        jsonb slots "array of {dayOfWeek, time}; null for private_lessons"
         int duration_minutes
-        int price
-        boolean is_active
+        text stripe_product_id
+        service_status status
+        uuid coach_id FK "null for programs"
+        uuid form_id FK "nullable"
+        boolean is_for_children
         timestamp created_at
         timestamp updated_at
     }
@@ -28,9 +40,11 @@ erDiagram
         uuid id PK
         uuid user_id FK
         uuid service_id FK
+        uuid child_id FK "nullable; null means adult registration"
         booking_status status
         text notes
         boolean is_active
+        text stripe_order_id
         timestamp created_at
         timestamp updated_at
     }
@@ -52,12 +66,41 @@ erDiagram
         uuid service_id FK
         uuid coach_id FK
         uuid user_id FK
-        timestamp scheduled_at
-        int duration_minutes
+        uuid child_id FK "nullable; null means adult registration"
+        timestamp scheduled_at "set when slot is confirmed"
         session_status status
         text meeting_url
         text notes
         jsonb selected_time_slots "array of {start, end} objects"
+        jsonb coach_time_slots
+        text coach_token
+        text client_token
+        text stripe_order_id
+        timestamp created_at
+        timestamp updated_at
+    }
+
+    subscriptions {
+        uuid id PK
+        uuid user_id FK
+        text stripe_subscription_id
+        text status
+        text stripe_price_id
+        boolean cancel_at_period_end
+        text payment_method_brand
+        text payment_method_last4
+        timestamp created_at
+        timestamp updated_at
+    }
+
+    purchases {
+        uuid id PK
+        uuid user_id FK
+        text stripe_price_id
+        text stripe_session_id
+        text product_name
+        int amount
+        text currency
         timestamp created_at
         timestamp updated_at
     }
@@ -87,19 +130,20 @@ erDiagram
         timestamp updated_at
     }
 
-    extra_questions {
+    form_questions {
         uuid id PK
-        uuid service_id FK
-        extra_question_type type
+        uuid form_id FK
+        form_question_type type
         text prompt
         jsonb options
+        int sort_order
         timestamp created_at
         timestamp updated_at
     }
 
-    extra_question_answers {
+    form_question_answers {
         uuid id PK
-        uuid extra_question_id FK
+        uuid form_question_id FK
         uuid child_id FK
         text answer "text[]"
         timestamp created_at
@@ -108,24 +152,37 @@ erDiagram
 
     profiles ||--o{ service_bookings : "books"
     services ||--o{ service_bookings : "booked via"
+    children |o--o{ service_bookings : "registered for"
     profiles ||--o{ coaching_sessions : "coaches"
     profiles ||--o{ coaching_sessions : "attends"
     services ||--o{ coaching_sessions : "fulfilled by"
+    children |o--o{ coaching_sessions : "registered for"
     profiles ||--o{ children : "parent of"
     children ||--o{ emergency_contacts : "has"
-    services ||--o{ extra_questions : "defines"
-    extra_questions ||--o{ extra_question_answers : "answered via"
-    children ||--o{ extra_question_answers : "submits"
+    profiles ||--o| subscriptions : "has"
+    profiles ||--o{ purchases : "makes"
+    profiles |o--o{ services : "coaches"
+    forms ||--o{ form_questions : "contains"
+    services }o--o| forms : "uses"
+    form_questions ||--o{ form_question_answers : "answered via"
+    children ||--o{ form_question_answers : "submits"
 ```
 
+## Indexes
+
+| Table | Index | Type | Condition |
+|---|---|---|---|
+| `service_bookings` | `service_bookings_service_id_child_id_idx` | Unique (partial) | `WHERE child_id IS NOT NULL` — prevents the same child from registering for the same program twice |
+
 ## Enums
 
 | Enum | Values |
 |---|---|
 | `role` | `user`, `admin`, `coach` |
-| `service_type` | `coaching_session`, `booking` |
-| `booking_status` | `pending`, `confirmed`, `cancelled` |
+| `service_type` | `private_lessons`, `programs` |
+| `service_status` | `active`, `disabled`, `archived`, `deleted` |
+| `booking_status` | `awaiting_payment`, `pending`, `confirmed`, `cancelled` |
+| `session_status` | `awaiting_payment`, `pending`, `confirmed`, `cancelled`, `completed` |
 | `webinar_tier` | `free`, `premium` |
-| `session_status` | `pending`, `confirmed`, `cancelled`, `completed` |
 | `gender` | `male`, `female`, `prefer_not_to_say` |
-| `extra_question_type` | `text`, `multiple_choices`, `checkboxes`, `user_agreement` |
+| `form_question_type` | `text`, `multiple_choices`, `checkboxes`, `user_agreement` |