From dc069fe0ec458f4b2d3df07bd9d0d55d5187b2f3 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Tue, 3 Nov 2026 14:13:45 +0700 Subject: [PATCH] fix(hse): allow employee import and guard creation to restore soft-deleted users and employees without duplicate key collision --- .../Controllers/Hse/EmployeeController.php | 32 ++++++++--- .../Pg/SecurityGuardController.php | 24 +++++++-- tests/Feature/HseEmployeeImportTest.php | 53 +++++++++++++++++++ 3 files changed, 96 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index d71a8d7..9e2e9a5 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -522,25 +522,41 @@ class EmployeeController extends Controller $simperRaw = $colMap['simper_expired_at'] !== null ? trim((string) ($row[$colMap['simper_expired_at']] ?? '')) : ''; $simperExpiredAt = $isOperator ? SimpleXlsxImporter::normalizeDate($simperRaw) : null; - // 1. Sinkronisasi Akun User untuk login karyawan + // 1. Sinkronisasi Akun User untuk login karyawan (gunakan withTrashed agar tidak bentrok dengan data di Tong Sampah) $cleanEmail = strtolower(str_replace(['-', ' '], '', $nik)) . '@kmh.co.id'; - $user = User::firstOrCreate( - ['username' => $nik], - [ + $user = User::withTrashed()->where('username', $nik)->first(); + if ($user) { + if ($user->trashed()) { + $user->restore(); + } + $user->update([ + 'name' => $name, + 'role' => $user->role ?: 'employee', + ]); + } else { + if (User::withTrashed()->where('email', $cleanEmail)->exists()) { + $cleanEmail = strtolower(str_replace(['-', ' '], '', $nik)) . '.' . uniqid() . '@kmh.co.id'; + } + + $user = User::create([ + 'username' => $nik, 'name' => $name, 'email' => $cleanEmail, 'password' => Hash::make(config('auth.default_employee_password', '123456')), 'role' => 'employee', - ] - ); + ]); + } if (!$user->hasRole('employee')) { $user->assignRole('employee'); } - // 2. Simpan atau perbarui data master Employee - $isExisting = Employee::where('nik', $nik)->first(); + // 2. Simpan atau perbarui data master Employee (gunakan withTrashed agar tidak duplikat dengan NIK di Tong Sampah) + $isExisting = Employee::withTrashed()->where('nik', $nik)->first(); if ($isExisting) { + if ($isExisting->trashed()) { + $isExisting->restore(); + } $isExisting->update([ 'name' => $name, 'employee_type' => $employeeType, diff --git a/app/Http/Controllers/Pg/SecurityGuardController.php b/app/Http/Controllers/Pg/SecurityGuardController.php index a8409a0..3ebf92a 100644 --- a/app/Http/Controllers/Pg/SecurityGuardController.php +++ b/app/Http/Controllers/Pg/SecurityGuardController.php @@ -259,9 +259,23 @@ class SecurityGuardController extends Controller ]); // 3. Otomatis buat / sinkronkan profil Employee untuk Satpam (Divisi: Private Guard, Jabatan: Anggota) - Employee::firstOrCreate( - ['nik' => $badgeId], - [ + $guardEmp = Employee::withTrashed()->where('nik', $badgeId)->first(); + if ($guardEmp) { + if ($guardEmp->trashed()) { + $guardEmp->restore(); + } + $guardEmp->update([ + 'user_id' => $user->id, + 'name' => $request->input('name'), + 'employee_type' => 'Karyawan', + 'unit_kerja' => $guardEmp->unit_kerja ?: 'Private Guard', + 'division' => ($guardEmp->division && $guardEmp->division !== '-') ? $guardEmp->division : 'Private Guard', + 'position' => ($guardEmp->position && $guardEmp->position !== '-') ? $guardEmp->position : 'Anggota', + 'is_operator' => false, + ]); + } else { + Employee::create([ + 'nik' => $badgeId, 'user_id' => $user->id, 'name' => $request->input('name'), 'employee_type' => 'Karyawan', @@ -269,8 +283,8 @@ class SecurityGuardController extends Controller 'division' => 'Private Guard', 'position' => 'Anggota', 'is_operator' => false, - ] - ); + ]); + } }); return back()->with('success', "Petugas Satpam {$request->input('name')} (ID: {$request->input('badge_id')}) berhasil didaftarkan."); diff --git a/tests/Feature/HseEmployeeImportTest.php b/tests/Feature/HseEmployeeImportTest.php index c26fed7..d3141b5 100644 --- a/tests/Feature/HseEmployeeImportTest.php +++ b/tests/Feature/HseEmployeeImportTest.php @@ -284,4 +284,57 @@ class HseEmployeeImportTest extends TestCase 'simper_expired_at' => null, ]); } + + public function test_import_restores_soft_deleted_user_and_employee_without_duplicate_error(): void + { + // Simulasi kondisi VPS: User dan Employee dengan NIK 1111 pernah dihapus ke Tong Sampah + $user = User::create([ + 'username' => '1111', + 'name' => 'Ruadi Lama', + 'email' => '1111@kmh.co.id', + 'password' => Hash::make('password'), + 'role' => 'employee', + ]); + $employee = Employee::create([ + 'nik' => '1111', + 'name' => 'Ruadi Lama', + 'unit_kerja' => 'Umum', + 'division' => 'GA', + 'position' => 'Staff', + 'user_id' => $user->id, + ]); + + $user->delete(); // Soft delete ke Tong Sampah + $employee->delete(); // Soft delete ke Tong Sampah + + $this->assertSoftDeleted('users', ['username' => '1111']); + $this->assertSoftDeleted('employees', ['nik' => '1111']); + + // Impor file yang mengandung NIK 1111 + $csvContent = implode("\n", [ + 'No,NIK,Nama Lengkap,Unit Kerja,Divisi,Jabatan,Operator Driver,Masa Berlaku SIMPER', + '1,1111,Ruadi Baru Terpulihkan,Pembangkit,Mekanik,Staff,TIDAK,', + ]); + + $file = UploadedFile::fake()->createWithContent('import_with_trashed.csv', $csvContent); + + $response = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.import'), [ + 'file' => $file, + ]); + + $response->assertRedirect(); + $response->assertSessionHas('success'); + + // Pastikan dipulihkan dan tidak terjadi SQL duplicate entry error + $this->assertNotSoftDeleted('users', ['username' => '1111']); + $this->assertNotSoftDeleted('employees', ['nik' => '1111']); + + $user->refresh(); + $employee->refresh(); + + $this->assertEquals('Ruadi Baru Terpulihkan', $user->name); + $this->assertEquals('Ruadi Baru Terpulihkan', $employee->name); + $this->assertEquals('Pembangkit', $employee->unit_kerja); + } }