diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index ae4db10d..7f632fba 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -553,7 +553,7 @@ class ChildrenController extends Controller { $img = $child->image; $child->delete(); - if (!is_null($img)) { + if (!is_null($img) && $img != '/assets/default/avatar.jpg') { $img = str_replace('/files/', '', $child->image); if (!Storage::disk('private')->exists($img)) { Log::warning($img.'というパスは不正です。'); diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php index 48a71ca5..0fc3f8f7 100644 --- a/backend/app/Http/Controllers/Api/FathersController.php +++ b/backend/app/Http/Controllers/Api/FathersController.php @@ -533,15 +533,22 @@ class FathersController extends Controller { if ($meet->count() > 0) { foreach ($meet->get() as $n) { $meim = MeetingImage::where('meeting_id', (int)$n->id); - $oldpdf = str_replace('/files/', '', $n->pdf); - $pdfs[] = $oldpdf; + if (!is_null($n->pdf) && $n->pdf != '/assets/default/default.pdf') { + $oldpdf = str_replace('/files/', '', $n->pdf); + $pdfs[] = $oldpdf; + } if ($meim->count() > 0) { foreach ($meim->get() as $m) { + if (is_null($n->pdf) || $m->image == '/assets/img/dummy/post-dummy01.jpg') { + continue; + } $oldimg = str_replace('/files/', '', $m->image); $images[] = $oldimg; } } + + $meim->delete(); } } @@ -550,9 +557,8 @@ class FathersController extends Controller { $father->delete(); $rel->delete(); $meet->delete(); - $meim->delete(); - if (!is_null($img)) { + if (!is_null($img) && $img != '/assets/default/avatar.jpg') { $img = str_replace('/files/', '', $father->image); if (!Storage::disk('private')->exists($img)) { Log::warning($img.'というパスは不正です。');