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

@@ -20,50 +20,23 @@ export async function GET(request: NextRequest) {
         const { password: _, ...userWithoutPassword } = user;
         const client = await db.getClientByUserId(user.id);
 
-        // Get active check-in status and statistics for ALL users
+        // Get active check-in status
         let isCheckedIn = false;
         let checkInTime = null;
-        let lastCheckInTime = null;
-        let checkInsThisWeek = 0;
-        let checkInsThisMonth = 0;
 
-        // Query attendance by userId (works for all user types now)
-        const activeCheckIn = await db.getActiveCheckIn(user.id);
+        if (client) {
+          const activeCheckIn = await db.getActiveCheckIn(client.id);
           if (activeCheckIn) {
             isCheckedIn = true;
             checkInTime = activeCheckIn.checkInTime;
           }
-
-        // Get attendance history for statistics
-        const attendanceHistory = await db.getAttendanceHistory(user.id);
-
-        if (attendanceHistory.length > 0) {
-          // Last check-in is the most recent attendance record
-          lastCheckInTime = attendanceHistory[0].checkInTime;
-
-          // Calculate check-ins in last 7 days
-          const weekAgo = new Date();
-          weekAgo.setDate(weekAgo.getDate() - 7);
-          checkInsThisWeek = attendanceHistory.filter(
-            a => new Date(a.checkInTime) >= weekAgo
-          ).length;
-
-          // Calculate check-ins in last 30 days
-          const monthAgo = new Date();
-          monthAgo.setDate(monthAgo.getDate() - 30);
-          checkInsThisMonth = attendanceHistory.filter(
-            a => new Date(a.checkInTime) >= monthAgo
-          ).length;
         }
 
         return {
           ...userWithoutPassword,
           client,
           isCheckedIn,
-          checkInTime,
-          lastCheckInTime,
-          checkInsThisWeek,
-          checkInsThisMonth
+          checkInTime
         };
       }),
     );

apps/admin/src/components/users/UserManagement.tsx

