add $notificationId to every broadcast notification
This commit is contained in:
@@ -16,14 +16,16 @@ class EventParticipationCancelled implements ShouldBroadcastNow
|
||||
|
||||
public $userId;
|
||||
public $event;
|
||||
public $notificationId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, Event $event)
|
||||
public function __construct($userId, Event $event, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->event = $event;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -18,18 +18,20 @@ class TaskDateUpdated implements ShouldBroadcastNow
|
||||
public $event;
|
||||
public $start;
|
||||
public $end;
|
||||
public $notificationId;
|
||||
protected $userId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, Task $task, Event $event, $start, $end)
|
||||
public function __construct($userId, Task $task, Event $event, $start, $end, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->task = $task;
|
||||
$this->event = $event;
|
||||
$this->start = $start;
|
||||
$this->end = $end;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,15 +17,17 @@ class TaskParticipationCancelled implements ShouldBroadcastNow
|
||||
public $userId;
|
||||
public $task;
|
||||
public $event;
|
||||
public $notificationId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, Task $task, Event $event)
|
||||
public function __construct($userId, Task $task, Event $event, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->task = $task;
|
||||
$this->event = $event;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -15,13 +15,15 @@ class UserCreated implements ShouldBroadcastNow
|
||||
|
||||
|
||||
public $user;
|
||||
public $notificationId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct(User $user)
|
||||
public function __construct(User $user, $notificationId)
|
||||
{
|
||||
$this->user = $user;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -16,16 +16,18 @@ class VolunteerAssignedToTask implements ShouldBroadcastNow
|
||||
|
||||
public $task;
|
||||
public $event;
|
||||
public $notificationId;
|
||||
protected $userId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, Task $task, Event $event)
|
||||
public function __construct($userId, Task $task, Event $event, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->task = $task;
|
||||
$this->event = $event;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -15,15 +15,17 @@ class VolunteerRoleUpdated implements ShouldBroadcastNow
|
||||
use Dispatchable, InteractsWithSockets, SerializesModels;
|
||||
|
||||
public $role;
|
||||
public $notificationId;
|
||||
protected $userId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, $role)
|
||||
public function __construct($userId, $role, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->role = $role;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,15 +17,17 @@ class VolunteerUnassignedFromTask implements ShouldBroadcastNow
|
||||
public $userId;
|
||||
public $task;
|
||||
public $event;
|
||||
public $notificationId;
|
||||
|
||||
/**
|
||||
* Create a new event instance.
|
||||
*/
|
||||
public function __construct($userId, Task $task, Event $event)
|
||||
public function __construct($userId, Task $task, Event $event, $notificationId)
|
||||
{
|
||||
$this->userId = $userId;
|
||||
$this->task = $task;
|
||||
$this->event = $event;
|
||||
$this->notificationId = $notificationId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -107,7 +107,8 @@ class EventsController extends Controller
|
||||
foreach ($participants as $user) {
|
||||
broadcast(new EventParticipationCancelled(
|
||||
$user->id,
|
||||
$event
|
||||
$event,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
|
||||
@@ -107,6 +107,7 @@ class TasksController extends Controller
|
||||
$user->id,
|
||||
$task,
|
||||
$event,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
@@ -171,6 +172,7 @@ class TasksController extends Controller
|
||||
$user->id,
|
||||
$task,
|
||||
$event,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
@@ -224,6 +226,7 @@ class TasksController extends Controller
|
||||
$event,
|
||||
FormatDate::formatDate($request["start"]),
|
||||
FormatDate::formatDate($request["end"]),
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
@@ -306,6 +309,7 @@ class TasksController extends Controller
|
||||
$user->id,
|
||||
$task,
|
||||
$event,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
|
||||
@@ -61,7 +61,10 @@ class UserController extends Controller
|
||||
$notification->users()->attach(
|
||||
$admins->pluck('id')->toArray()
|
||||
);
|
||||
broadcast(new UserCreated($user));
|
||||
broadcast(new UserCreated(
|
||||
$user,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
foreach ($admins as $admin) {
|
||||
$data = [
|
||||
@@ -263,7 +266,8 @@ class UserController extends Controller
|
||||
|
||||
broadcast(new VolunteerRoleUpdated(
|
||||
$user->id,
|
||||
$role
|
||||
$role,
|
||||
$notification->id,
|
||||
));
|
||||
|
||||
$data = [
|
||||
|
||||
Reference in New Issue
Block a user