diff --git a/app/Events/EventParticipationCancelled.php b/app/Events/EventParticipationCancelled.php index 679fe7e..b975fac 100644 --- a/app/Events/EventParticipationCancelled.php +++ b/app/Events/EventParticipationCancelled.php @@ -2,7 +2,7 @@ namespace App\Events; -use App\Models\Events; +use App\Models\Event; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Broadcasting\PresenceChannel; @@ -22,7 +22,7 @@ class EventParticipationCancelled implements ShouldBroadcastNow /** * Create a new event instance. */ - public function __construct($userId, Events $event) + public function __construct($userId, Event $event) { $this->userId = $userId; $this->event = $event; diff --git a/app/Events/TaskParticipationCancelled.php b/app/Events/TaskParticipationCancelled.php index 2a45dd3..51a3d91 100644 --- a/app/Events/TaskParticipationCancelled.php +++ b/app/Events/TaskParticipationCancelled.php @@ -2,7 +2,7 @@ namespace App\Events; -use App\Models\Events; +use App\Models\Event; use App\Models\Task; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; @@ -24,7 +24,7 @@ class TaskParticipationCancelled implements ShouldBroadcastNow /** * Create a new event instance. */ - public function __construct($userId, Task $task, Events $event) + public function __construct($userId, Task $task, Event $event) { $this->userId = $userId; $this->task = $task; diff --git a/app/Events/VolunteerAssignedToTask.php b/app/Events/VolunteerAssignedToTask.php index 959dc0c..139ead3 100644 --- a/app/Events/VolunteerAssignedToTask.php +++ b/app/Events/VolunteerAssignedToTask.php @@ -2,7 +2,7 @@ namespace App\Events; -use App\Models\Events; +use App\Models\Event; use App\Models\Task; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; @@ -24,7 +24,7 @@ class VolunteerAssignedToTask implements ShouldBroadcastNow /** * Create a new event instance. */ - public function __construct($userId, Task $task, Events $event) + public function __construct($userId, Task $task, Event $event) { $this->userId = $userId; $this->task = $task; diff --git a/app/Events/VolunteerUnassignedFromTask.php b/app/Events/VolunteerUnassignedFromTask.php index 5ff4e43..56cbfb7 100644 --- a/app/Events/VolunteerUnassignedFromTask.php +++ b/app/Events/VolunteerUnassignedFromTask.php @@ -2,7 +2,7 @@ namespace App\Events; -use App\Models\Events; +use App\Models\Event; use App\Models\Task; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; @@ -24,7 +24,7 @@ class VolunteerUnassignedFromTask implements ShouldBroadcastNow /** * Create a new event instance. */ - public function __construct($userId, Task $task, Events $event) + public function __construct($userId, Task $task, Event $event) { $this->userId = $userId; $this->task = $task; diff --git a/app/Http/Controllers/EventsController.php b/app/Http/Controllers/EventsController.php index ca419e6..80adc0f 100644 --- a/app/Http/Controllers/EventsController.php +++ b/app/Http/Controllers/EventsController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers; use App\Events\EventParticipationCancelled; -use App\Models\Events; +use App\Models\Event; use App\Models\Notification; use App\Models\Task; use Illuminate\Http\Request; @@ -18,13 +18,13 @@ class EventsController extends Controller { - if (Gate::denies('create', Events::class)) { + if (Gate::denies('create', Event::class)) { return response()->json(['message' => 'Forbidden'], 403); } try { - Events::create([ + Event::create([ "name" => $request['name'], "description" => $request['description'], "start" => $request['start'], @@ -42,13 +42,13 @@ class EventsController extends Controller public function update(Request $request, int $id): JsonResponse { - if (Gate::denies('update', Events::class)) { + if (Gate::denies('update', Event::class)) { return response()->json(['message' => 'Forbidden'], 403); } try { - $event = Events::find($id); + $event = Event::find($id); $event->name = $request['name']; $event->description = $request['description']; @@ -68,7 +68,7 @@ class EventsController extends Controller try { - $events = Events::with('tasks')->get(); + $events = Event::with('tasks')->get(); return response()->json(['data' => $events]); @@ -81,12 +81,12 @@ class EventsController extends Controller public function delete(Request $request, int $id): JsonResponse { - if (Gate::denies('delete', Events::class)) { + if (Gate::denies('delete', Event::class)) { return response()->json(['message' => 'Forbidden'], 403); } try { - $event = Events::with('tasks.users')->find($id); + $event = Event::with('tasks.users')->find($id); if (!$event) { return response()->json(['message' => 'Event not found'], 404); @@ -122,7 +122,7 @@ class EventsController extends Controller try { - $event = Events::find($id); + $event = Event::find($id); return response()->json([ "id" => $event->id, "name" => $event->name, diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php index 0b7e444..1ea1fd4 100644 --- a/app/Http/Controllers/TasksController.php +++ b/app/Http/Controllers/TasksController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Events\TaskParticipationCancelled; use App\Events\VolunteerAssignedToTask; use App\Events\VolunteerUnassignedFromTask; -use App\Models\Events; +use App\Models\Event; use App\Models\Notification; use App\Models\Task; use App\Models\User; @@ -24,7 +24,7 @@ class TasksController extends Controller try { - $event = Events::find($request["event_id"]); + $event = Event::find($request["event_id"]); $event->tasks()->create([ "name" => $request["name"], @@ -112,7 +112,7 @@ class TasksController extends Controller try { - $event = Events::find($id); + $event = Event::find($id); return response()->json(['data' => $event->tasks()->get()]); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6b19a15..8bb5cd5 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -48,8 +48,7 @@ class UserController extends Controller $notification = Notification::create([ - 'content' => "Nouvelle demande d'inscription : {$user->name} {$user->lastname}", - 'user_id' => $user->id, + 'content' => "Nouvelle demande d'inscription : {$user->name} {$user->lastname}" ]); $admins = User::whereIn('role', [1, 2])->get(); $notification->users()->attach( diff --git a/app/Models/Events.php b/app/Models/Event.php similarity index 92% rename from app/Models/Events.php rename to app/Models/Event.php index 94ce833..8709fb0 100644 --- a/app/Models/Events.php +++ b/app/Models/Event.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class Events extends Model +class Event extends Model { use HasFactory; protected $fillable = [ diff --git a/app/Models/Notification.php b/app/Models/Notification.php index afbd645..e3bfe5b 100644 --- a/app/Models/Notification.php +++ b/app/Models/Notification.php @@ -17,7 +17,6 @@ class Notification extends Model User::class, 'notification_user', 'notification_id', - 'user_id' ) ->withPivot('unread') ->withTimestamps(); diff --git a/app/Models/Task.php b/app/Models/Task.php index c569495..e0dd0b7 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -2,13 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class Task extends Model +class Task extends Model { - use HasFactory; - protected $fillable = [ 'name', 'start', @@ -19,7 +16,7 @@ class Task extends Model ]; public function event() { - return $this->belongsTo(Events::class); + return $this->belongsTo(Event::class); } public function users() { diff --git a/app/Observers/EventObserver.php b/app/Observers/EventObserver.php index 6991bb4..2c13028 100644 --- a/app/Observers/EventObserver.php +++ b/app/Observers/EventObserver.php @@ -2,22 +2,22 @@ namespace App\Observers; -use App\Models\Events; +use App\Models\Event; use App\Services\TypesenseService; class EventObserver { - public function created(Events $event) + public function created(Event $event) { app(TypesenseService::class)->upsertEvent($event); } - public function updated(Events $event) + public function updated(Event $event) { app(TypesenseService::class)->upsertEvent($event); } - public function deleted(Events $event) + public function deleted(Event $event) { app(TypesenseService::class)->deleteEvent($event->id); } diff --git a/app/Policies/EventsPolicy.php b/app/Policies/EventsPolicy.php index a888718..abbed2f 100644 --- a/app/Policies/EventsPolicy.php +++ b/app/Policies/EventsPolicy.php @@ -2,7 +2,7 @@ namespace App\Policies; -use App\Models\Events; +use App\Models\Event; use App\Models\User; use Illuminate\Auth\Access\Response; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1cbe384..ba8c9ac 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,7 @@ namespace App\Providers; -use App\Models\Events; +use App\Models\Event; use App\Models\User; use App\Observers\EventObserver; use App\Observers\UserObserver; @@ -30,6 +30,6 @@ class AppServiceProvider extends ServiceProvider Route::middleware('web')->prefix('api')->group(base_path('routes/notifications.php')); Route::middleware('web')->prefix('api')->group(base_path('routes/channels.php')); User::observe(UserObserver::class); - Events::observe(EventObserver::class); + Event::observe(EventObserver::class); } } diff --git a/app/Providers/GateServiceProvider.php b/app/Providers/GateServiceProvider.php index 6e7d69c..094ec54 100644 --- a/app/Providers/GateServiceProvider.php +++ b/app/Providers/GateServiceProvider.php @@ -2,7 +2,7 @@ namespace App\Providers; -use App\Models\Events; +use App\Models\Event; use App\Models\Task; use App\Models\User; use App\Policies\EventsPolicy; @@ -27,7 +27,7 @@ class GateServiceProvider extends ServiceProvider public function boot(): void { Gate::policy(User::class, UsersPolicy::class); - Gate::policy(Events::class, EventsPolicy::class); + Gate::policy(Event::class, EventsPolicy::class); Gate::policy(Task::class, TasksPolicy::class); } } diff --git a/app/Services/TypesenseService.php b/app/Services/TypesenseService.php index adfe500..c00153c 100644 --- a/app/Services/TypesenseService.php +++ b/app/Services/TypesenseService.php @@ -3,7 +3,7 @@ namespace App\Services; use App\Models\User; -use App\Models\Events; +use App\Models\Event; use Illuminate\Support\Facades\Cache; use Typesense\Client; @@ -65,7 +65,7 @@ class TypesenseService } } - public function upsertEvent(Events $event): void + public function upsertEvent(Event $event): void { $this->ensureCollectionsExist(); diff --git a/app/Services/UserService.php b/app/Services/UserService.php index f95070c..01df1da 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -2,6 +2,7 @@ namespace App\Services; use App\Models\User; +use Illuminate\Support\Facades\Log; class UserService { diff --git a/database/factories/EventsFactory.php b/database/factories/EventFactory.php similarity index 89% rename from database/factories/EventsFactory.php rename to database/factories/EventFactory.php index 17d97d4..22651e6 100644 --- a/database/factories/EventsFactory.php +++ b/database/factories/EventFactory.php @@ -5,9 +5,9 @@ namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; /** - * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Events> + * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Event> */ -class EventsFactory extends Factory +class EventFactory extends Factory { /** * Define the model's default state. diff --git a/database/migrations/2025_11_07_103448_create_notifications_table.php b/database/migrations/2025_11_07_103448_create_notifications_table.php index 7c51134..a574923 100644 --- a/database/migrations/2025_11_07_103448_create_notifications_table.php +++ b/database/migrations/2025_11_07_103448_create_notifications_table.php @@ -15,7 +15,6 @@ return new class extends Migration $table->id(); $table->timestamps(); $table->string('content'); - $table->integer('user_id')->default(null); }); } diff --git a/database/migrations/2025_11_09_144248_create_tasks_table.php b/database/migrations/2025_11_09_144248_create_tasks_table.php index e6ce615..b8c6363 100644 --- a/database/migrations/2025_11_09_144248_create_tasks_table.php +++ b/database/migrations/2025_11_09_144248_create_tasks_table.php @@ -21,7 +21,7 @@ return new class extends Migration $table->dateTime("end"); $table->integer('max_participants'); - $table->foreignId("events_id")->constrained("events")->onDelete("cascade"); + $table->foreignId("event_id")->constrained("events")->onDelete("cascade"); $table->timestamps(); }); diff --git a/database/seeders/DevSeeder.php b/database/seeders/DevSeeder.php index c743000..06b033f 100644 --- a/database/seeders/DevSeeder.php +++ b/database/seeders/DevSeeder.php @@ -2,7 +2,7 @@ namespace Database\Seeders; -use App\Models\Events; +use App\Models\Event; use App\Models\User; use App\Services\TypesenseService; use Illuminate\Database\Console\Seeds\WithoutModelEvents; @@ -33,7 +33,7 @@ class DevSeeder extends Seeder User::factory()->count(10)->create(); - Events::factory()->count(10)->create(); + Event::factory()->count(10)->create(); } } diff --git a/tests/collection.bru b/tests/collection.bru index f18ae36..b0aa5f7 100644 --- a/tests/collection.bru +++ b/tests/collection.bru @@ -1,4 +1,4 @@ headers { Accept: application/json - X-XSRF-TOKEN: + X-XSRF-TOKEN: eyJpdiI6ImVGRmdjSGtkUUtUT2E3TVE0RVM3c0E9PSIsInZhbHVlIjoiTkNldWpJb0I3T1dQMVJmTm43ekRPa2ZocFRZc25jYVlyZ0RBVDV3UjJVVDdpQkI1MUtkNWZROS9xbHdPUElHNTlrcjh2TUIxaTNtL20wYXZpdnltRGhNTGpsSGZETFV3VUtNd200OWcwUXFiYU9Eamd1VmFxRzVBNVNZVHBxMEEiLCJtYWMiOiJiMTM1OGVhOGRjM2VjMTg5ZDk4MzMwMjBmNjBkZjQ4OGIzODcwZjMzYzZkOTQxY2E5YjYyMDUxNGY5MzFjNjA1IiwidGFnIjoiIn0= }