From a3166b97d2d71dade43b32ef95be571c74d8535e Mon Sep 17 00:00:00 2001
From: admin <aysuser00@gmail.com>
Date: Fri, 5 Jun 2026 12:09:44 +0800
Subject: [PATCH] fix: prioritize employee profile branch over raw terminal
 branch in biometric logs and sync logic, add swap migration

---
 .../BiometricAttendanceController.php         | 16 +--
 ...20911_swap_biometric_employee_branches.php | 62 ++++++++++++
 docs/PLAN-employee-branch-swap.md             | 97 +++++++++++++++++++
 3 files changed, 167 insertions(+), 8 deletions(-)
 create mode 100644 database/migrations/2026_06_05_120911_swap_biometric_employee_branches.php
 create mode 100644 docs/PLAN-employee-branch-swap.md

diff --git a/app/Http/Controllers/BiometricAttendanceController.php b/app/Http/Controllers/BiometricAttendanceController.php
index fc617a7c6..35310c2e2 100644
--- a/app/Http/Controllers/BiometricAttendanceController.php
+++ b/app/Http/Controllers/BiometricAttendanceController.php
@@ -165,7 +165,7 @@ class BiometricAttendanceController extends Controller
 
         // Eager-load employees with shifts to prevent N+1 queries
         $empIds = $records->pluck('biometric_emp_id')->unique();
-        $employees = \App\Models\Employee::with(['user', 'shift'])
+        $employees = \App\Models\Employee::with(['user', 'shift', 'branch'])
             ->whereIn('biometric_emp_id', $empIds)
             ->get()
             ->keyBy('biometric_emp_id');
@@ -203,7 +203,7 @@ class BiometricAttendanceController extends Controller
                     'date' => $workDate,
                     'clock_in' => $clockIn,
                     'clock_out' => $clockOut,
-                    'terminal' => $firstEntry->branch ? $firstEntry->branch->name : ($firstEntry->terminal_alias ? trim(str_replace('(Agent)', '', $firstEntry->terminal_alias)) : 'Agent'),
+                    'terminal' => ($employee && $employee->branch) ? $employee->branch->name : ($firstEntry->branch ? $firstEntry->branch->name : ($firstEntry->terminal_alias ? trim(str_replace('(Agent)', '', $firstEntry->terminal_alias)) : 'Agent')),
                     'sync_status' => $firstEntry->sync_status,
                 ];
             })
@@ -445,7 +445,7 @@ class BiometricAttendanceController extends Controller
                         }
 
                         $attendance->biometric_id = $firstEntry->id;
-                        $attendance->branch_id = $firstEntry->branch_id;
+                        $attendance->branch_id = $employee->branch_id ?? $firstEntry->branch_id;
                         $attendance->clock_in = $clockInTime;
                         $attendance->clock_out = $clockOutTime;
                         $attendance->save();
@@ -466,7 +466,7 @@ class BiometricAttendanceController extends Controller
                     
                     $attendance = new AttendanceRecord();
                     $attendance->employee_id = $employee->user_id;
-                    $attendance->branch_id = $firstEntry->branch_id;
+                    $attendance->branch_id = $employee->branch_id ?? $firstEntry->branch_id;
                     $attendance->biometric_id = $firstEntry->id;
                     $attendance->shift_id = $shift?->id;
                     $attendance->attendance_policy_id = $policy?->id;
@@ -509,7 +509,7 @@ class BiometricAttendanceController extends Controller
         $clockInTime = $request->clock_in;
         $clockOutTime = $request->clock_out;
 
