Giovanni/SAE-BUT2-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename model in singular

Browse Source
This commit is contained in:
Giovanni
2026-03-13 15:30:54 +01:00
parent 928d504b27
commit 922b4df8b5
21 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/EventParticipationCancelled.php
+2 -2
View File
@@ -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;
app/Events/TaskParticipationCancelled.php
+2 -2
View File
@@ -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;
app/Events/VolunteerAssignedToTask.php
+2 -2
View File
@@ -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;
app/Events/VolunteerUnassignedFromTask.php
+2 -2
View File
@@ -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;
app/Http/Controllers/EventsController.php
+9 -9
View File
@@ -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,
app/Http/Controllers/TasksController.php
+3 -3
View File
@@ -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()]);
app/Http/Controllers/UserController.php
+1 -2
View File
@@ -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(
app/Models/Events.php → app/Models/Event.php
+1 -1
View File
@@ -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 = [
app/Models/Notification.php
-1
View File
@@ -17,7 +17,6 @@ class Notification extends Model
User::class,
'notification_user',
'notification_id',
'user_id'
)
->withPivot('unread')
->withTimestamps();
app/Models/Task.php
+2 -5
View File
@@ -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() {
app/Observers/EventObserver.php
+4 -4
View File
@@ -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);
}
app/Policies/EventsPolicy.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace App\Policies;
use App\Models\Events;
use App\Models\Event;
use App\Models\User;
use Illuminate\Auth\Access\Response;
app/Providers/AppServiceProvider.php
+2 -2
View File
@@ -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);
}
}
app/Providers/GateServiceProvider.php
+2 -2
View File
@@ -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);
}
}
app/Services/TypesenseService.php
+2 -2
View File
@@ -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();
app/Services/UserService.php
+1
View File
@@ -2,6 +2,7 @@
namespace App\Services;
use App\Models\User;
use Illuminate\Support\Facades\Log;
class UserService
{