From a662997a44373e51b4d8d90d1f67da610efcdcd2 Mon Sep 17 00:00:00 2001 From: Liesel Downes Date: Mon, 28 Oct 2024 13:43:30 +1030 Subject: [PATCH] Implement suggestions --- app/Http/Controllers/ClxMessagesController.php | 2 +- ...implement_database_dl_authorities_on_models.php | 10 ++++------ ..._105816_implement_dl_authority_foreign_keys.php | 14 ++++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/ClxMessagesController.php b/app/Http/Controllers/ClxMessagesController.php index 873c1af..f716a7b 100644 --- a/app/Http/Controllers/ClxMessagesController.php +++ b/app/Http/Controllers/ClxMessagesController.php @@ -161,7 +161,7 @@ public function transmit(RclMessage $rclMessage, ClxMessageRequest $request) 'entry_time_restriction' => $entryRequirement ?? null, 'raw_entry_time_restriction' => $request->get('entry_time_requirement'), 'free_text' => $isReclearance ? '** RECLEARANCE '.now()->format('Hi').' ** '.$request->get('free_text') : $request->get('free_text'), - 'datalink_authority_id' => DatalinkAuthority::whereId($request->get('datalink_authority'))->first()->id, + 'datalink_authority_id' => $request->get('datalink_authority_id'), 'is_concorde' => $rclMessage->is_concorde, ]); diff --git a/database/migrations/2024_10_23_104818_implement_database_dl_authorities_on_models.php b/database/migrations/2024_10_23_104818_implement_database_dl_authorities_on_models.php index a783159..8a4b759 100644 --- a/database/migrations/2024_10_23_104818_implement_database_dl_authorities_on_models.php +++ b/database/migrations/2024_10_23_104818_implement_database_dl_authorities_on_models.php @@ -19,13 +19,11 @@ public function up(): void public function down(): void { Schema::table('clx_messages', function (Blueprint $table) { - Schema::table('clx_messages', function (Blueprint $table) { - $table->renameColumn('datalink_authority_id', 'datalink_authority'); - }); + $table->renameColumn('datalink_authority_id', 'datalink_authority'); + }); - Schema::table('cpdlc_messages', function (Blueprint $table) { - $table->renameColumn('datalink_authority_id', 'datalink_authority'); - }); + Schema::table('cpdlc_messages', function (Blueprint $table) { + $table->renameColumn('datalink_authority_id', 'datalink_authority'); }); } }; diff --git a/database/migrations/2024_10_23_105816_implement_dl_authority_foreign_keys.php b/database/migrations/2024_10_23_105816_implement_dl_authority_foreign_keys.php index 9c462f9..4a209e8 100644 --- a/database/migrations/2024_10_23_105816_implement_dl_authority_foreign_keys.php +++ b/database/migrations/2024_10_23_105816_implement_dl_authority_foreign_keys.php @@ -21,15 +21,13 @@ public function up(): void public function down(): void { Schema::table('clx_messages', function (Blueprint $table) { - Schema::table('clx_messages', function (Blueprint $table) { - $table->dropForeign('clx_messages_datalink_authority_id_foreign'); - $table->string('datalink_authority', 4)->default('NATX')->change(); - }); + $table->dropForeign('clx_messages_datalink_authority_id_foreign'); + $table->string('datalink_authority', 4)->default('NATX')->change(); + }); - Schema::table('cpdlc_messages', function (Blueprint $table) { - $table->dropForeign('cpdlc_messages_datalink_authority_id_foreign'); - $table->string('datalink_authority', 4)->default(null)->change(); - }); + Schema::table('cpdlc_messages', function (Blueprint $table) { + $table->dropForeign('cpdlc_messages_datalink_authority_id_foreign'); + $table->string('datalink_authority', 4)->default(null)->change(); }); } };