Merge branch 'loparev' of aloparev/digital_college into Develop

src/server/app/Http/Controllers/CoursesController.php

@@ -22,10 +22,13 @@ class CoursesController extends Controller
      */
     public function index()
     {
-        $courses = Courses::all();
-        $courses = TeachersResource::collection($courses); // Преобразуем ответ, collection если объектов несколько
+        $courses = Courses::with('teachers')->get();
 
-        return response()->json(["status" => true, "posts" => $courses]);
+
+//        $courses = TeachersResource::collection($courses); // Преобразуем ответ, collection если объектов несколько
+
+//        return response()->json(["status" => true, "posts" => $courses]);
+        return $courses->toJson();
     }
 
     /**

src/server/app/Models/Courses.php

@@ -7,5 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Courses extends Model
 {
-    use HasFactory;
+   public function teachers(){
+       return $this->hasMany(Teachers::class);
+   }
 }

src/server/app/Models/Teachers.php

@@ -7,11 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class Teachers extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [
-        'education_places',
-        'fio',
-        'rank',
-    ];
+    protected $hidden = ['password'];
+    public function teacher(){
+//        return $this->belongsTo('App\Models\Courses','teacher_id');
+    }
 }

src/server/database/migrations/2021_05_25_035618_create_teachers_table.php

@@ -27,6 +27,7 @@ class CreateTeachersTable extends Migration
             $table->string('phone', 20);
             $table->string('education_place');
             $table->unsignedBigInteger('user_id');
+            $table->unsignedBigInteger('courses_id');
             $table->string('api_token')->nullable();
             $table->timestamps();
 

src/server/database/migrations/2021_05_25_042104_create_courses_table.php

@@ -19,18 +19,15 @@ class CreateCoursesTable extends Migration
             $table->string('name');
             $table->integer('price');
             $table->integer('period');
-            $table->string('email');
-            $table->string('program');
-            $table->string('places');
+            $table->string('forma');
+            $table->string('level');
             $table->integer('hours');
-            $table->string('documents');
-            $table->string('education_place');
-            $table->string('contact_ed');
-            $table->string('contact');
-            $table->unsignedBigInteger('teacher_id');
+            $table->unsignedBigInteger('teacher_id')->nullable();
+            $table->unsignedBigInteger('organisation_id')->nullable();
             $table->timestamps();
 
             $table->foreign('teacher_id')->on('teachers')->references('id');
+            $table->foreign('organisation_id')->on('organisations')->references('id');
         });
     }
 

src/server/database/migrations/2021_05_28_075639_create_organisations_table.php

@@ -15,7 +15,14 @@ class CreateOrganisationsTable extends Migration
     {
         Schema::create('organisations', function (Blueprint $table) {
             $table->id();
+            $table->string('name');
+            $table->string('email');
+            $table->string('address');
+            $table->string('boss');
+            $table->unsignedBigInteger('teacher_id');
             $table->timestamps();
+
+            $table->foreign('teacher_id')->on('teachers')->references('id');
         });
     }
 

src/server/routes/api.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\CoursesController;
 
 /*
 |--------------------------------------------------------------------------
@@ -17,3 +18,4 @@ use Illuminate\Support\Facades\Route;
 Route::post('/register', 'UserController@register');
 Route::post('/login', 'UserController@login');
 Route::post('/logout', 'UserController@logout');
+Route::get('/courses',[CoursesController::class,'index']);