From e639fcacc3655171954d23a9aa2530a037922ee1 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: Fri, 29 Oct 2021 22:19:12 +0900 Subject: [PATCH] =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/FathersController.php | 28 +++++++++---------- ...13_050204_create_tel_activations_table.php | 2 +- ...3_053246_create_father_relations_table.php | 4 +-- ...021_08_13_054528_create_meetings_table.php | 2 +- ..._13_061310_create_meeting_images_table.php | 2 +- ..._023716_create_meeting_approvals_table.php | 4 +-- .../2021_09_29_023723_create_smsses_table.php | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php index 8a889648..40bd098b 100644 --- a/backend/app/Http/Controllers/Api/FathersController.php +++ b/backend/app/Http/Controllers/Api/FathersController.php @@ -363,7 +363,20 @@ class FathersController extends Controller { return ['status_code' => 200, 'success_messages' => ['親の更新に成功しました。']]; } - public function withdrawal ($father_id) { + public function withdrawal (Request $r) { + try { + Father::where('id', (int)$r->father_id)->delete(); + } catch (\Throwable $e) { + // 失敗 + Log::critical($e->getMessage()); + return ['status_code' => 400, 'error_messages' => ['親の削除に失敗しました。']]; + } + + // 成功 + return ['status_code' => 200, 'success_messages' => ['親の削除に成功しました。']]; + } + + public function delete ($father_id) { try { Father::where('id', (int)$father_id)->delete(); } catch (\Throwable $e) { @@ -375,17 +388,4 @@ class FathersController extends Controller { // 成功 return ['status_code' => 200, 'success_messages' => ['親の削除に成功しました。']]; } - - public function delete ($meeting_id) { - try { - Meeting::where('id', (int)$meeting_id)->delete(); - } catch (\Throwable $e) { - // 失敗 - Log::critical($e->getMessage()); - return ['status_code' => 400, 'error_messages' => ['親の削除に失敗しました。']]; - } - - // 成功 - return ['status_code' => 200, 'success_messages' => ['親の削除に成功しました。']]; - } } diff --git a/backend/database/migrations/2021_08_13_050204_create_tel_activations_table.php b/backend/database/migrations/2021_08_13_050204_create_tel_activations_table.php index 7d55a80b..45bb45ef 100644 --- a/backend/database/migrations/2021_08_13_050204_create_tel_activations_table.php +++ b/backend/database/migrations/2021_08_13_050204_create_tel_activations_table.php @@ -17,7 +17,7 @@ class CreateTelActivationsTable extends Migration $table->id(); $table->unsignedTinyInteger('type'); $table->unsignedBigInteger('child_id')->nullable(); - $table->foreign('child_id')->references('id')->on('children'); + $table->foreign('child_id')->references('id')->on('children')->onDelete('cascade'); $table->string('tel', 11)->unique(); $table->string('token', 100); $table->dateTime('ttl'); diff --git a/backend/database/migrations/2021_08_13_053246_create_father_relations_table.php b/backend/database/migrations/2021_08_13_053246_create_father_relations_table.php index e4fe9008..38a184d5 100644 --- a/backend/database/migrations/2021_08_13_053246_create_father_relations_table.php +++ b/backend/database/migrations/2021_08_13_053246_create_father_relations_table.php @@ -16,9 +16,9 @@ class CreateFatherRelationsTable extends Migration Schema::create('father_relations', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('father_id'); - $table->foreign('father_id')->references('id')->on('fathers'); + $table->foreign('father_id')->references('id')->on('fathers')->onDelete('cascade'); $table->unsignedBigInteger('child_id'); - $table->foreign('child_id')->references('id')->on('children'); + $table->foreign('child_id')->references('id')->on('children')->onDelete('cascade'); $table->dateTime('hire_at')->useCurrent(); $table->timestamps(); }); diff --git a/backend/database/migrations/2021_08_13_054528_create_meetings_table.php b/backend/database/migrations/2021_08_13_054528_create_meetings_table.php index dce5881b..0f8e5ca1 100644 --- a/backend/database/migrations/2021_08_13_054528_create_meetings_table.php +++ b/backend/database/migrations/2021_08_13_054528_create_meetings_table.php @@ -16,7 +16,7 @@ class CreateMeetingsTable extends Migration Schema::create('meetings', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('father_id'); - $table->foreign('father_id')->references('id')->on('fathers'); + $table->foreign('father_id')->references('id')->on('fathers')->onDelete('cascade'); $table->string('title', 255); $table->string('text', 2000); $table->string('pdf', 255)->nullable(); diff --git a/backend/database/migrations/2021_08_13_061310_create_meeting_images_table.php b/backend/database/migrations/2021_08_13_061310_create_meeting_images_table.php index bb41386e..74d003c2 100644 --- a/backend/database/migrations/2021_08_13_061310_create_meeting_images_table.php +++ b/backend/database/migrations/2021_08_13_061310_create_meeting_images_table.php @@ -16,7 +16,7 @@ class CreateMeetingImagesTable extends Migration Schema::create('meeting_images', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('meeting_id'); - $table->foreign('meeting_id')->references('id')->on('meetings'); + $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade'); $table->string('image'); $table->timestamps(); }); diff --git a/backend/database/migrations/2021_09_29_023716_create_meeting_approvals_table.php b/backend/database/migrations/2021_09_29_023716_create_meeting_approvals_table.php index 587c3b51..13c405ee 100644 --- a/backend/database/migrations/2021_09_29_023716_create_meeting_approvals_table.php +++ b/backend/database/migrations/2021_09_29_023716_create_meeting_approvals_table.php @@ -16,9 +16,9 @@ class CreateMeetingApprovalsTable extends Migration Schema::create('meeting_approvals', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('child_id'); - $table->foreign('child_id')->references('id')->on('children'); + $table->foreign('child_id')->references('id')->on('children')->onDelete('cascade'); $table->unsignedBigInteger('meeting_id'); - $table->foreign('meeting_id')->references('id')->on('meetings'); + $table->foreign('meeting_id')->references('id')->on('meetings')->onDelete('cascade'); $table->dateTime('approval_at')->nullable(); $table->timestamps(); }); diff --git a/backend/database/migrations/2021_09_29_023723_create_smsses_table.php b/backend/database/migrations/2021_09_29_023723_create_smsses_table.php index c4160642..4eb7a18e 100644 --- a/backend/database/migrations/2021_09_29_023723_create_smsses_table.php +++ b/backend/database/migrations/2021_09_29_023723_create_smsses_table.php @@ -17,7 +17,7 @@ class CreateSmssesTable extends Migration $table->id(); $table->unsignedTinyInteger('send_id'); $table->unsignedBigInteger('receive_id'); - $table->foreign('receive_id')->references('id')->on('children'); + $table->foreign('receive_id')->references('id')->on('children')->onDelete('cascade'); $table->unsignedTinyInteger('is_sent')->default(0); $table->timestamps(); });