From 7248e4a1e0d0355ff2ae5845bb09398b82e94c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Sun, 31 Oct 2021 16:34:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?meeting=5Fid=E2=86=92image=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/MeetingImagesController.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingImagesController.php b/backend/app/Http/Controllers/Api/MeetingImagesController.php index c82c2859..7c04c2ea 100644 --- a/backend/app/Http/Controllers/Api/MeetingImagesController.php +++ b/backend/app/Http/Controllers/Api/MeetingImagesController.php @@ -72,21 +72,18 @@ class MeetingImagesController extends Controller { return ['status_code' => 200]; } - public function delete ($meeting_id) { - if (!isset($meeting_id)) { + public function delete ($image_id) { + if (!isset($image_id)) { return ['status_code' => 400]; } - if (null === ($get = MeetingImage::select('image')->where('meeting_id', (int)$meeting_id)->first())) { + if (null === ($get = MeetingImage::select('get')->where('id', (int)$image_id)->first())) { return ['status_code' => 400]; } try { - MeetingImage::where('meeting_id', $meeting_id)->delete(); - - foreach ($get as $g) { - Storage::disk('public')->delete($g->image); - } + MeetingImage::where('id', $image_id)->delete(); + Storage::disk('public')->delete($get->image); } catch (\Throwable $e) { // 失敗 Log::critical($e->getMessage()); From fbb31a1399395123525292894b36884950a57f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Sun, 31 Oct 2021 16:43:52 +0900 Subject: [PATCH 2/3] =?UTF-8?q?API=E3=83=AB=E3=83=BC=E3=83=88=E3=82=82?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/routes/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/routes/api.php b/backend/routes/api.php index 81a2fe6d..ac9bd8f4 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -58,7 +58,7 @@ Route::group(['prefix' => 'admin'], function () { // MeetingImagesController Route::group(['prefix' => 'images'], function () { Route::post('/register', '\App\Http\Controllers\Api\MeetingImagesController@register'); - Route::delete('/delete/{meeting_id}', '\App\Http\Controllers\Api\MeetingImagesController@delete'); + Route::delete('/delete/{image_id}', '\App\Http\Controllers\Api\MeetingImagesController@delete'); }); // MeetingApprovalsController From 1e17ab5b7370dbe67eebb83267c375dc4ae7231b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Sun, 31 Oct 2021 17:45:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/Api/MeetingImagesController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingImagesController.php b/backend/app/Http/Controllers/Api/MeetingImagesController.php index 7c04c2ea..7d5b2e59 100644 --- a/backend/app/Http/Controllers/Api/MeetingImagesController.php +++ b/backend/app/Http/Controllers/Api/MeetingImagesController.php @@ -58,7 +58,7 @@ class MeetingImagesController extends Controller { Storage::disk('public')->put($filename, $image); $insert = [ - 'meeting_id' => $r->meeting_id, + 'meeting_id' => (int)$r->meeting_id, 'image' => '/storage/'.$filename, ]; @@ -69,7 +69,13 @@ class MeetingImagesController extends Controller { return ['status_code' => 400]; } - return ['status_code' => 200]; + $meeting_images_select = ['image']; + + if (null === ($params = MeetingImage::select($meeting_images_select)->where('meeting_id', (int)$r->meeting_id)->get())) { + return ['status_code' => 400]; + } + + return ['status_code' => 200, 'params' => $params]; } public function delete ($image_id) {