fix(trash): preserve photos during soft delete and only erase physical files on force delete
This commit is contained in:
@@ -780,13 +780,11 @@ class EmployeeController extends Controller
|
||||
$empNik = $employee->nik;
|
||||
$photoPath = $employee->photo_path;
|
||||
|
||||
DB::transaction(function () use ($employee, $photoPath) {
|
||||
DB::transaction(function () use ($employee) {
|
||||
$user = $employee->user ?: User::where('username', $employee->nik)->first();
|
||||
|
||||
// Hapus berkas foto profil jika tersimpan secara lokal di storage
|
||||
if ($photoPath) {
|
||||
ImageCompressionService::deleteIfExists($photoPath);
|
||||
}
|
||||
// Berkas foto tidak dihapus saat soft delete agar foto tetap ada jika dipulihkan dari tong sampah.
|
||||
// Berkas baru dihapus permanen ketika dilakukan 'Hapus Permanen' (force delete) di TrashService.
|
||||
|
||||
// Hapus data karyawan (relasi employee_simpers otomatis cascade terhapus)
|
||||
$employee->delete();
|
||||
|
||||
@@ -1187,12 +1187,9 @@ class VehicleController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
if ($vehicle->isSupportCategory()) {
|
||||
foreach ($vehicle->units as $u) {
|
||||
ImageCompressionService::deleteIfExists($u->photo_path);
|
||||
}
|
||||
}
|
||||
ImageCompressionService::deleteIfExists($vehicle->photo_path);
|
||||
// Berkas fisik foto tidak dihapus di sini karena data masuk ke Tong Sampah (Soft Delete).
|
||||
// Berkas foto akan tetap aman sehingga jika dipulihkan (restore), foto unit tetap ada.
|
||||
// Berkas fisik baru dihapus permanen ketika dieksekusi 'Hapus Permanen' di TrashService.
|
||||
|
||||
$code = $vehicle->code;
|
||||
$vehicle->delete();
|
||||
|
||||
@@ -17,6 +17,7 @@ use App\Models\UnitTransfer;
|
||||
use App\Models\User;
|
||||
use App\Models\Vehicle;
|
||||
use App\Models\VehicleActivity;
|
||||
use App\Services\ImageCompressionService;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Support\Collection;
|
||||
@@ -432,6 +433,24 @@ class TrashService
|
||||
->forceDelete();
|
||||
}
|
||||
|
||||
// Hapus berkas fisik saat benar-benar dihapus permanen dari tong sampah
|
||||
if ($item instanceof Vehicle) {
|
||||
ImageCompressionService::deleteIfExists($item->photo_path);
|
||||
if (method_exists($item, 'isSupportCategory') && $item->isSupportCategory()) {
|
||||
foreach ($item->units as $u) {
|
||||
ImageCompressionService::deleteIfExists($u->photo_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($item instanceof Employee) {
|
||||
ImageCompressionService::deleteIfExists($item->photo_path);
|
||||
}
|
||||
|
||||
if ($item instanceof User) {
|
||||
ImageCompressionService::deleteIfExists($item->photo_path ?? null);
|
||||
}
|
||||
|
||||
$item->forceDelete();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user