invite and saving fitness profile

added, need polishing

apps/admin/src/app/api/fitness-profile/route.ts

@@ -16,10 +16,20 @@ export async function GET(request: NextRequest) {
 
     const profile = db
       .prepare(
-        `SELECT * FROM fitness_profiles WHERE user_id = ?`
+        `SELECT * FROM fitness_profiles WHERE userId = ?`
       )
       .get(userId);
 
+    if (profile) {
+      const p = profile as any;
+      // Parse JSON fields
+      try {
+        p.fitnessGoals = JSON.parse(p.fitnessGoals || '[]');
+      } catch (e) {
+        p.fitnessGoals = [];
+      }
+    }
+
     return NextResponse.json({ profile: profile || null });
   } catch (error) {
     console.error("Error fetching fitness profile:", error);
@@ -45,19 +55,22 @@ export async function POST(request: NextRequest) {
       weight,
       age,
       gender,
-      fitnessGoal,
+      fitnessGoals, // Changed from fitnessGoal
       activityLevel,
       medicalConditions,
       allergies,
       injuries,
+      exerciseHabits,
+      dietHabits
     } = body;
 
     // Check if profile exists
     const existingProfile = db
-      .prepare(`SELECT id FROM fitness_profiles WHERE user_id = ?`)
-      .get(userId) as { id: string } | undefined;
+      .prepare(`SELECT userId FROM fitness_profiles WHERE userId = ?`)
+      .get(userId) as { userId: string } | undefined;
 
-    const now = Date.now();
+    const now = new Date().toISOString();
+    const fitnessGoalsJson = JSON.stringify(fitnessGoals || []);
 
     if (existingProfile) {
       // Update existing profile
@@ -67,52 +80,55 @@ export async function POST(request: NextRequest) {
              weight = ?,
              age = ?,
              gender = ?,
-             fitness_goal = ?,
-             activity_level = ?,
-             medical_conditions = ?,
+             fitnessGoals = ?,
+             activityLevel = ?,
+             medicalConditions = ?,
              allergies = ?,
              injuries = ?,
-             updated_at = ?
-         WHERE user_id = ?`
+             exerciseHabits = ?,
+             dietHabits = ?,
+             updatedAt = ?
+         WHERE userId = ?`
       ).run(
         height || null,
         weight || null,
         age || null,
         gender || null,
-        fitnessGoal || null,
+        fitnessGoalsJson,
         activityLevel || null,
         medicalConditions || null,
         allergies || null,
         injuries || null,
+        exerciseHabits || null,
+        dietHabits || null,
         now,
         userId
       );
 
       return NextResponse.json({
         message: "Fitness profile updated successfully",
-        profileId: existingProfile.id,
+        userId: userId,
       });
     } else {
       // Create new profile
-      const profileId = `fp_${randomBytes(16).toString("hex")}`;
-
       db.prepare(
         `INSERT INTO fitness_profiles
-         (id, user_id, height, weight, age, gender, fitness_goal, activity_level,
-          medical_conditions, allergies, injuries, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+         (userId, height, weight, age, gender, fitnessGoals, activityLevel,
+          medicalConditions, allergies, injuries, exerciseHabits, dietHabits, createdAt, updatedAt)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       ).run(
-        profileId,
         userId,
         height || null,
         weight || null,
         age || null,
         gender || null,
-        fitnessGoal || null,
+        fitnessGoalsJson,
         activityLevel || null,
         medicalConditions || null,
         allergies || null,
         injuries || null,
+        exerciseHabits || null,
+        dietHabits || null,
         now,
         now
       );
@@ -120,7 +136,7 @@ export async function POST(request: NextRequest) {
       return NextResponse.json(
         {
           message: "Fitness profile created successfully",
-          profileId,
+          userId,
         },
         { status: 201 }
       );

apps/admin/src/app/api/users/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getDatabase } from "../../../lib/database/index";
 import bcrypt from "bcryptjs";
-import { auth } from "@clerk/nextjs/server";
+import { auth, clerkClient } from "@clerk/nextjs/server";
 
 export async function GET(request: NextRequest) {
   try {
@@ -64,9 +64,9 @@ export async function POST(request: NextRequest) {
     }
 
     const body = await request.json();
-    const { email, password, firstName, lastName, role, phone } = body;
+    const { email, firstName, lastName, role, phone } = body;
 
-    if (!email || !password || !firstName || !lastName || !role) {
+    if (!email || !firstName || !lastName || !role) {
       return NextResponse.json(
         { error: "Missing required fields" },
         { status: 400 },
@@ -75,7 +75,7 @@ export async function POST(request: NextRequest) {
 
     // Enforce Hierarchy
     const allowed = {
-      superAdmin: ["admin", "trainer", "client"], // Super Admin can create anyone (except maybe another superAdmin via this UI?)
+      superAdmin: ["admin", "trainer", "client"],
       admin: ["trainer", "client"],
       trainer: ["client"],
       client: []
@@ -89,7 +89,7 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    // Check if user already exists
+    // Check if user already exists locally
     const existingUser = await db.getUserByEmail(email);
     if (existingUser) {
       return NextResponse.json(
@@ -98,13 +98,38 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    // Hash password
-    const hashedPassword = await bcrypt.hash(password, 12);
+    // Create Clerk Invitation
+    // Note: We pass the role in publicMetadata so it persists when they sign up
+    try {
+      const client = await clerkClient();
+      await client.invitations.createInvitation({
+        emailAddress: email,
+        publicMetadata: {
+          role,
+        },
+        ignoreExisting: true // Don't fail if invite exists
+      });
+    } catch (clerkError: any) {
+      console.error("Clerk invitation error:", clerkError);
+      // If user already exists in Clerk, we might want to handle it.
+      // But for now, let's proceed to create local record if invite sent or if they exist.
+      if (clerkError.errors?.[0]?.code === 'form_identifier_exists') {
+        return NextResponse.json(
+          { error: "User already exists in Clerk system" },
+          { status: 409 },
+        );
+      }
+      return NextResponse.json(
+        { error: "Failed to send invitation: " + (clerkError.message || "Unknown error") },
+        { status: 500 },
+      );
+    }
 
-    // Create user
+    // Create user in local DB with temporary ID (will be migrated on first login)
+    // We set a placeholder password since it's required by schema but won't be used
     const newUserId = await db.createUser({
       email,
-      password: hashedPassword,
+      password: "INVITED_USER_PENDING",
       firstName,
       lastName,
       role,
@@ -121,7 +146,7 @@ export async function POST(request: NextRequest) {
       });
     }
 
-    return NextResponse.json({ userId: newUserId.id }, { status: 201 });
+    return NextResponse.json({ userId: newUserId.id, message: "Invitation sent" }, { status: 201 });
   } catch (error) {
     console.error("Create user error:", error);
     return NextResponse.json(