Merge pull request #736 from bakaphp/refact-onesignal-notification-counter

[0.3] refact: add notifiction badgets

Author: rwhite27

src/Cli/Jobs/PushNotifications.php

@@ -4,6 +4,7 @@
 
 use Baka\Contracts\Queue\QueueableJobInterface;
 use Baka\Jobs\Job;
+use Canvas\Models\Notifications;
 use Canvas\Models\UserLinkedSources;
 use Canvas\Models\Users;
 use Canvas\Notifications\PushNotification;
@@ -21,6 +22,8 @@ class PushNotifications extends Job implements QueueableJobInterface
     protected Users $users;
     protected string $message;
     protected string $title;
+    protected const IOS = 3;
+    protected const ANDROID = 2;
     /**
      * Realtime params.
      *
@@ -72,6 +75,12 @@ public function handle()
             $pushBody['data'] = $this->params;
         }
 
+        //if IOS add badge
+        if (!empty($userDevicesArray[self::IOS])) {
+            $pushBody['ios_badgeType'] = 'SetTo';
+            $pushBody['ios_badgeCount'] = Notifications::totalUnRead($this->users);
+        }
+
         /**
          * @todo We need to use external_users_id instead of player_id in the future
          * for proper multi-device notification.

src/Notifications/Notification.php

@@ -35,29 +35,29 @@ class Notification implements NotificationInterface
     protected bool $useQueue = false;
 
     /**
-     * Save the notifications into the db
+     * Save the notifications into the db.
      *
      * @var bool
      */
     protected bool $saveNotification = true;
 
     /**
-     * Send this notification to pusher
-     * 
+     * Send this notification to pusher.
+     *
      * @var bool
      */
     protected bool $toPusher = true;
 
     /**
-     * Send this notification to mail
-     * 
+     * Send this notification to mail.
+     *
      * @var bool
      */
     protected bool $toMail = true;
 
     /**
-     * Send this notification to push notification
-     * 
+     * Send this notification to push notification.
+     *
      * @var bool
      */
     protected bool $toPushNotification = true;
@@ -293,11 +293,11 @@ public function sendToQueue() : bool
     }
 
     /**
-     * Save the notification used to the database
+     * Save the notification used to the database.
      *
-     * @return boolean
+     * @return bool
      */
-    public function saveNotification(): bool
+    public function saveNotification() : bool
     {
         $content = $this->message();
         $app = Di::getDefault()->getApp();
@@ -325,29 +325,29 @@ public function saveNotification(): bool
      */
     public function trigger() : bool
     {
-        if($this->saveNotification) {
+        if ($this->saveNotification) {
             $this->saveNotification();
         }
 
-        if($this->toPusher) {
+        if ($this->toPusher) {
             $this->toPusher();
         }
 
-        if($this->toMail) {
+        if ($this->toMail) {
             $this->toMailNotification();
         }
 
-        if($this->toPushNotification) {
+        if ($this->toPushNotification) {
             $this->toSendPushNotification();
         }
 
         return true;
     }
 
     /**
-     * Send to pusher the notification
+     * Send to pusher the notification.
      *
-     * @return boolean
+     * @return bool
      */
     public function toPusher() : bool
     {
@@ -360,9 +360,9 @@ public function toPusher() : bool
     }
 
     /**
-     * Send notification to mail
+     * Send notification to mail.
      *
-     * @return boolean
+     * @return bool
      */
     public function toMailNotification() : bool
     {
@@ -375,9 +375,9 @@ public function toMailNotification() : bool
     }
 
     /**
-     * Send Push notification
+     * Send Push notification.
      *
-     * @return boolean
+     * @return bool
      */
     public function toSendPushNotification() : bool
     {