check if user accept notifications

This commit is contained in:
2026-03-26 10:29:51 +01:00
parent 83ec6c9a2a
commit 1d9c6726b3
3 changed files with 208 additions and 183 deletions
+111 -91
View File
@@ -35,15 +35,14 @@ class TasksController extends Controller
$event = Event::find($request["event_id"]);
$event->tasks()->create([
"name" => $request["name"],
"description" => $request["description"],
"start" => $request["start"],
"end" => $request["end"],
"location" => $request["location"],
"max_participants" => $request["max_participants"],
"name" => $request["name"],
"description" => $request["description"],
"start" => $request["start"],
"end" => $request["end"],
"location" => $request["location"],
"max_participants" => $request["max_participants"],
]);
return response()->json(['message' => "Task created"], 200);
} catch(\Exception $e) {
@@ -98,27 +97,31 @@ class TasksController extends Controller
if($user && Carbon::now()->lessThanOrEqualTo($task->end)) {
$notification = Notification::create([
'content' => "Vous avez été assigné à la tâche {$task->name} de l'événement {$event->name}."
]);
$notification->users()->attach($user->id);
if ($user->web_notifications) {
$notification = Notification::create([
'content' => "Vous avez été assigné à la tâche {$task->name} de l'événement {$event->name}."
]);
$notification->users()->attach($user->id);
broadcast(new VolunteerAssignedToTask(
$user->id,
$task,
$event,
$notification->id,
));
broadcast(new VolunteerAssignedToTask(
$user->id,
$task,
$event,
$notification->id,
));
}
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $task->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new VolunteerAssignToTaskMail($data));
if ($user->email_notifications) {
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $task->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new VolunteerAssignToTaskMail($data));
}
}
return response()->json(['message' => "Task assigned"], 200);
@@ -141,7 +144,6 @@ class TasksController extends Controller
Log::info($e->getMessage());
return response()->json(['message' => "Server error"], 500);
}
}
public function deleteTask(Request $request, int $id): JsonResponse {
@@ -161,29 +163,37 @@ class TasksController extends Controller
if (Carbon::now()->lessThanOrEqualTo($task->end)) {
if ($participants->isNotEmpty()) {
$notification = Notification::create([
'content' => "La tâche {$task->name} pour l'événement {$event->name} a été supprimée. Vous n'y participez donc plus."
]);
$notification->users()->attach($participants->pluck('id'));
}
$webParticipants = $participants->filter(fn($user) => $user->web_notifications);
foreach ($participants as $user) {
broadcast(new TaskParticipationCancelled(
$user->id,
$task,
$event,
$notification->id,
));
if ($webParticipants->isNotEmpty()) {
$notification = Notification::create([
'content' => "La tâche {$task->name} pour l'événement {$event->name} a été supprimée. Vous n'y participez donc plus."
]);
$notification->users()->attach($webParticipants->pluck('id'));
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $event->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new TaskParticipationCancelledMail($data));
foreach ($webParticipants as $user) {
broadcast(new TaskParticipationCancelled(
$user->id,
$task,
$event,
$notification->id,
));
}
}
foreach ($participants as $user) {
if ($user->email_notifications) {
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $event->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new TaskParticipationCancelledMail($data));
}
}
}
}
@@ -206,7 +216,7 @@ class TasksController extends Controller
try {
$task = Task::find($id);
if((
$task->start !== $request["start"] || $task->end !== $request["end"]
$task->start !== $request["start"] || $task->end !== $request["end"]
) &&
Carbon::now()->lessThanOrEqualTo($task->end)
){
@@ -216,30 +226,35 @@ class TasksController extends Controller
$event = Event::find($task->events_id);
foreach ($participants as $user) {
$notification = Notification::create([
'content' => "La date de la tâche {$task->name} de l'événement {$event->name} à été mis à jour. Cette tâche aura maintenant lieu du {$formatedTaskStart} au {$formatedTaskEnd}."
]);
$notification->users()->attach($user->id);
broadcast(new TaskDateUpdated(
$user->id,
$task,
$event,
FormatDate::formatDate($request["start"]),
FormatDate::formatDate($request["end"]),
$notification->id,
));
if ($user->web_notifications) {
$notification = Notification::create([
'content' => "La date de la tâche {$task->name} de l'événement {$event->name} à été mis à jour. Cette tâche aura maintenant lieu du {$formatedTaskStart} au {$formatedTaskEnd}."
]);
$notification->users()->attach($user->id);
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'oldStart' => $formatedTaskStart,
'oldEnd' => $formatedTaskEnd,
'newStart' => $request["start"],
'newEnd' => $request["end"],
'eventName' => $event->name,
];
Mail::to($user->email)->send(new TaskDateUpdateMail($data));
broadcast(new TaskDateUpdated(
$user->id,
$task,
$event,
FormatDate::formatDate($request["start"]),
FormatDate::formatDate($request["end"]),
$notification->id,
));
}
if ($user->email_notifications) {
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'oldStart' => $formatedTaskStart,
'oldEnd' => $formatedTaskEnd,
'newStart' => $request["start"],
'newEnd' => $request["end"],
'eventName' => $event->name,
];
Mail::to($user->email)->send(new TaskDateUpdateMail($data));
}
}
}
@@ -301,26 +316,31 @@ class TasksController extends Controller
$task->users()->detach($id);
if ($user && Carbon::now()->lessThanOrEqualTo($task->end)) {
$notification = Notification::create([
'content' => "Vous avez été désassigné de la tâche {$task->name} de l'événement {$event->name}."
]);
$notification->users()->attach($user->id);
broadcast(new VolunteerUnassignedFromTask(
$user->id,
$task,
$event,
$notification->id,
));
if ($user->web_notifications) {
$notification = Notification::create([
'content' => "Vous avez été désassigné de la tâche {$task->name} de l'événement {$event->name}."
]);
$notification->users()->attach($user->id);
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $task->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new VolunteerUnassignToTaskMail($data));
broadcast(new VolunteerUnassignedFromTask(
$user->id,
$task,
$event,
$notification->id,
));
}
if ($user->email_notifications) {
$data = [
'name' => $user->name,
'lastname' => $user->lastname,
'taskName' => $task->name,
'start' => $task->start,
'end' => $task->end,
'eventName' => $event->name,
];
Mail::to($user->email)->send(new VolunteerUnassignToTaskMail($data));
}
}
return response()->json(['message' => "User unassigned successfully"], 200);