feat: split event logic between Instructor and Driver

Finnick223 · Finnick223 · commit 97a2cdd25050 · 2025-02-12T15:09:01.000+01:00
- add new relationships eg. instructor has many drivers
- create separate controller for management events by instructor and get events by driver
- add route for listing drivers of instructor
- prefix event routes with roles
- make migration foreignId to users table
- embed driver details to api response for instructor
- validate if driver belongs to instructor when storing, updating or deleting data
diff --git a/app/Http/Controllers/DriverEventController.php b/app/Http/Controllers/DriverEventController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\DriverEventResource;
+use App\Models\Event;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\Request;
+
+class DriverEventController extends Controller
+{
+    use AuthorizesRequests;
+
+    public function index(Request $request)
+    {
+        $driver = $request->user();
+        $events = $driver->events;
+
+        return DriverEventResource::collection($events);
+    }
+}
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
diff --git a/app/Http/Controllers/InstructorDriverController.php b/app/Http/Controllers/InstructorDriverController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Resources\DriverResource;
+
+class InstructorDriverController extends Controller
+{
+    /**
+     * Display a listing of the instructor's drivers.
+     */
+    public function index(Request $request)
+    {
+        $instructor = $request->user();
+        $drivers = $instructor->drivers()->get();
+
+        return DriverResource::collection($drivers);
+    }
+}
diff --git a/app/Http/Controllers/InstructorEventController.php b/app/Http/Controllers/InstructorEventController.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\DriverEventResource;
+use App\Http\Resources\InstructorEventResource;
+use App\Models\Event;
+use App\Models\User;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\Request;
+
+class InstructorEventController extends Controller
+{
+    use AuthorizesRequests;
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request)
+    {
+        $instructor = $request->user();
+
+        $driverIds = $instructor->drivers->pluck('id');
+
+        $events = Event::whereIn('user_id', $driverIds)->with('driver')->get();
+
+        return InstructorEventResource::collection($events);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'driver_id' => 'required|exists:users,id',
+            'title'     => 'required|string|max:255',
+            'start'     => 'required|date',
+            'end'       => 'required|date',
+        ]);
+
+        $instructor = $request->user();
+
+        if (!$instructor->drivers()->where('id', $validated['driver_id'])->exists()) {
+            return response()->json(['message' => 'Unauthorized driver'], 403);
+        }
+
+        $driver = User::find($validated['driver_id']);
+
+        $event = $driver->events()->create([
+            'title' => $validated['title'],
+            'start' => $validated['start'],
+            'end'   => $validated['end'],
+        ]);
+        $event->load('driver');
+
+        return response()->json(new InstructorEventResource($event), 201);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, Event $event)
+    {
+        $instructor = $request->user();
+        if (!$instructor->drivers()->where('id', $event->user_id)->exists()) {
+            return response()->json(['message' => 'Unauthorized event'], 403);
+        }
+
+        $validated = $request->validate([
+            'title' => 'required|string|max:255',
+            'start' => 'required|date',
+            'end'   => 'required|date',
+        ]);
+
+        $event->update($validated);
+        $event->load('driver');
+
+        return response()->json(new InstructorEventResource($event));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Request $request, Event $event)
+    {
+        $instructor = $request->user();
+        if (!$instructor->drivers()->where('id', $event->user_id)->exists()) {
+            return response()->json(['message' => 'Unauthorized event'], 403);
+        }
+
+        $this->authorize('delete', $event);
+
+        $event->delete();
+
+        return response()->noContent();
+    }
+}
diff --git a/app/Http/Resources/DriverEventResource.php b/app/Http/Resources/DriverEventResource.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class EventResource extends JsonResource
+class DriverEventResource extends JsonResource
 {
     /**
      * Transform the resource into an array.
diff --git a/app/Http/Resources/DriverResource.php b/app/Http/Resources/DriverResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DriverResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id'    => $this->id,
+            'name'  => $this->name,
+        ];
+    }
+}
diff --git a/app/Http/Resources/InstructorEventResource.php b/app/Http/Resources/InstructorEventResource.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class InstructorEventResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'driver' => new DriverResource($this->whenLoaded('driver')),
+            'title' => $this->title,
+            'start' => $this->start,
+            'end' => $this->end,
+        ];
+    }
+}
diff --git a/app/Models/Course.php b/app/Models/Course.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int $id
@@ -41,4 +42,9 @@ public function category(): BelongsTo
     {
         return $this->belongsTo(Category::class);
     }
+
+    public function drivers(): HasMany
+    {
+        return $this->hasMany(User::class, 'course_id');
+    }
 }
diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -3,13 +3,14 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Event extends Model
 {
     protected $fillable = ['title', 'start', 'end', 'user_id'];
 
-    public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    public function driver(): BelongsTo
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'user_id');
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -5,6 +5,7 @@
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -68,4 +69,20 @@ public function events(): HasMany
     {
         return $this->hasMany(Event::class);
     }
+
+    public function course(): BelongsTo
+    {
+        return $this->belongsTo(Course::class);
+    }
+
+    public function instructor(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'instructor_id');
+    }
+
+    public function drivers(): HasMany
+    {
+        return $this->hasMany(User::class, 'instructor_id');
+    }
+
 }
diff --git a/database/migrations/2025_02_08_185223_add_course_and_instructor_to_users_table.php b/database/migrations/2025_02_08_185223_add_course_and_instructor_to_users_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->foreignId('course_id')
+                ->nullable()
+                ->constrained('courses')
+                ->nullOnDelete();
+
+            $table->foreignId('instructor_id')
+                ->nullable()
+                ->constrained('users')
+                ->nullOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropConstrainedForeignId('course_id');
+            $table->dropConstrainedForeignId('instructor_id');
+        });
+    }
+};
diff --git a/routes/api/api.php b/routes/api/api.php
@@ -3,7 +3,7 @@
 use App\Http\Controllers\AuthController;
 use App\Http\Controllers\CourseController;
 use App\Http\Controllers\CreditCardController;
-use App\Http\Controllers\EventController;
+use App\Http\Controllers\DriverEventController;
 use App\Http\Controllers\GoogleAuthController;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
@@ -22,10 +22,6 @@
     });
 });
 
-Route::middleware('auth:sanctum')->group(function () {
-    Route::apiResource('/events', EventController::class);
-});
-
 Route::get('/user', function (Request $request) {
     return $request->user();
 })->middleware('auth:sanctum');
diff --git a/routes/api/driver.php b/routes/api/driver.php
@@ -1,9 +1,11 @@
 <?php
 
 use App\Enums\RolesEnum;
+use App\Http\Controllers\DriverEventController;
 use Illuminate\Support\Facades\Route;
 
 $driver = RolesEnum::DRIVER->value;
-Route::group(['middleware' => ["role:$driver", 'auth:sanctum']], function () {
+Route::group(['prefix' => 'driver', 'middleware' => ['auth:sanctum', "role:driver"]], function () {
     //define driver routes
+    Route::apiResource('events', DriverEventController::class);
 });
diff --git a/routes/api/instructor.php b/routes/api/instructor.php

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Illuminate\Http\Request;`
`6`	`6`	`use Illuminate\Http\Resources\Json\JsonResource;`
`7`	`7`
`8`		`-class EventResource extends JsonResource`
	`8`	`+class DriverEventResource extends JsonResource`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`* Transform the resource into an array.`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use Illuminate\Database\Eloquent\Factories\HasFactory;`
`8`	`8`	`use Illuminate\Database\Eloquent\Model;`
`9`	`9`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
	`10`	`+use Illuminate\Database\Eloquent\Relations\HasMany;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* @property int $id`
`@@ -41,4 +42,9 @@ public function category(): BelongsTo`
`41`	`42`	`{`
`42`	`43`	`return $this->belongsTo(Category::class);`
`43`	`44`	`}`
	`45`	`+`
	`46`	`+ public function drivers(): HasMany`
	`47`	`+ {`
	`48`	`+ return $this->hasMany(User::class, 'course_id');`
	`49`	`+ }`
`44`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,14 @@`
`3`	`3`	`namespace App\Models;`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Eloquent\Model;`
	`6`	`+use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`6`	`7`
`7`	`8`	`class Event extends Model`
`8`	`9`	`{`
`9`	`10`	`protected $fillable = ['title', 'start', 'end', 'user_id'];`
`10`	`11`
`11`		`- public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo`
	`12`	`+ public function driver(): BelongsTo`
`12`	`13`	`{`
`13`		`- return $this->belongsTo(User::class);`
	`14`	`+ return $this->belongsTo(User::class, 'user_id');`
`14`	`15`	`}`
`15`	`16`	`}`