fix(user,trash): fix 500 server error when deleting user with operational history and protect audit integrity

This commit is contained in:
Ray1111-aa
2026-11-03 09:14:53 +07:00
parent 5a4969b467
commit ff3ab616e0
9 changed files with 236 additions and 52 deletions
+20 -16
View File
@@ -73,24 +73,28 @@ class TrashController extends Controller
*/
public function forceDelete(string $category, int $id): RedirectResponse
{
$success = $this->trashService->forceDeleteItem($category, $id);
try {
$success = $this->trashService->forceDeleteItem($category, $id);
if (!$success) {
return back()->with('error', 'Data tidak ditemukan di tong sampah atau gagal dihapus permanen.');
if (!$success) {
return back()->with('error', 'Data tidak ditemukan di tong sampah atau gagal dihapus permanen.');
}
$catDefinitions = TrashService::getCategoryDefinitions();
$label = $catDefinitions[$category]['label'] ?? $category;
AdminActivityLog::record(
actionType: 'delete',
module: 'Tong Sampah',
description: "Menghapus permanen data pada kategori '{$label}' (ID: {$id}).",
targetType: $category,
targetId: $id
);
return back()->with('success', "Data '{$label}' berhasil dihapus permanen dari sistem.");
} catch (\Throwable $e) {
return back()->with('error', 'Aksi Ditolak: ' . $e->getMessage());
}
$catDefinitions = TrashService::getCategoryDefinitions();
$label = $catDefinitions[$category]['label'] ?? $category;
AdminActivityLog::record(
actionType: 'delete',
module: 'Tong Sampah',
description: "Menghapus permanen data pada kategori '{$label}' (ID: {$id}).",
targetType: $category,
targetId: $id
);
return back()->with('success', "Data '{$label}' berhasil dihapus permanen dari sistem.");
}
/**
+22 -15
View File
@@ -11,6 +11,7 @@ use App\Services\ImageCompressionService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rule;
use Illuminate\View\View;
@@ -419,23 +420,29 @@ class UserController extends Controller
$userRole = $user->role ?? '';
$userId = $user->id;
$user->syncRoles([]);
$user->delete();
try {
DB::transaction(function () use ($user) {
$user->delete();
});
// Rekam ke Log Riwayat Aktivitas Super Admin
$roleTitle = $this->getFriendlyRoleName($userRole);
AdminActivityLog::record(
actionType: 'delete',
module: 'Manajemen Pengguna',
description: "Menghapus akun pengguna: {$name} (Username: {$username}) dengan hak akses '{$roleTitle}'.",
targetType: 'User',
targetId: $userId,
targetName: $name,
oldValues: $deletedSnapshot
);
// Rekam ke Log Riwayat Aktivitas Super Admin
$roleTitle = $this->getFriendlyRoleName($userRole);
AdminActivityLog::record(
actionType: 'delete',
module: 'Manajemen Pengguna',
description: "Menghapus akun pengguna: {$name} (Username: {$username}) dengan hak akses '{$roleTitle}'.",
targetType: 'User',
targetId: $userId,
targetName: $name,
oldValues: $deletedSnapshot
);
return redirect()->route('admin.users.index')
->with('success', "Akun pengguna [{$name}] berhasil dihapus dari sistem.");
return redirect()->route('admin.users.index')
->with('success', "Akun pengguna [{$name}] berhasil dihapus dan dipindahkan ke Tong Sampah.");
} catch (\Throwable $e) {
return redirect()->route('admin.users.index')
->with('error', 'Gagal menghapus pengguna: ' . $e->getMessage());
}
}
/**
@@ -1446,12 +1446,12 @@ class VehicleController extends Controller
if ($vehicle->isSupportCategory()) {
// Otomatis buatkan Master Template P2H baru jika belum ada
$templateCode = $vehicle->unit_type ?: $vehicle->code;
$templateCode = $vehicle->code;
$template = P2hTemplate::firstOrCreate(
['code' => $templateCode],
[
'name' => $vehicle->unit_type ?: $vehicle->brand_type,
'description' => "Template form inspeksi P2H resmi untuk {$vehicle->unit_type} (Kode: {$templateCode}).",
'name' => $vehicle->unit_category ?: ($vehicle->unit_type ?: $vehicle->brand_type),
'description' => "Template form inspeksi P2H resmi untuk " . ($vehicle->unit_category ?: $vehicle->brand_type) . " (Kode: {$templateCode}).",
'is_active' => true,
]
);
+18 -9
View File
@@ -33,17 +33,26 @@ class User extends Authenticatable
});
static::deleting(function (User $user) {
if ($user->employee) {
if ($user->employee->activities()->exists() || $user->employee->p2hRecords()->exists()) {
throw new \Exception("Tidak dapat menghapus user: Karyawan '{$user->name}' memiliki data audit riwayat operasional kendaraan atau inspeksi P2H.");
$employee = $user->employee ?: Employee::where('user_id', $user->id)->orWhere('nik', $user->username)->first();
$guard = $user->securityGuard ?: SecurityGuard::where('user_id', $user->id)->first();
if ($user->isForceDeleting()) {
$employeeTrashed = $employee ?: Employee::withTrashed()->where('user_id', $user->id)->orWhere('nik', $user->username)->first();
if ($employeeTrashed && ($employeeTrashed->activities()->exists() || $employeeTrashed->p2hRecords()->exists() || $employeeTrashed->supportTimesheets()->exists())) {
throw new \RuntimeException("Tidak dapat menghapus permanen user: Karyawan '{$user->name}' memiliki data audit riwayat operasional kendaraan atau inspeksi P2H.");
}
$user->employee->delete();
}
if ($user->securityGuard) {
if ($user->securityGuard->activities()->exists()) {
throw new \Exception("Tidak dapat menghapus user: Petugas Satpam '{$user->name}' memiliki riwayat data validasi pos gerbang.");
$guardTrashed = $guard ?: SecurityGuard::withTrashed()->where('user_id', $user->id)->first();
if ($guardTrashed && $guardTrashed->activities()->exists()) {
throw new \RuntimeException("Tidak dapat menghapus permanen user: Petugas Satpam '{$user->name}' memiliki riwayat data validasi pos gerbang.");
}
} else {
// Soft delete: cukup cascade soft delete data employee & securityGuard jika ada dan belum terhapus
if ($employee && ! $employee->trashed()) {
$employee->delete();
}
if ($guard && ! $guard->trashed()) {
$guard->delete();
}
$user->securityGuard->delete();
}
});
}
+56 -6
View File
@@ -378,6 +378,36 @@ class TrashService
EmployeeSimper::onlyTrashed()
->where('employee_id', $item->id)
->restore();
$user = User::onlyTrashed()->where('id', $item->user_id)->orWhere('username', $item->nik)->first();
if ($user) {
$user->restore();
if ($user->role && ! $user->hasRole($user->role)) {
$role = \Spatie\Permission\Models\Role::where('name', $user->role)->first();
if ($role) {
$user->assignRole($role);
}
}
}
}
if ($item instanceof User) {
if ($item->role && ! $item->hasRole($item->role)) {
$role = \Spatie\Permission\Models\Role::where('name', $item->role)->first();
if ($role) {
$item->assignRole($role);
}
}
$employee = Employee::onlyTrashed()->where('user_id', $item->id)->orWhere('nik', $item->username)->first();
if ($employee) {
$employee->restore();
}
$guard = SecurityGuard::onlyTrashed()->where('user_id', $item->id)->first();
if ($guard) {
$guard->restore();
}
}
if ($item instanceof SimperType) {
@@ -453,6 +483,14 @@ class TrashService
}
if ($item instanceof User) {
$employee = Employee::withTrashed()->where('user_id', $item->id)->orWhere('nik', $item->username)->first();
if ($employee && ($employee->activities()->exists() || $employee->p2hRecords()->exists() || $employee->supportTimesheets()->exists())) {
throw new \RuntimeException("User '{$item->name}' memiliki data audit riwayat operasional kendaraan atau inspeksi P2H dan tidak dapat dihapus permanen untuk menjaga integritas data.");
}
$guard = SecurityGuard::withTrashed()->where('user_id', $item->id)->first();
if ($guard && $guard->activities()->exists()) {
throw new \RuntimeException("User '{$item->name}' memiliki riwayat data validasi pos gerbang dan tidak dapat dihapus permanen untuk menjaga integritas data.");
}
ImageCompressionService::deleteIfExists($item->photo_path ?? null);
}
@@ -474,8 +512,12 @@ class TrashService
$model = $categories[$category]['model'];
$items = $model::onlyTrashed()->get();
foreach ($items as $item) {
$this->forceDeleteItem($category, $item->id);
$totalDeleted++;
try {
$this->forceDeleteItem($category, $item->id);
$totalDeleted++;
} catch (\Throwable) {
// Abaikan item yang tidak dapat dihapus permanen untuk menjaga integritas audit
}
}
return $totalDeleted;
}
@@ -485,8 +527,12 @@ class TrashService
$model = $config['model'];
$items = $model::onlyTrashed()->get();
foreach ($items as $item) {
$this->forceDeleteItem($catKey, $item->id);
$totalDeleted++;
try {
$this->forceDeleteItem($catKey, $item->id);
$totalDeleted++;
} catch (\Throwable) {
// Abaikan item yang tidak dapat dihapus permanen untuk menjaga integritas audit
}
}
}
@@ -515,8 +561,12 @@ class TrashService
$model = $config['model'];
$expiredItems = $model::onlyTrashed()->where('deleted_at', '<=', $cutoff)->get();
foreach ($expiredItems as $item) {
$this->forceDeleteItem($catKey, $item->id);
$prunedCount++;
try {
$this->forceDeleteItem($catKey, $item->id);
$prunedCount++;
} catch (\Throwable) {
// Abaikan item yang tidak dapat dihapus permanen untuk menjaga integritas audit
}
}
}