fix(hse): allow employee import and guard creation to restore soft-deleted users and employees without duplicate key collision
This commit is contained in:
@@ -522,25 +522,41 @@ class EmployeeController extends Controller
|
|||||||
$simperRaw = $colMap['simper_expired_at'] !== null ? trim((string) ($row[$colMap['simper_expired_at']] ?? '')) : '';
|
$simperRaw = $colMap['simper_expired_at'] !== null ? trim((string) ($row[$colMap['simper_expired_at']] ?? '')) : '';
|
||||||
$simperExpiredAt = $isOperator ? SimpleXlsxImporter::normalizeDate($simperRaw) : null;
|
$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';
|
$cleanEmail = strtolower(str_replace(['-', ' '], '', $nik)) . '@kmh.co.id';
|
||||||
$user = User::firstOrCreate(
|
$user = User::withTrashed()->where('username', $nik)->first();
|
||||||
['username' => $nik],
|
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,
|
'name' => $name,
|
||||||
'email' => $cleanEmail,
|
'email' => $cleanEmail,
|
||||||
'password' => Hash::make(config('auth.default_employee_password', '123456')),
|
'password' => Hash::make(config('auth.default_employee_password', '123456')),
|
||||||
'role' => 'employee',
|
'role' => 'employee',
|
||||||
]
|
]);
|
||||||
);
|
}
|
||||||
|
|
||||||
if (!$user->hasRole('employee')) {
|
if (!$user->hasRole('employee')) {
|
||||||
$user->assignRole('employee');
|
$user->assignRole('employee');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Simpan atau perbarui data master Employee
|
// 2. Simpan atau perbarui data master Employee (gunakan withTrashed agar tidak duplikat dengan NIK di Tong Sampah)
|
||||||
$isExisting = Employee::where('nik', $nik)->first();
|
$isExisting = Employee::withTrashed()->where('nik', $nik)->first();
|
||||||
if ($isExisting) {
|
if ($isExisting) {
|
||||||
|
if ($isExisting->trashed()) {
|
||||||
|
$isExisting->restore();
|
||||||
|
}
|
||||||
$isExisting->update([
|
$isExisting->update([
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'employee_type' => $employeeType,
|
'employee_type' => $employeeType,
|
||||||
|
|||||||
@@ -259,9 +259,23 @@ class SecurityGuardController extends Controller
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
// 3. Otomatis buat / sinkronkan profil Employee untuk Satpam (Divisi: Private Guard, Jabatan: Anggota)
|
// 3. Otomatis buat / sinkronkan profil Employee untuk Satpam (Divisi: Private Guard, Jabatan: Anggota)
|
||||||
Employee::firstOrCreate(
|
$guardEmp = Employee::withTrashed()->where('nik', $badgeId)->first();
|
||||||
['nik' => $badgeId],
|
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,
|
'user_id' => $user->id,
|
||||||
'name' => $request->input('name'),
|
'name' => $request->input('name'),
|
||||||
'employee_type' => 'Karyawan',
|
'employee_type' => 'Karyawan',
|
||||||
@@ -269,8 +283,8 @@ class SecurityGuardController extends Controller
|
|||||||
'division' => 'Private Guard',
|
'division' => 'Private Guard',
|
||||||
'position' => 'Anggota',
|
'position' => 'Anggota',
|
||||||
'is_operator' => false,
|
'is_operator' => false,
|
||||||
]
|
]);
|
||||||
);
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return back()->with('success', "Petugas Satpam {$request->input('name')} (ID: {$request->input('badge_id')}) berhasil didaftarkan.");
|
return back()->with('success', "Petugas Satpam {$request->input('name')} (ID: {$request->input('badge_id')}) berhasil didaftarkan.");
|
||||||
|
|||||||
@@ -284,4 +284,57 @@ class HseEmployeeImportTest extends TestCase
|
|||||||
'simper_expired_at' => null,
|
'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' => '[email protected]',
|
||||||
|
'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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user