Merge branch 'adminkanryo' of https://github.com/nakazawakan/kikikanri into frontend

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,24 +69,27 @@ class MeetingImagesController extends Controller {
             return ['status_code' => 400];
         }
 
-        return ['status_code' => 200];
-    }
+        $meeting_images_select = ['image'];
 
-    public function delete ($meeting_id) {
-        if (!isset($meeting_id)) {
+        if (null === ($params = MeetingImage::select($meeting_images_select)->where('meeting_id', (int)$r->meeting_id)->get())) {
             return ['status_code' => 400];
         }
 
-        if (null === ($get = MeetingImage::select('image')->where('meeting_id', (int)$meeting_id)->first())) {
+        return ['status_code' => 200, 'params' => $params];
+    }
+
+    public function delete ($image_id) {
+        if (!isset($image_id)) {
+            return ['status_code' => 400];
+        }
+
+        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());

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