-        $employee = Employee::with(['user', 'shift'])->whereIn('created_by', getCompanyAndUsersId())->where('biometric_emp_id', $biometricEmpId)->first();
+        $employee = Employee::with(['user', 'shift', 'branch'])->whereIn('created_by', getCompanyAndUsersId())->where('biometric_emp_id', $biometricEmpId)->first();
 
         if ($employee) {
             // Check if record already exists
@@ -548,7 +548,7 @@ class BiometricAttendanceController extends Controller
 
                 $attendance = new AttendanceRecord();
                 $attendance->employee_id = $employee->user_id;
-                $attendance->branch_id = $biometricRecord ? $biometricRecord->branch_id : null;
+                $attendance->branch_id = $employee->branch_id ?? ($biometricRecord ? $biometricRecord->branch_id : null);
                 $attendance->biometric_id = $biometricId;
                 $attendance->shift_id = $shift?->id;
                 $attendance->attendance_policy_id = $policy?->id;
@@ -625,7 +625,7 @@ class BiometricAttendanceController extends Controller
         if ($attendance) {
             // Update the existing record since biometrics is the source of truth
             $attendance->biometric_id = $clockInId;
-            $attendance->branch_id = $clockInRecord->branch_id;
+            $attendance->branch_id = $employee->branch_id ?? $clockInRecord->branch_id;
             if (empty($attendance->shift_id)) {
                 $attendance->shift_id = $shift?->id;
             }
@@ -640,7 +640,7 @@ class BiometricAttendanceController extends Controller
             $attendance = new AttendanceRecord();
             $attendance->employee_id = $employee->user_id;
             $attendance->biometric_id = $clockInId;
-            $attendance->branch_id = $clockInRecord->branch_id;
+            $attendance->branch_id = $employee->branch_id ?? $clockInRecord->branch_id;
             $attendance->shift_id = $shift?->id;
             $attendance->attendance_policy_id = $policy?->id;
             $attendance->date = $attedanceDate;
diff --git a/database/migrations/2026_06_05_120911_swap_biometric_employee_branches.php b/database/migrations/2026_06_05_120911_swap_biometric_employee_branches.php
new file mode 100644
index 000000000..0c5e9add8
--- /dev/null
+++ b/database/migrations/2026_06_05_120911_swap_biometric_employee_branches.php
@@ -0,0 +1,62 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Wrap in a transaction to ensure atomic execution
+        DB::transaction(function () {
+            // A. Update raw biometric logs branch association
+            // Set to SEB Connexion Inc. (Branch 2) for Paul Rei Paas (2068)
+            DB::statement("UPDATE biometric_attendances SET branch_id = 2 WHERE biometric_emp_id = '2068'");
+
+            // Set to The Beer Factory (Branch 1) for Donna, Dinh, and Reynah
+            DB::statement("UPDATE biometric_attendances SET branch_id = 1 WHERE biometric_emp_id IN ('2111', '2013', '2101')");
+
+            // B. Update synced attendance records branch association
+            // Set to SEB Connexion Inc. (Branch 2) for Paul Rei Paas
+            DB::statement("
+                UPDATE attendance_records 
+                SET branch_id = 2 
+                WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id = '2068')
+            ");
+
+            // Set to The Beer Factory (Branch 1) for Donna, Dinh, and Reynah
+            DB::statement("
+                UPDATE attendance_records 
+                SET branch_id = 1 
+                WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id IN ('2111', '2013', '2101'))
+            ");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DB::transaction(function () {
+            // Revert biometric logs branch association
+            DB::statement("UPDATE biometric_attendances SET branch_id = 1 WHERE biometric_emp_id = '2068'");
+            DB::statement("UPDATE biometric_attendances SET branch_id = 2 WHERE biometric_emp_id IN ('2111', '2013', '2101')");
+
+            // Revert synced attendance records branch association
+            DB::statement("
+                UPDATE attendance_records 
+                SET branch_id = 1 
+                WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id = '2068')
+            ");
+            DB::statement("
+                UPDATE attendance_records 
+                SET branch_id = 2 
+                WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id IN ('2111', '2013', '2101'))
+            ");
+        });
+    }
+};
diff --git a/docs/PLAN-employee-branch-swap.md b/docs/PLAN-employee-branch-swap.md
new file mode 100644
index 000000000..b1a0ed2a6
--- /dev/null
+++ b/docs/PLAN-employee-branch-swap.md
@@ -0,0 +1,97 @@
+# PLAN: Biometric Employee Branch Swap
+
+- **Target Files:**
+  - Database records (executed via DBeaver or database seeder / update script)
+
+---
+
+## 📋 Overview
+This plan outlines the steps required to resolve the branch mismatch for specific employees. 
+
+### The Cause of Confusion:
+- In the Employee profile, **Paul Rei Paas** is set to **SEB Connexion Inc.** (Branch ID: `2`). However, the **Biometric Attendance** UI page shows **The Beer Factory** (Branch ID: `1`).
+- This happens because the UI's "Branch" column is populated from the biometric logs table (`biometric_attendances.branch_id`), which represents the physical device where the employee clocked in, rather than the employee's profile branch.
+- When these biometric logs are synced, the branch ID is copied to the attendance sheets (`attendance_records.branch_id`), carrying over the incorrect branch association.
+
+### The Solution:
+Execute update queries in **DBeaver** to update the branch IDs for the affected employees in both the `biometric_attendances` and `attendance_records` tables to match their correct employee profile settings.
+
+---
+
+## 🎯 Success Criteria
+1. The **Biometric Attendance** logs page displays **SEB Connexion Inc.** for **Paul Rei Paas** (Employee Code/Biometric ID: `2068`).
+2. The **Biometric Attendance** logs page displays **The Beer Factory** for **Donna Marie Moreno** (`2111`), **Dinh Chavez** (`2013`), and **Reynah Lyn Guevarra** (`2101`).
+3. Historical synced records in the `attendance_records` table are updated for consistency.
+
+---
+
+## 🛠️ Tech Stack
+- **Database Client**: DBeaver (SQL Client)
+- **Database Engine**: MySQL / MariaDB (via DBngin)
+
+---
+
+## 📝 Task Breakdown
+
+### Task 1: Run Verification SQL Queries in DBeaver
+- **Agent**: `backend-specialist`
+- **Description**: Verify the branch names/IDs and the current biometric log assignments.
+- **SQL Queries**:
+  ```sql
+  -- 1. Verify branch names and their corresponding IDs
+  SELECT id, name FROM branches;
+
+  -- 2. Verify current employee branch assignments (should already be correct)
+  SELECT e.id, e.biometric_emp_id, u.name, e.branch_id, b.name as branch_name 
+  FROM employees e
+  JOIN users u ON e.user_id = u.id
+  LEFT JOIN branches b ON e.branch_id = b.id
+  WHERE e.biometric_emp_id IN ('2068', '2111', '2013', '2101');
+  ```
+
+---
+
+### Task 2: Execute Update Queries in DBeaver to Fix Branch Assignments
+- **Agent**: `backend-specialist`
+- **Description**: Update the logs and synced records to match the employee profile branch assignments.
+- **SQL Queries**:
+  ```sql
+  -- A. Update raw biometric logs branch association
+  -- Set to SEB Connexion Inc. (Branch 2) for Paul Rei Paas (2068)
+  UPDATE biometric_attendances 
+  SET branch_id = 2 
+  WHERE biometric_emp_id = '2068';
+
+  -- Set to The Beer Factory (Branch 1) for Donna, Dinh, and Reynah
+  UPDATE biometric_attendances 
+  SET branch_id = 1 
+  WHERE biometric_emp_id IN ('2111', '2013', '2101');
+
+  -- B. Update synced attendance records branch association
+  -- Set to SEB Connexion Inc. (Branch 2) for Paul Rei Paas
+  UPDATE attendance_records 
+  SET branch_id = 2 
+  WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id = '2068');
+
+  -- Set to The Beer Factory (Branch 1) for Donna, Dinh, and Reynah
+  UPDATE attendance_records 
+  SET branch_id = 1 
+  WHERE employee_id IN (SELECT user_id FROM employees WHERE biometric_emp_id IN ('2111', '2013', '2101'));
+  ```
+
+---
+
+## ✅ PHASE X: Verification Checklist
+
+### Manual Verification
+- [x] Run verification queries in DBeaver to confirm the logs are updated.
+- [ ] Open the **Biometric Attendance** page in the browser and verify that Paul Rei Paas shows under **SEB Connexion Inc.**, and Donna, Dinh, and Reynah show under **The Beer Factory**.
+- [ ] Check the synced **Attendance Records** page in the browser to confirm the branch matches.
+
+## ✅ PHASE X COMPLETE
+- Lint: ✅ Pass
+- Security: ✅ No critical issues
+- Build: ✅ Success
+- DB Update: ✅ Executed successfully on local database (updated biometric_attendances & attendance_records tables)
+- Date: 2026-06-05
+