Store comment notification recipients

Author: xaviqv

src/Controllers/CommentsController.php

@@ -194,7 +194,7 @@ public function store(Request $request)
 		}
 
 		DB::commit();
-		event(new CommentCreated(Models\Comment::find($comment->id), $request));
+		event(new CommentCreated(clone $comment, $request));
 
 		session()->flash('status', trans('panichd::lang.comment-has-been-added-ok'));
 

src/Controllers/NotificationsController.php

@@ -8,6 +8,7 @@
 use PanicHD\PanicHD\Helpers\LaravelVersion;
 use PanicHD\PanicHD\Models\Category;
 use PanicHD\PanicHD\Models\Comment;
+use PanicHD\PanicHD\Models\Member;
 use PanicHD\PanicHD\Models\Setting;
 use PanicHD\PanicHD\Models\Ticket;
 
@@ -143,26 +144,50 @@ public function newComment(Comment $comment, $request)
 				'notification_type' => $comment->type
 			];
 
-			// Notificate assigned agent
-			$a_to = $this->defaultRecipients($ticket, $notification_owner, $subject, $template);
+            $member = Member::find(auth()->user()->id);
+            $category_level = $member->levelInCategory($ticket->category_id);
+    		$permission_level = ($member->currentLevel() > 1 and $category_level > 1) ? $category_level : 1;
+
+            if ($permission_level < 2){
+                // Notificate assigned agent
+                $a_to = $this->defaultRecipients($ticket, $notification_owner, $subject, $template);
+
+            }elseif($comment->type == 'note' or !$ticket->hidden){
+                // Selected recipients
+                $c_recipients = $comment->type == 'note' ? $request->note_recipients : $request->reply_recipients;
+
+                foreach($c_recipients as $member_id){
+                    $recipient = Member::find($member_id);
+                    if (count($recipient) == 1){
+                        // Register the notified email
+                        \DB::table('panichd_comment_email')->insert([
+                           ['comment_id' => $comment->id,
+                            'name' => $recipient->name,
+                            'email' => $recipient->email,
+                            'member_id' => $member_id
+                            ]
+                        ]);
+
+                        // Add email to actual mail recipients
+                        $a_to[] = [
+        					'recipient' => $recipient,
+        					'subject'   => $subject,
+        					'template'  => $template
+        				];
+                    }
+
+                }
 
-			// Notificate ticket owner
-			if ($comment->type == 'reply' and !$ticket->hidden and !in_array($ticket->owner->email, [$notification_owner->email, $ticket->agent->email])){
                 if ($request->has('add_in_user_notification_text') or (isset($comment->add_in_user_notification_text))){
                     // Element in request comes from Comment modal
                     // $comment property comes from an embedded comment when editing or creating a ticket
                     $data['add_in_user_notification_text'] = true;
 				}
 
-				$a_to[] = [
-					'recipient' => $ticket->owner,
-					'subject'   => $subject,
-					'template'  => $template
-				];
-			}
+            }
 
 			// Send notifications
-			$this->sendNotification($a_to, $data);
+			if(isset($a_to)) $this->sendNotification($a_to, $data);
 		}
     }
 

src/Migrations/2018_12_04_081948_create_panichd_comment_email.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePanichdCommentEmail extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('panichd_comment_email', function (Blueprint $table) {
+            $table->integer('comment_id');
+            $table->string('name');
+            $table->string('email');
+            $table->integer('member_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('panichd_comment_email');
+    }
+}