diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php index 55111b8..249cb9f 100644 --- a/app/Http/Controllers/TasksController.php +++ b/app/Http/Controllers/TasksController.php @@ -73,8 +73,8 @@ class TasksController extends Controller } try { - - $task = Task::with('event')->find($request["task_id"]); + $task = Task::find($request["task_id"]); + $event = \App\Models\Events::find($task->events_id); if ($task->users()->where('user_id', $id)->exists()) { return response()->json(["message" => "User already assigned to this task"], 400); @@ -88,10 +88,11 @@ class TasksController extends Controller if($user) { $task->users()->attach($id); + broadcast(new VolunteerAssignedToTask( $user->id, $task, - $task->event + $event )); } @@ -124,7 +125,8 @@ class TasksController extends Controller } try { - $task = Task::with(['users', 'event'])->find($id); + $task = Task::with(['users'])->find($id); + $event = \App\Models\Events::find($task->events_id); if (!$task) { return response()->json(["message" => "Task not found"], 404); @@ -136,7 +138,7 @@ class TasksController extends Controller broadcast(new TaskParticipationCancelled( $user->id, $task, - $task->event + $event )); } @@ -207,7 +209,8 @@ class TasksController extends Controller } try { - $task = Task::with('event')->find($request["task_id"]); + $task = Task::find($request["task_id"]); + $event = \App\Models\Events::find($task->events_id); if (!$task) { return response()->json(["message" => "Task not found"], 404); @@ -226,7 +229,7 @@ class TasksController extends Controller broadcast(new VolunteerUnassignedFromTask( $user->id, $task, - $task->event + $event )); }