cleanup

and AI recommnedation fix

apps/admin/src/lib/ai/ai-context.ts

@@ -1,17 +1,11 @@
 import { getDatabase } from '@/lib/database';
-import type { FitnessGoal } from '@/lib/database/types';
-
-// Import types from database package
-import type {
-    FitnessProfile as DBFitnessProfile,
-    Recommendation as DBRecommendation,
-} from '@fitai/database';
+import type { FitnessGoal, FitnessProfile, Recommendation } from '@/lib/database/types';
 
 export interface AIContext {
-    profile: DBFitnessProfile;
+    profile: FitnessProfile;
     activeGoals: FitnessGoal[];
     completedGoals: FitnessGoal[];
-    recentRecommendations: DBRecommendation[];
+    recentRecommendations: Recommendation[];
     progressSummary: {
         goalsCompleted: number;
         goalsActive: number;

apps/admin/src/lib/ai/prompt-builder.ts

@@ -32,7 +32,7 @@ export function buildEnhancedPrompt(context: AIContext): string {
 - Weight: ${profile.weight || 'Not specified'} kg
 - Age: ${profile.age || 'Not specified'}
 - Gender: ${profile.gender || 'Not specified'}
-- Primary Goal: ${profile.fitnessGoal || 'General fitness'}
+- Primary Goal: ${profile.fitnessGoals?.[0] || 'General fitness'}
 - Activity Level: ${profile.activityLevel || 'Not specified'}
 - Medical Conditions: ${profile.medicalConditions || 'None'}
 - Allergies: ${profile.allergies || 'None'}
@@ -77,7 +77,7 @@ Generate a detailed daily recommendation for a user with the following profile:
 - Weight: ${profile.weight} kg
 - Age: ${profile.age}
 - Gender: ${profile.gender}
-- Goal: ${profile.fitnessGoal}
+- Goal: ${profile.fitnessGoals?.[0]}
 - Activity Level: ${profile.activityLevel}
 - Medical Conditions: ${profile.medicalConditions || "None"}
 - Injuries: ${profile.injuries || "None"}

apps/admin/src/lib/database/drizzle.ts

@@ -246,7 +246,7 @@ export class DrizzleDatabase implements IDatabase {
     }
 
     // Fitness Profile operations
-    async createFitnessProfile(profileData: Omit<FitnessProfile, 'createdAt' | 'updatedAt'>): Promise<FitnessProfile> {
+    async createFitnessProfile(profileData: Omit<FitnessProfile, 'id' | 'createdAt' | 'updatedAt'>): Promise<FitnessProfile> {
         const now = new Date()
         const id = Math.random().toString(36).substr(2, 9)
         const newProfile = {
@@ -257,7 +257,7 @@ export class DrizzleDatabase implements IDatabase {
         }
 
         await this.db.insert(fitnessProfiles).values(newProfile as any)
-        return { ...profileData, createdAt: now, updatedAt: now }
+        return { id, ...profileData, createdAt: now, updatedAt: now }
     }
 
     async getFitnessProfileByUserId(userId: string): Promise<FitnessProfile | null> {

apps/admin/src/lib/database/types.ts

@@ -1,86 +1,12 @@
+import { User as SharedUser, Client, FitnessProfile, Attendance, Recommendation, FitnessGoal } from "@fitai/shared";
+
 // Database Entity Types
-export interface User {
-  id: string;
-  email: string;
-  firstName: string;
-  lastName: string;
+export interface User extends SharedUser {
   password: string;
-  phone?: string;
-  role: "superAdmin" | "admin" | "trainer" | "client";
-  createdAt: Date;
-  updatedAt: Date;
 }
 
-export interface Client {
-  id: string;
-  userId: string;
-  membershipType: "basic" | "premium" | "vip";
-  membershipStatus: "active" | "inactive" | "expired";
-  joinDate: Date;
-  lastVisit?: Date;
-}
+export type { Client, FitnessProfile, Attendance, Recommendation, FitnessGoal };
 
-export interface FitnessProfile {
-  userId: string;
-  height: string;
-  weight: string;
-  age: string;
-  gender: "male" | "female" | "other";
-  activityLevel: "sedentary" | "lightly_active" | "moderately_active" | "very_active" | "extremely_active";
-  fitnessGoals: string[];
-  exerciseHabits: string;
-  dietHabits: string;
-  medicalConditions: string;
-  allergies?: string;
-  injuries?: string;
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-export interface Attendance {
-  id: string;
-  userId: string;
-  checkInTime: Date;
-  checkOutTime?: Date;
-  type: "gym" | "class" | "personal_training";
-  notes?: string;
-  createdAt: Date;
-}
-
-export interface Recommendation {
-  id: string;
-  userId: string;
-  fitnessProfileId?: string;
-  type: "short_term" | "medium_term" | "long_term" | "ai_plan";
-  content: string;
-  activityPlan?: string;
-  dietPlan?: string;
-  status: "pending" | "approved" | "rejected" | "completed";
-  createdAt: Date;
-  approvedAt?: Date;
-  approvedBy?: string;
-}
-
-export interface FitnessGoal {
-  id: string;
-  userId: string;
-  fitnessProfileId?: string;
-  goalType: "weight_target" | "strength_milestone" | "endurance_target" | "flexibility_goal" | "habit_building" | "custom";
-  title: string;
-  description?: string;
-  targetValue?: number;
-  currentValue?: number;
-  unit?: string;
-  startDate: Date;
-  targetDate?: Date;
-  completedDate?: Date;
-  status: "active" | "completed" | "abandoned" | "paused";
-  progress: number;
-  priority: "low" | "medium" | "high";
-  notes?: string;
-  createdAt: Date;
-  updatedAt: Date;
-}
 
 // Database Interface - allows us to swap implementations
 export interface IDatabase {

apps/admin/src/lib/utils.ts

@@ -1,14 +1 @@
-import { type ClassValue, clsx } from "clsx"
-import { twMerge } from "tailwind-merge"
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
-}
-
-export function formatDate(date: string | Date) {
-  return new Date(date).toLocaleDateString("en-US", {
-    month: "long",
-    day: "numeric",
-    year: "numeric",
-  })
-}
+export { cn, formatDate } from "@fitai/shared"