Merge pull request #867 from NFDI4Chem/refactor-notifications

refactor: notifications

app/Actions/Project/ArchiveProject.php

@@ -24,7 +24,6 @@ public function toggle($project)
         $project->save();
         if ($project->is_archived) {
             $project->sendNotification('archival', $this->prepareSendList($project));
-            $project->sendNotification('archivalAdmin', User::role(['super-admin'])->get());
         }
     }
 

app/Actions/Project/InviteProjectMember.php

@@ -2,16 +2,17 @@
 
 namespace App\Actions\Project;
 
-use App\Events\InvitingProjectMember;
-use App\Mail\ProjectInvitation;
 use App\Models\User;
-use App\Notifications\ProjectInviteNotification;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Validator;
+use App\Events\ProjectInvite;
+use App\Mail\ProjectInvitation;
 use Illuminate\Validation\Rule;
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Rules\Role;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Mail;
+use App\Events\InvitingProjectMember;
+use Illuminate\Support\Facades\Validator;
+use App\Notifications\ProjectInviteNotification;
 
 class InviteProjectMember
 {
@@ -28,7 +29,7 @@ public function invite($user, $project, string $email, string $role = null, stri
 
         $this->validate($project, $email, $role, $message);
 
-        InvitingProjectMember::dispatch($project, $email, $role, $message);
+        //InvitingProjectMember::dispatch($project, $email, $role, $message);
 
         $invitation = $project->projectInvitations()->create([
             'email' => $email,
@@ -42,7 +43,7 @@ public function invite($user, $project, string $email, string $role = null, stri
         $invitedUser = User::where('email', $invitation->email)->first();
 
         if ($invitedUser) {
-            $invitedUser->notify(new ProjectInviteNotification($invitation));
+            event(new ProjectInvite($invitedUser, $invitation));
         }
     }
 

app/Actions/Study/InviteStudyMember.php

@@ -2,16 +2,17 @@
 
 namespace App\Actions\Study;
 
-use App\Events\InvitingStudyMember;
-use App\Mail\StudyInvitation;
 use App\Models\User;
-use App\Notifications\StudyInviteNotification;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Validator;
+use App\Events\StudyInvite;
+use App\Mail\StudyInvitation;
 use Illuminate\Validation\Rule;
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Rules\Role;
+use App\Events\InvitingStudyMember;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Validator;
+use App\Notifications\StudyInviteNotification;
 
 class InviteStudyMember
 {
@@ -28,7 +29,7 @@ public function invite($user, $study, string $email, string $role = null, string
 
         $this->validate($study, $email, $role, $message);
 
-        InvitingStudyMember::dispatch($study, $email, $role, $message);
+        //InvitingStudyMember::dispatch($study, $email, $role, $message);
 
         $invitation = $study->studyInvitations()->create([
             'email' => $email,
@@ -42,7 +43,8 @@ public function invite($user, $study, string $email, string $role = null, string
         $invitedUser = User::where('email', $invitation->email)->first();
 
         if ($invitedUser) {
-            $invitedUser->notify(new StudyInviteNotification($invitation));
+            //$invitedUser->notify(new StudyInviteNotification($invitation));
+            event(new StudyInvite($invitedUser, $invitation));
         }
     }
 

app/Events/ProjectArchival.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class ProjectArchival implements ShouldBroadcastNow
+{
+    use Dispatchable;
+    public $project;
+    public $sendTo;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct($project, $sendTo)
+    {
+        $this->project = $project;
+        $this->sendTo = $sendTo;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('channel-name'),
+        ];
+    }
+}

app/Events/ProjectDeletion.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class ProjectDeletion implements ShouldBroadcastNow
+{
+    use Dispatchable;
+    public $project;
+    public $sendTo;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct($project, $sendTo)
+    {
+        $this->project = $project;
+        $this->sendTo = $sendTo;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('channel-name'),
+        ];
+    }
+}

app/Events/ProjectInvite.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ProjectInvite implements ShouldBroadcastNow
+{
+    use Dispatchable;
+    public $invitedUser;
+    public $invitation;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct($invitedUser, $invitation)
+    {
+        $this->invitedUser = $invitedUser;
+        $this->invitation = $invitation;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('channel-name'),
+        ];
+    }
+}

app/Events/StudyInvite.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class StudyInvite implements ShouldBroadcastNow
+{
+    use Dispatchable;
+    public $invitedUser;
+    public $invitation;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct($invitedUser, $invitation)
+    {
+        $this->invitedUser = $invitedUser;
+        $this->invitation = $invitation;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('channel-name'),
+        ];
+    }
+}

app/Listeners/ProjectArchival.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\User;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Notification;
+use App\Notifications\ProjectArchivalNotification;
+use App\Notifications\ProjectArchivalNotificationToAdmins;
+
+class ProjectArchival
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(object $event): void
+    {
+        Notification::send($event->$sendTo, new ProjectArchivalNotification($event->project));
+        Notification::send(User::role(['super-admin'])->get(), new ProjectArchivalNotificationToAdmins($this));
+    }
+}

app/Listeners/ProjectDeletion.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Notification;
+use App\Notifications\ProjectDeletionNotification;
+
+class ProjectDeletion
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(object $event): void
+    {
+        Notification::send($event->sendTo, new ProjectDeletionNotification($event->project));
+    }
+}

app/Listeners/ProjectInvite.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Notification;
+use App\Notifications\ProjectInviteNotification;
+
+class ProjectInvite
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(object $event): void
+    {
+        Notification::send($event->$invitedUser, new ProjectInviteNotification($event->$invitation));
+    }
+}