Merge branch 'feature/admin-team-user-invites' of https://github.com/…

…openfoodfoundation/vine into feature/admin-team-user-invites
openfoodfoundation · Aug 20, 2024 · d5a54c5 · d5a54c5
2 parents 5f6babe + 259f11f
commit d5a54c5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 28 deletions.
diff --git a/app/Http/Controllers/Api/V1/Admin/ApiAdminTeamUsersController.php b/app/Http/Controllers/Api/V1/Admin/ApiAdminTeamUsersController.php
@@ -146,7 +146,7 @@ public function update(string $id)
 
             $this->responseCode = 400;
             $this->message      = $validator->errors()
-                                            ->first();
+                ->first();
 
         }
         else {
@@ -161,14 +161,12 @@ public function update(string $id)
                     $this->message      = ApiResponse::RESPONSE_NOT_FOUND->value;
 
                 }
-                else{
+                else {
 
-                    if($this->request->has('send_invite_email'))
-                    {
+                    if ($this->request->has('send_invite_email')) {
                         $sendInviteEmail = $this->request->get('send_invite_email');
 
-                        if($sendInviteEmail)
-                        {
+                        if ($sendInviteEmail) {
                             $model->invitation_sent_at = now();
                             $model->save();
 
@@ -180,7 +178,6 @@ public function update(string $id)
                     $this->data    = $model;
                 }
 
-
             }
             catch (Exception $e) {
 

diff --git a/app/Jobs/TeamUsers/SendTeamUserInvitationEmail.php b/app/Jobs/TeamUsers/SendTeamUserInvitationEmail.php
@@ -6,10 +6,7 @@
 use App\Models\User;
 use App\Notifications\Mail\TeamUsers\SendTeamUserInvitationEmailNotification;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Foundation\Queue\Queueable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
 class SendTeamUserInvitationEmail implements ShouldQueue
@@ -18,11 +15,10 @@ class SendTeamUserInvitationEmail implements ShouldQueue
 
     /**
      * Create a new job instance.
+     *
+     * @param TeamUser $teamUser
      */
-    public function __construct(public TeamUser $teamUser)
-    {
-        //
-    }
+    public function __construct(public TeamUser $teamUser) {}
 
     /**
      * Execute the job.
@@ -31,8 +27,7 @@ public function handle(): void
     {
         $userToNotify = User::find($this->teamUser->user_id);
 
-        if($userToNotify)
-        {
+        if ($userToNotify) {
             $userToNotify->current_team_id = $this->teamUser->team_id;
             $userToNotify->saveQuietly();
 

diff --git a/app/Notifications/Mail/TeamUsers/SendTeamUserInvitationEmailNotification.php b/app/Notifications/Mail/TeamUsers/SendTeamUserInvitationEmailNotification.php
@@ -15,15 +15,16 @@ class SendTeamUserInvitationEmailNotification extends Notification implements Sh
 
     /**
      * Create a new notification instance.
+     *
+     * @param TeamUser $teamUser
      */
-    public function __construct(public TeamUser $teamUser)
-    {
-        //
-    }
+    public function __construct(public TeamUser $teamUser) {}
 
     /**
      * Get the notification's delivery channels.
      *
+     * @param object $notifiable
+     *
      * @return array<int, string>
      */
     public function via(object $notifiable): array
@@ -33,29 +34,33 @@ public function via(object $notifiable): array
 
     /**
      * Get the mail representation of the notification.
+     *
+     * @param object $notifiable
      */
     public function toMail(object $notifiable): MailMessage
     {
         $team = Team::find($this->teamUser->team_id);
 
-        return (new MailMessage)
-                    ->subject('You have been invited to join ' . $team->name. ' - '.config('app.name'))
-                    ->line('You have been invited to join team "' . $team->name. '" on '.config('app.name').'.')
-                    ->line('An account has been created for you on the team, but if you have never logged in to use the system, you may need to reset your password in order to log in.')
-                    ->line('Please follow the button below to reset your password and log in.')
-                    ->action('Reset your password & log in', url('/forgot-password'))
-                    ->line('Thank you for using our application!');
+        return (new MailMessage())
+            ->subject('You have been invited to join ' . $team->name . ' - ' . config('app.name'))
+            ->line('You have been invited to join team "' . $team->name . '" on ' . config('app.name') . '.')
+            ->line('An account has been created for you on the team, but if you have never logged in to use the system, you may need to reset your password in order to log in.')
+            ->line('Please follow the button below to reset your password and log in.')
+            ->action('Reset your password & log in', url('/forgot-password'))
+            ->line('Thank you for using our application!');
     }
 
     /**
      * Get the array representation of the notification.
      *
+     * @param object $notifiable
+     *
      * @return array<string, mixed>
      */
     public function toArray(object $notifiable): array
     {
         return [
-            //
+
         ];
     }
 }