Committing for UUID for Users and including watchables

Author: lrljoe

Diff for: .vscode/settings.json

@@ -0,0 +1,21 @@
+{
+  "php.executablePath": "c:\\xampp\\php\\php.exe",
+  "php.debug.executablePath": "c:\\xampp\\php\\php.exe",
+  "php.validate.executablePath": "c:\\xampp\\php\\php.exe",
+  "editor.detectIndentation": false,
+  "phpcs.standard": "PSR12",
+  "php-cs-fixer.executablePath": "C:\\xampp\\php\\php-cs-fixer.phar",
+  "php-cs-fixer.lastDownload": 1659542285557,
+  "php-cs-fixer.executablePathWindows": "C:\\xampp\\php\\php-cs-fixer.phar",
+  "php-cs-fixer.rules": "@PSR12",
+  "files.eol": "\n",
+  "php-cs-fixer.autoFixBySemicolon": true,
+  "php-cs-fixer.exclude": [
+
+  ],
+  "remote.SSH.remotePlatform": {
+      "192.168.1.100": "linux"
+  },
+  "sonarlint.pathToNodeExecutable": "C:\\program files\\nodejs\\node.exe",
+  "phpcs.executablePath": "c:\\xampp\\php\\phpcs"
+}

Diff for: database/migrations/2019_07_15_152649_create_notification_settings_table.php

@@ -15,7 +15,7 @@ public function up()
     {
         Schema::create('notification_settings', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->unsignedBigInteger('user_id');
+            $table->uuid('user_id');
             $table->string('user_type');
             $table->unsignedBigInteger('notification_type_id');
             $table->boolean('status')->default(true);

Diff for: src/ChannelManager.php

@@ -23,10 +23,21 @@ public function send($notifiables, $notification)
             return;
         }
 
+        $watchers = $notifiables['watchers'];
+        $notifiables = $notifiables['notifiableUsers'];
+
         $notifiables = $this->notifiables($notifiables, $notificationType);
+        $notifiables = $notifiables->concat($watchers);
+        $notifiables = $notifiables->unique(function ($item) {
+            return $item['email'];
+        });
 
         (new NotificationSender(
-            $this, $this->container->make(Bus::class), $this->container->make(Dispatcher::class), $this->locale)
+            $this,
+            $this->container->make(Bus::class),
+            $this->container->make(Dispatcher::class),
+            $this->locale
+        )
         )->send($notifiables, $notification);
     }
 
@@ -45,11 +56,22 @@ public function sendNow($notifiables, $notification, array $channels = null)
         if (! NotificationType::isEnabled($notificationType)) {
             return;
         }
+        $watchers = $notifiables['watchers'];
+        $notifiables = $notifiables['notifiableUsers'];
 
         $notifiables = $this->notifiables($notifiables, $notificationType);
 
+        $notifiables = $notifiables->concat($watchers);
+        $notifiables = $notifiables->unique(function ($item) {
+            return $item['email'];
+        });
+
         (new NotificationSender(
-            $this, $this->container->make(Bus::class), $this->container->make(Dispatcher::class), $this->locale)
+            $this,
+            $this->container->make(Bus::class),
+            $this->container->make(Dispatcher::class),
+            $this->locale
+        )
         )->sendNow($notifiables, $notification, $channels);
     }
 
@@ -65,6 +87,9 @@ public static function notifiables($notifiables, $notificationType)
         $notifiables->load('notificationSettings');
 
         return $notifiables->filter(function ($notifiable) use ($notificationType) {
+            if ($notificationType == 'App\Notifications\InstanceInvite') {
+                return true;
+            }
             return $notifiable->canReceive($notificationType);
         });
     }