🚀 Release: beta → master

src/modules/employees/employees.repository.ts

@@ -64,7 +64,7 @@ export const employeesRepository = {
 
     let q = orgTable(request, "employees")
       .select(EMPLOYEE_COLS, { count: "exact" })
-      .order("name", { ascending: true })
+      .order("employee_code", { ascending: true })
       .range(offset, offset + limit - 1);
 
     if (active !== undefined) {
@@ -154,11 +154,12 @@ export const employeesRepository = {
       last_latitude: number | null;
       last_longitude: number | null;
       last_location_at: string | null;
+      activity_status: "ACTIVE" | "RECENT" | "INACTIVE";
     })[];
     total: number;
     source: "snapshot" | "employees";
   }> {
-    const { page, limit, active, search } = query;
+    const { page, limit, active, search, segment } = query;
     const offset = (page - 1) * limit;
 
     let q = supabase
@@ -172,7 +173,7 @@ export const employeesRepository = {
         { count: "exact" },
       )
       .eq("organization_id", request.organizationId)
-      .order("name", { ascending: true })
+      .order("employee_code", { ascending: true })
       .range(offset, offset + limit - 1);
 
     if (active !== undefined) {
@@ -199,6 +200,7 @@ export const employeesRepository = {
           last_latitude:     null,
           last_longitude:    null,
           last_location_at:  null,
+          activity_status: "INACTIVE" as const,
         })),
         source: "employees",
       };
@@ -217,18 +219,35 @@ export const employeesRepository = {
 
     const enriched = ((data ?? []) as unknown as EmployeeWithState[]).map((row) => {
       const { employee_last_state: state, ...employee } = row;
+      const isCheckedIn = state?.is_checked_in ?? false;
+      let activityStatus: "ACTIVE" | "RECENT" | "INACTIVE" = "INACTIVE";
+      if (isCheckedIn) {
+        activityStatus = "ACTIVE";
+      } else if (state?.last_check_out_at) {
+        const ageMs = Date.now() - new Date(state.last_check_out_at).getTime();
+        activityStatus = ageMs < 86_400_000 ? "RECENT" : "INACTIVE";
+      }
       return {
         ...(employee as Employee),
-        is_checked_in:    state?.is_checked_in ?? false,
+        is_checked_in:    isCheckedIn,
         last_check_in_at:  state?.last_check_in_at ?? null,
         last_check_out_at: state?.last_check_out_at ?? null,
         last_latitude:     state?.last_latitude ?? null,
         last_longitude:    state?.last_longitude ?? null,
         last_location_at:  state?.last_location_at ?? null,
+        activity_status:   activityStatus,
       };
     });
 
-    return { data: enriched, total: count ?? 0, source: "snapshot" as const };
+    // Apply segment filter in-memory (segment is derived from snapshot state, not a DB column)
+    const filtered = segment
+      ? enriched.filter((e) => e.activity_status === segment.toUpperCase())
+      : enriched;
+
+    // When filtering by segment, total reflects the filtered count
+    const effectiveTotal = segment ? filtered.length : (count ?? 0);
+
+    return { data: filtered, total: effectiveTotal, source: "snapshot" as const };
   },
 
   /**

src/modules/expenses/expenses.controller.ts

@@ -76,7 +76,8 @@ export const expensesController = {
       const t0 = Date.now();
 
       // feat-1: fast path for PENDING expenses view (most common admin use case)
-      if (statusFilter === "all" || statusFilter === "PENDING") {
+      // Only use snapshot when explicitly requesting PENDING status
+      if (statusFilter === "PENDING") {
         const snapResult = await expensesRepository.findPendingFromSnapshot(
           request,
           page,
@@ -116,6 +117,7 @@ export const expensesController = {
         page,
         limit,
         employeeId,
+        statusFilter,
       );
       const durationMs = Date.now() - t0;
       const response = paginated(result.data, page, limit, result.total);

src/modules/expenses/expenses.repository.ts

@@ -113,6 +113,7 @@ export const expensesRepository = {
     page: number,
     limit: number,
     employeeId?: string,
+    status?: string,
   ): Promise<{ data: EnrichedExpense[]; total: number }> {
     // Phase 30: count:"estimated" eliminates the shadow SELECT COUNT(*) query.
     // idx_expenses_org_submitted_desc (org_id, submitted_at DESC) covers the
@@ -126,6 +127,11 @@ export const expensesRepository = {
       baseQuery = (baseQuery as any).eq("employee_id", employeeId);
     }
 
+    if (status && status !== "all") {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      baseQuery = (baseQuery as any).eq("status", status);
+    }
+
     const { data, error, count } = await applyPagination(baseQuery, page, limit);
 
     if (error) {

src/modules/expenses/expenses.service.ts

@@ -143,8 +143,9 @@ export const expensesService = {
     page: number,
     limit: number,
     employeeId?: string,
+    status?: string,
   ): Promise<{ data: EnrichedExpense[]; total: number }> {
-    return expensesRepository.findExpensesByOrg(request, page, limit, employeeId);
+    return expensesRepository.findExpensesByOrg(request, page, limit, employeeId, status);
   },
 
   /**

supabase/migrations/20260408000100_segmentation_indexes.sql

@@ -0,0 +1,27 @@
+-- Phase: Segmentation performance indexes
+--
+-- Supports the segmented loading strategy:
+--   1. Employees sorted by employee_code — idx_employees_org_code covers the sort
+--   2. Sessions segmented by checkout_at — idx_sessions_checkout_at for time-range queries
+--   3. Employee last state — idx_els_last_checkout for segment computation
+--
+-- All indexes are idempotent (IF NOT EXISTS).
+-- ──────────────────────────────────────────────────────────────────────────────
+
+-- Covers: WHERE organization_id = ? ORDER BY employee_code ASC
+-- Used by: GET /admin/employees (listWithLastState)
+-- Previously sorted by name, now sorted by employee_code.
+CREATE INDEX IF NOT EXISTS idx_employees_org_code
+  ON public.employees (organization_id, employee_code ASC);
+
+-- Covers: checkout_at time-range queries for RECENT segment detection
+-- Used by: session status computation (checkout_at > now() - interval '24 hours')
+CREATE INDEX IF NOT EXISTS idx_sessions_checkout_at
+  ON public.attendance_sessions (checkout_at DESC)
+  WHERE checkout_at IS NOT NULL;
+
+-- Covers: last_check_out_at lookups for employee activity segmentation
+-- Used by: employee segment computation in listWithLastState
+CREATE INDEX IF NOT EXISTS idx_els_last_checkout
+  ON public.employee_last_state (last_check_out_at DESC)
+  WHERE last_check_out_at IS NOT NULL;