Patch: Replace left Member model entries with PanicHDMember alias

Author: xaviqv

src/Controllers/NotificationsController.php

@@ -9,7 +9,6 @@
 use PanicHD\PanicHD\Models\Category;
 use PanicHD\PanicHD\Models\Comment;
 use PanicHD\PanicHD\Models\CommentNotification;
-use PanicHD\PanicHD\Models\Member;
 use PanicHD\PanicHD\Models\Setting;
 use PanicHD\PanicHD\Models\Ticket;
 
@@ -145,7 +144,7 @@ public function newComment(Comment $comment, $request)
                 'notification_type'  => $comment->type,
             ];
 
-            $member = Member::find(auth()->user()->id);
+            $member = \PanicHDMember::find(auth()->user()->id);
             $category_level = $member->levelInCategory($ticket->category_id);
             $permission_level = ($member->currentLevel() > 1 and $category_level > 1) ? $category_level : 1;
 
@@ -172,7 +171,7 @@ public function newComment(Comment $comment, $request)
 
                     // All previous comments recipients
                     foreach ($comm->notifications as $notification) {
-                        $recipient = Member::find($notification->member_id);
+                        $recipient = \PanicHDMember::find($notification->member_id);
                         if (!is_null($recipient) and ($comment->type == 'reply' or ($comment->type != 'reply' and $recipient->levelInCategory($ticket->category->id) > 1))
                             and $notification_owner->id != $recipient->id and !in_array($recipient->id, $a_recipients)) {
                             $a_recipients[] = $recipient->id;
@@ -201,7 +200,7 @@ public function newComment(Comment $comment, $request)
 
             if ($a_recipients and count($a_recipients) > 0) {
                 foreach ($a_recipients as $member_id) {
-                    $recipient = Member::find($member_id);
+                    $recipient = \PanicHDMember::find($member_id);
                     if (!is_null($recipient)) {
                         // Register the notified email
                         $notification = CommentNotification::create([
@@ -246,7 +245,7 @@ public function commentUpdate(Comment $original_comment, Comment $comment)
 
             // Send notification to all comment notified users
             foreach ($comment->notifications as $notification) {
-                $recipient = Member::find($notification->member_id);
+                $recipient = \PanicHDMember::find($notification->member_id);
                 if (!is_null($recipient)) {
                     if ($recipient->email != $notification_owner->email) {
                         $a_to[] = [
@@ -284,7 +283,7 @@ public function notificationResend(Request $request)
         if ($request->input('recipients') != '') {
             foreach ($request->recipients as $recipient_key) {
                 // Search by member_id or by email address
-                $recipient = Member::where('id', $recipient_key)->orWhere('email', $recipient_key)->first();
+                $recipient = \PanicHDMember::where('id', $recipient_key)->orWhere('email', $recipient_key)->first();
 
                 if (!is_null($recipient)) {
                     $a_to[] = [

src/Controllers/TicketsController.php

@@ -16,7 +16,6 @@
 use PanicHD\PanicHD\Models\Attachment;
 use PanicHD\PanicHD\Models\Category;
 use PanicHD\PanicHD\Models\Department;
-use PanicHD\PanicHD\Models\Member;
 use PanicHD\PanicHD\Models\Setting;
 use PanicHD\PanicHD\Models\Tag;
 use PanicHD\PanicHD\Models\Ticket;
@@ -1011,7 +1010,7 @@ public function search_form_defaults()
 
         $a_categories = $this->member->getEditTicketCategories();
 
-        $c_visible_agents = Member::visible()->get();
+        $c_visible_agents = \PanicHDMember::visible()->get();
 
         // Tag lists
         $c_cat_tags = Category::whereHas('tags')

tests/PanicHDTestCase.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\TestCase;
 use PanicHD\PanicHD\Controllers\InstallController;
-use PanicHD\PanicHD\Models\Member;
 use PanicHD\PanicHD\Models\Setting;
 
 abstract class PanicHDTestCase extends TestCase
@@ -72,8 +71,8 @@ public function load_vars()
 
         if (is_null($this->member)) {
             // TODO: Generate fake user
-            if (Member::users()->count() > 0) {
-                $this->member = Member::whereHas('tickets', function ($query) {
+            if (\PanicHDMember::users()->count() > 0) {
+                $this->member = \PanicHDMember::whereHas('tickets', function ($query) {
                     $query->notHidden();
                 })->inRandomOrder()->users()->first();
                 if (!is_null($this->member)) {
@@ -85,15 +84,15 @@ public function load_vars()
 
         if (is_null($this->agent)) {
             // TODO: Generate fake agent
-            if (Member::agents()->count() > 0) {
-                $this->agent = Member::whereHas('agentTickets')->inRandomOrder()->agents()->first();
+            if (\PanicHDMember::agents()->count() > 0) {
+                $this->agent = \PanicHDMember::whereHas('agentTickets')->inRandomOrder()->agents()->first();
             }
         }
 
         if (is_null($this->admin)) {
             // TODO: Generate fake admin
-            if (Member::admins()->count() > 0) {
-                $this->admin = Member::inRandomOrder()->admins()->first();
+            if (\PanicHDMember::admins()->count() > 0) {
+                $this->admin = \PanicHDMember::inRandomOrder()->admins()->first();
             }
         }