From 2a424034719d575490cca11e40d1bddcaf0bd195 Mon Sep 17 00:00:00 2001 From: mirivlad Date: Wed, 1 Apr 2026 16:26:36 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20course=5Frequests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Правильная структура таблиц ✅ Все поля: organization_id, user_id, group_id, start_date, end_date Co-authored-by: Qwen-Coder --- ...1_074209_create_course_requests_tables.php | 33 ++++++++++++++----- ...ation_id_to_course_request_items_table.php | 28 ---------------- 2 files changed, 25 insertions(+), 36 deletions(-) delete mode 100755 database/migrations/2026_04_01_082026_add_organization_id_to_course_request_items_table.php diff --git a/database/migrations/2026_04_01_074209_create_course_requests_tables.php b/database/migrations/2026_04_01_074209_create_course_requests_tables.php index 5047f8b..fc62f1b 100755 --- a/database/migrations/2026_04_01_074209_create_course_requests_tables.php +++ b/database/migrations/2026_04_01_074209_create_course_requests_tables.php @@ -6,22 +6,39 @@ use Illuminate\Support\Facades\Schema; return new class extends Migration { - /** - * Run the migrations. - */ public function up(): void { - Schema::create('course_requests_tables', function (Blueprint $table) { + Schema::create('course_requests', function (Blueprint $table) { $table->id(); + $table->foreignId('organization_id')->nullable()->constrained()->onDelete('cascade'); + $table->foreignId('requested_by_user_id')->constrained('users')->onDelete('cascade'); + $table->enum('status', ['pending', 'approved', 'rejected'])->default('pending'); + $table->foreignId('approved_by')->nullable()->constrained('users')->onDelete('set null'); + $table->timestamp('approved_at')->nullable(); + $table->text('note')->nullable(); $table->timestamps(); + + $table->index(['status', 'created_at']); + }); + + Schema::create('course_request_items', function (Blueprint $table) { + $table->id(); + $table->foreignId('course_request_id')->constrained()->onDelete('cascade'); + $table->foreignId('course_id')->constrained()->onDelete('cascade'); + $table->foreignId('organization_id')->nullable()->constrained()->onDelete('cascade'); + $table->foreignId('user_id')->nullable()->constrained()->onDelete('cascade'); + $table->foreignId('group_id')->nullable()->constrained()->onDelete('cascade'); + $table->date('start_date'); + $table->date('end_date')->nullable(); + $table->timestamps(); + + $table->index('course_request_id'); }); } - /** - * Reverse the migrations. - */ public function down(): void { - Schema::dropIfExists('course_requests_tables'); + Schema::dropIfExists('course_request_items'); + Schema::dropIfExists('course_requests'); } }; diff --git a/database/migrations/2026_04_01_082026_add_organization_id_to_course_request_items_table.php b/database/migrations/2026_04_01_082026_add_organization_id_to_course_request_items_table.php deleted file mode 100755 index 0ac86a5..0000000 --- a/database/migrations/2026_04_01_082026_add_organization_id_to_course_request_items_table.php +++ /dev/null @@ -1,28 +0,0 @@ -