c

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

@@ -20,23 +20,50 @@ export async function GET(request: NextRequest) {
         const { password: _, ...userWithoutPassword } = user;
         const client = await db.getClientByUserId(user.id);
 
-        // Get active check-in status
+        // Get active check-in status and statistics for ALL users
         let isCheckedIn = false;
         let checkInTime = null;
+        let lastCheckInTime = null;
+        let checkInsThisWeek = 0;
+        let checkInsThisMonth = 0;
 
-        if (client) {
-          const activeCheckIn = await db.getActiveCheckIn(client.id);
-          if (activeCheckIn) {
-            isCheckedIn = true;
-            checkInTime = activeCheckIn.checkInTime;
-          }
+        // Query attendance by userId (works for all user types now)
+        const activeCheckIn = await db.getActiveCheckIn(user.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
+          checkInTime,
+          lastCheckInTime,
+          checkInsThisWeek,
+          checkInsThisMonth
         };
       }),
     );