@@ -15,9 +15,6 @@ interface User {
   createdAt: Date;
   isCheckedIn?: boolean;
   checkInTime?: Date;
-  lastCheckInTime?: Date;
-  checkInsThisWeek?: number;
-  checkInsThisMonth?: number;
   client?: {
     id: string;
     membershipType: string;
@@ -449,7 +446,7 @@ export function UserManagement() {
             </a>
           </CardHeader>
           <CardContent>
-            <div className="grid grid-cols-3 gap-4">
+            <div className="grid grid-cols-2 gap-4">
               <div>
                 <h4 className="font-medium mb-2">Basic Information</h4>
                 <div className="space-y-1 text-sm">
@@ -505,30 +502,6 @@ export function UserManagement() {
                   </div>
                 </div>
               )}
-
-              {selectedUser.client && (
-                <div>
-                  <h4 className="font-medium mb-2">Check-In Statistics</h4>
-                  <div className="space-y-1 text-sm">
-                    <p>
-                      <span className="font-medium">Last Check-In:</span>{" "}
-                      {selectedUser.lastCheckInTime
-                        ? new Date(
-                          selectedUser.lastCheckInTime,
-                        ).toLocaleString()
-                        : "Never"}
-                    </p>
-                    <p>
-                      <span className="font-medium">This Week:</span>{" "}
-                      {selectedUser.checkInsThisWeek || 0} check-ins
-                    </p>
-                    <p>
-                      <span className="font-medium">This Month:</span>{" "}
-                      {selectedUser.checkInsThisMonth || 0} check-ins
-                    </p>
-                  </div>
-                </div>
-              )}
             </div>
           </CardContent>
         </Card>

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

@@ -106,61 +106,19 @@ export class SQLiteDatabase implements IDatabase {
       CREATE INDEX IF NOT EXISTS idx_fitness_profiles_userId ON fitness_profiles(userId);
     `)
 
-    // Attendance table migration: change from clientId to userId
-    // Check if old table exists and migrate
-    const tableInfo = this.db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='attendance'").get() as any;
-
-    if (tableInfo) {
-      // Check if table has clientId column (old schema)
-      const columns = this.db.prepare("PRAGMA table_info(attendance)").all() as any[];
-      const hasClientId = columns.some((col: any) => col.name === 'clientId');
-
-      if (hasClientId) {
-        console.log('Migrating attendance table from clientId to userId...');
-
-        // Create new table with userId
-        this.db.exec(`
-          CREATE TABLE IF NOT EXISTS attendance_new (
-            id TEXT PRIMARY KEY,
-            userId TEXT NOT NULL,
-            checkInTime DATETIME NOT NULL,
-            checkOutTime DATETIME,
-            type TEXT NOT NULL CHECK (type IN ('gym', 'class', 'personal_training')),
-            notes TEXT,
-            createdAt DATETIME NOT NULL,
-            FOREIGN KEY (userId) REFERENCES users (id) ON DELETE CASCADE
-          )
-        `);
-
-        // Migrate data: map clientId to userId via clients table
-        this.db.exec(`
-          INSERT INTO attendance_new (id, userId, checkInTime, checkOutTime, type, notes, createdAt)
-          SELECT a.id, c.userId, a.checkInTime, a.checkOutTime, a.type, a.notes, a.createdAt
-          FROM attendance a
-          JOIN clients c ON a.clientId = c.id
-        `);
-
-        // Drop old table and rename new one
-        this.db.exec(`DROP TABLE attendance`);
-        this.db.exec(`ALTER TABLE attendance_new RENAME TO attendance`);
-
-        console.log('Attendance table migration completed');
-      }
-    } else {
-      // Create new attendance table with userId
+    // Attendance table
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS attendance (
         id TEXT PRIMARY KEY,
-          userId TEXT NOT NULL,
+        clientId TEXT NOT NULL,
         checkInTime DATETIME NOT NULL,
         checkOutTime DATETIME,
         type TEXT NOT NULL CHECK (type IN ('gym', 'class', 'personal_training')),
         notes TEXT,
         createdAt DATETIME NOT NULL,
-          FOREIGN KEY (userId) REFERENCES users (id) ON DELETE CASCADE
+        FOREIGN KEY (clientId) REFERENCES clients (id) ON DELETE CASCADE
       )
-      `);
-    }
+    `)
 
     // Recommendations table
     // Removed DROP TABLE to persist data. Schema is now stable.
@@ -182,16 +140,16 @@ export class SQLiteDatabase implements IDatabase {
         FOREIGN KEY (userId) REFERENCES users (id) ON DELETE CASCADE,
         FOREIGN KEY (fitnessProfileId) REFERENCES fitness_profiles (userId)
       )
-    `);
+    `)
 
     this.db.exec(`
       CREATE INDEX IF NOT EXISTS idx_recommendations_userId ON recommendations(userId);
-    `);
+    `)
 
     this.db.exec(`
-      CREATE INDEX IF NOT EXISTS idx_attendance_userId ON attendance(userId);
+      CREATE INDEX IF NOT EXISTS idx_attendance_clientId ON attendance(clientId);
       CREATE INDEX IF NOT EXISTS idx_attendance_checkInTime ON attendance(checkInTime);
-    `);
+    `)
   }
 
   // User operations
@@ -431,7 +389,7 @@ export class SQLiteDatabase implements IDatabase {
   }
 
   // Attendance operations
-  async checkIn(userId: string, type: 'gym' | 'class' | 'personal_training', notes?: string): Promise<Attendance> {
+  async checkIn(clientId: string, type: 'gym' | 'class' | 'personal_training', notes?: string): Promise<Attendance> {
     if (!this.db) throw new Error('Database not connected')
 
     const id = Math.random().toString(36).substr(2, 9)
@@ -439,7 +397,7 @@ export class SQLiteDatabase implements IDatabase {
 
     const attendance: Attendance = {
       id,
-      userId,
+      clientId,
       checkInTime: now,
       type,
       notes,
@@ -447,23 +405,20 @@ export class SQLiteDatabase implements IDatabase {
     }
 
     const stmt = this.db.prepare(
-      `INSERT INTO attendance(id, userId, checkInTime, type, notes, createdAt)
+      `INSERT INTO attendance(id, clientId, checkInTime, type, notes, createdAt)
     VALUES(?, ?, ?, ?, ?, ?)`
     )
 
     stmt.run(
-      attendance.id, attendance.userId, attendance.checkInTime.toISOString(),
+      attendance.id, attendance.clientId, attendance.checkInTime.toISOString(),
       attendance.type, attendance.notes, attendance.createdAt.toISOString()
     )
 
