diff --git a/app/Http/Controllers/Hse/SimperTypeController.php b/app/Http/Controllers/Hse/SimperTypeController.php index 4aaf740..1da334a 100644 --- a/app/Http/Controllers/Hse/SimperTypeController.php +++ b/app/Http/Controllers/Hse/SimperTypeController.php @@ -8,6 +8,7 @@ use App\Models\Vehicle; use Carbon\Carbon; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Illuminate\View\View; @@ -145,19 +146,18 @@ class SimperTypeController extends Controller } /** - * Hapus jenis SIMPER. + * Hapus jenis SIMPER ke Tong Sampah. */ public function destroy(int $id): RedirectResponse { $simperType = SimperType::withCount('employeeSimpers')->findOrFail($id); - - if ($simperType->employee_simpers_count > 0) { - return back()->with('error', "Jenis SIMPER '{$simperType->name}' tidak dapat dihapus karena masih digunakan oleh {$simperType->employee_simpers_count} personil. Anda dapat menonaktifkan statusnya."); - } - $name = $simperType->name; - $simperType->delete(); - return back()->with('success', "Jenis SIMPER '{$name}' berhasil dihapus."); + DB::transaction(function () use ($simperType) { + $simperType->employeeSimpers()->delete(); + $simperType->delete(); + }); + + return back()->with('success', "Jenis SIMPER '{$name}' berhasil dihapus dan dipindahkan ke Tong Sampah."); } } diff --git a/app/Services/TrashService.php b/app/Services/TrashService.php index 62b6b78..5a5650f 100644 --- a/app/Services/TrashService.php +++ b/app/Services/TrashService.php @@ -378,6 +378,12 @@ class TrashService ->where('employee_id', $item->id) ->restore(); } + + if ($item instanceof SimperType) { + EmployeeSimper::onlyTrashed() + ->where('simper_type_id', $item->id) + ->restore(); + } }); return true; @@ -420,6 +426,12 @@ class TrashService ->forceDelete(); } + if ($item instanceof SimperType) { + EmployeeSimper::withTrashed() + ->where('simper_type_id', $item->id) + ->forceDelete(); + } + $item->forceDelete(); }); diff --git a/resources/views/hse/simper_types_index.blade.php b/resources/views/hse/simper_types_index.blade.php index 5430fd0..0c0219f 100644 --- a/resources/views/hse/simper_types_index.blade.php +++ b/resources/views/hse/simper_types_index.blade.php @@ -180,9 +180,9 @@ @endif - @if((auth()->user()->can('hse.simper_types.delete') || auth()->user()->can('hse.employees.edit')) && $st->total_holders_count == 0) + @if(auth()->user()->hasRole('super_admin') || auth()->user()->can('hse.simper_types.delete') || auth()->user()->can('hse.employees.edit')) - @@ -670,8 +674,16 @@ if (modal) modal.classList.add('hidden'); } - function openDeleteSimperTypeModal(id, name) { + function openDeleteSimperTypeModal(id, name, holdersCount = 0) { document.getElementById('deleteSimperTypeName').textContent = name; + const warning = document.getElementById('deleteSimperTypeWarning'); + const holdersEl = document.getElementById('deleteSimperHoldersCount'); + if (holdersCount > 0) { + holdersEl.textContent = `${holdersCount}`; + warning.classList.remove('hidden'); + } else { + warning.classList.add('hidden'); + } const form = document.getElementById('deleteSimperTypeForm'); form.action = `/hse/simper-types/${id}`; diff --git a/tests/Feature/HseSimperTypeTest.php b/tests/Feature/HseSimperTypeTest.php index b72f1ac..a1f9a31 100644 --- a/tests/Feature/HseSimperTypeTest.php +++ b/tests/Feature/HseSimperTypeTest.php @@ -330,4 +330,99 @@ class HseSimperTypeTest extends TestCase $this->assertTrue($employee->hasValidSimperForVehicle($vehicleLoader)); $this->assertFalse($employee->hasValidSimperForVehicle($vehicleForklift)); } + + /** + * Super Admin dan Admin HSE dapat melihat tombol delete dan menghapus jenis SIMPER. + */ + public function test_authorized_user_and_super_admin_can_delete_simper_type(): void + { + $superAdmin = User::factory()->create([ + 'role' => 'super_admin', + ]); + $superAdmin->assignRole(Role::firstOrCreate(['name' => 'super_admin'])); + + $simperType = SimperType::create([ + 'code' => 'SIMPER-CRANE-DEL', + 'name' => 'SIMPER Mobile Crane Test', + 'category_scope' => 'unit_support_heavy', + 'is_active' => true, + ]); + + // Super Admin melihat tombol hapus pada halaman index + $resIndex = $this->actingAs($superAdmin)->get(route('hse.simper_types.index')); + $resIndex->assertOk(); + $resIndex->assertSee('SIMPER-CRANE-DEL'); + $resIndex->assertSee('openDeleteSimperTypeModal', false); + + // Eksekusi hapus oleh Super Admin + $resDelete = $this->actingAs($superAdmin)->delete(route('hse.simper_types.destroy', $simperType->id)); + $resDelete->assertRedirect(); + $resDelete->assertSessionHas('success'); + + $this->assertSoftDeleted('simper_types', [ + 'id' => $simperType->id, + ]); + } + + /** + * User tanpa hak akses tidak dapat menghapus jenis SIMPER (403). + */ + public function test_unauthorized_user_cannot_delete_simper_type(): void + { + $simperType = SimperType::create([ + 'code' => 'SIMPER-NO-DEL', + 'name' => 'SIMPER Terlindungi', + 'category_scope' => 'all', + 'is_active' => true, + ]); + + $response = $this->actingAs($this->regularUser)->delete(route('hse.simper_types.destroy', $simperType->id)); + $response->assertForbidden(); + + $this->assertDatabaseHas('simper_types', [ + 'id' => $simperType->id, + 'deleted_at' => null, + ]); + } + + /** + * Menghapus jenis SIMPER meng-cascade soft delete ke tabel employee_simpers terkait. + */ + public function test_deleting_simper_type_cascades_soft_deletes_to_employee_simpers(): void + { + $superAdmin = User::factory()->create([ + 'role' => 'super_admin', + ]); + $superAdmin->assignRole(Role::firstOrCreate(['name' => 'super_admin'])); + + $simperType = SimperType::create([ + 'code' => 'SIMPER-CASCADE-01', + 'name' => 'SIMPER Dozer & Grader', + 'category_scope' => 'all', + 'is_active' => true, + ]); + + $employee = Employee::create([ + 'nik' => 'EMP-SIMPER-DEL', + 'name' => 'Karyawan Pemegang SIMPER', + 'is_operator' => true, + ]); + + $empSimper = EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperType->id, + 'simper_number' => 'SMP-CASCADE-99', + 'expired_at' => Carbon::now()->addYear(), + 'status' => 'active', + ]); + + // Hapus jenis SIMPER + $response = $this->actingAs($superAdmin)->delete(route('hse.simper_types.destroy', $simperType->id)); + $response->assertRedirect(); + $response->assertSessionHas('success'); + + // Keduanya masuk ke tong sampah + $this->assertSoftDeleted('simper_types', ['id' => $simperType->id]); + $this->assertSoftDeleted('employee_simpers', ['id' => $empSimper->id]); + } }