From 91b93e45752c0c1d7640f2a2fc70ee5dc0180973 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Wed, 25 Dec 2024 13:03:09 +0330 Subject: [PATCH 1/2] add contract_subitem_id to azmayeshes table --- .../V3/Azmayesh/AzmayeshController.php | 7 +++-- .../Requests/V3/Azmayesh/StoreRequest.php | 1 + .../Requests/V3/Azmayesh/UpdateRequest.php | 1 + ..._093311_add_column_to_azmayeshes_table.php | 29 +++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php index 938a5d8f..83802ce4 100644 --- a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php @@ -36,7 +36,8 @@ class AzmayeshController extends Controller 'project_name', 'updated_at', 'created_at', - 'user_name' + 'user_name', + 'contract_subitem_id' ); $allowedFilters = $columns; @@ -80,6 +81,7 @@ class AzmayeshController extends Controller 'province_name' => $province->name_fa, 'user_id' => $user->id, 'user_name' => $user->name, + 'contract_subitem_id' => $request->contract_subitem_id ]); return $this->successResponse(); @@ -117,6 +119,7 @@ class AzmayeshController extends Controller 'applicant' => $request->applicant ?? '-', 'province_id' => $province->id, 'province_name' => $province->name_fa, + 'contract_subitem_id' => $request->contract_subitem_id ]); return $this->successResponse(); @@ -133,7 +136,7 @@ class AzmayeshController extends Controller return $this->successResponse(); } catch (QueryException $exception) { - return $this->errorResponse('can not be deleted'); + return $this->errorResponse('امکان حذف وجود ندارد'); } } } diff --git a/app/Http/Requests/V3/Azmayesh/StoreRequest.php b/app/Http/Requests/V3/Azmayesh/StoreRequest.php index aea7c1c4..dabf49b6 100644 --- a/app/Http/Requests/V3/Azmayesh/StoreRequest.php +++ b/app/Http/Requests/V3/Azmayesh/StoreRequest.php @@ -35,6 +35,7 @@ class StoreRequest extends FormRequest 'consultant' => 'string', 'applicant' => 'string', 'province_id' => 'required|exists:provinces,id', + 'contract_subitem_id' => 'required|exists:contract_subitems,id', ]; } } diff --git a/app/Http/Requests/V3/Azmayesh/UpdateRequest.php b/app/Http/Requests/V3/Azmayesh/UpdateRequest.php index ad2854b2..bbc8b87d 100644 --- a/app/Http/Requests/V3/Azmayesh/UpdateRequest.php +++ b/app/Http/Requests/V3/Azmayesh/UpdateRequest.php @@ -35,6 +35,7 @@ class UpdateRequest extends FormRequest 'consultant' => 'string', 'applicant' => 'string', 'province_id' => 'required|exists:provinces,id', + 'contract_subitem_id' => 'required|exists:contract_subitems,id', ]; } } diff --git a/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php b/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php new file mode 100644 index 00000000..56a8b167 --- /dev/null +++ b/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php @@ -0,0 +1,29 @@ +foreignId('contract_subitem_id')->constrained('contract_subitems')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('azmayeshes', function (Blueprint $table) { + $table->dropForeign('contract_subitem_id'); + $table->dropColumn(['contract_subitem_id']); + }); + } +}; From 0a9f989a2735382e947d4995f4e261d2f6f7668a Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Wed, 25 Dec 2024 13:32:44 +0330 Subject: [PATCH 2/2] add nullable to column --- .../2024_12_25_093311_add_column_to_azmayeshes_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php b/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php index 56a8b167..595a87b7 100644 --- a/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php +++ b/database/migrations/2024_12_25_093311_add_column_to_azmayeshes_table.php @@ -12,7 +12,7 @@ return new class extends Migration public function up(): void { Schema::table('azmayeshes', function (Blueprint $table) { - $table->foreignId('contract_subitem_id')->constrained('contract_subitems')->onDelete('cascade'); + $table->foreignId('contract_subitem_id')->nullable()->constrained('contract_subitems')->onDelete('cascade'); }); }