-    // Update client last visit if user is a client
-    const client = await this.getClientByUserId(userId);
-    if (client) {
+    // Update client last visit
     this.db.prepare('UPDATE clients SET lastVisit = ? WHERE id = ?').run(
       now.toISOString(),
-        client.id
-      );
-    }
+      clientId
+    )
 
     return attendance
   }
@@ -485,10 +440,10 @@ export class SQLiteDatabase implements IDatabase {
     return row ? this.mapRowToAttendance(row) : null
   }
 
-  async getAttendanceHistory(userId: string): Promise<Attendance[]> {
+  async getAttendanceHistory(clientId: string): Promise<Attendance[]> {
     if (!this.db) throw new Error('Database not connected')
-    const stmt = this.db.prepare('SELECT * FROM attendance WHERE userId = ? ORDER BY checkInTime DESC')
-    const rows = stmt.all(userId)
+    const stmt = this.db.prepare('SELECT * FROM attendance WHERE clientId = ? ORDER BY checkInTime DESC')
+    const rows = stmt.all(clientId)
     return rows.map(row => this.mapRowToAttendance(row))
   }
 
@@ -499,10 +454,10 @@ export class SQLiteDatabase implements IDatabase {
     return rows.map(row => this.mapRowToAttendance(row))
   }
 
-  async getActiveCheckIn(userId: string): Promise<Attendance | null> {
+  async getActiveCheckIn(clientId: string): Promise<Attendance | null> {
     if (!this.db) throw new Error('Database not connected')
-    const stmt = this.db.prepare('SELECT * FROM attendance WHERE userId = ? AND checkOutTime IS NULL ORDER BY checkInTime DESC LIMIT 1')
-    const row = stmt.get(userId)
+    const stmt = this.db.prepare('SELECT * FROM attendance WHERE clientId = ? AND checkOutTime IS NULL ORDER BY checkInTime DESC LIMIT 1')
+    const row = stmt.get(clientId)
     return row ? this.mapRowToAttendance(row) : null
   }
 
@@ -554,7 +509,7 @@ export class SQLiteDatabase implements IDatabase {
   private mapRowToAttendance(row: any): Attendance {
     return {
       id: row.id,
-      userId: row.userId,
+      clientId: row.clientId,
       checkInTime: new Date(row.checkInTime),
       checkOutTime: row.checkOutTime ? new Date(row.checkOutTime) : undefined,
       type: row.type,

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

@@ -39,7 +39,7 @@ export interface FitnessProfile {
 
 export interface Attendance {
   id: string;
-  userId: string;
+  clientId: string;
   checkInTime: Date;
   checkOutTime?: Date;
   type: "gym" | "class" | "personal_training";
@@ -121,14 +121,14 @@ export interface IDatabase {
 
   // Attendance operations
   checkIn(
-    userId: string,
+    clientId: string,
     type: "gym" | "class" | "personal_training",
     notes?: string,
   ): Promise<Attendance>;
   checkOut(attendanceId: string): Promise<Attendance | null>;
-  getAttendanceHistory(userId: string): Promise<Attendance[]>;
+  getAttendanceHistory(clientId: string): Promise<Attendance[]>;
   getAllAttendance(): Promise<Attendance[]>;
-  getActiveCheckIn(userId: string): Promise<Attendance | null>;
+  getActiveCheckIn(clientId: string): Promise<Attendance | null>;
 
   // Recommendation operations
   createRecommendation(