Implement Support for multiple E-Mail Adresses

Author: LKaemmerling

README.md

@@ -104,6 +104,15 @@ public function routeNotificationForOneSignal()
 }
 ```
 
+If you want to send the notification based on the OneSignal "syncHashedEmail" feature just return an array with the index "email" and the E-Mail or an Array with E-Mails.
+
+```php
+public function routeNotificationForOneSignal()
+{
+    return ['email' => '[email protected]'];
+}
+```
+
 ### All available methods
 
 - `subject('')`: Accepts a string value for the title.

src/OneSignalChannel.php

@@ -34,7 +34,7 @@ public function send($notifiable, Notification $notification)
 
         $payload = $notification->toOneSignal($notifiable)->toArray();
         if (is_array($userIds) && array_key_exists('email', $userIds)) {
-            $payload['filters'] = collect([["field" => "email", "relation" => "=", "value" => $userIds['email']]]);
+            $payload['filters'] = collect($this->parseEmailsToFilters($userIds['email']));
         } else {
             $payload['include_player_ids'] = collect($userIds);
         }
@@ -45,4 +45,27 @@ public function send($notifiable, Notification $notification)
             throw CouldNotSendNotification::serviceRespondedWithAnError($response);
         }
     }
+
+    /**
+     * Parse the given E-Mails to the array-format that OneSignal needs.
+     *
+     * @param mixed $userEmails
+     *
+     * @return array
+     */
+    public function parseEmailsToFilters($userEmails)
+    {
+        if (is_array($userEmails)) {
+            return collect($userEmails)->map(function ($email, $key) use ($userEmails) {
+                if ($key < (count($userEmails) - 1)) {
+                    return [["field" => "email", "relation" => "=", "value" => $email], ['operator' => 'OR']];
+                } else {
+                    return [["field" => "email", "relation" => "=", "value" => $email]];
+                }
+            })->flatten(1)->toArray();
+        }
+
+        return [["field" => "email", "relation" => "=", "value" => $userEmails]];
+
+    }
 }

tests/ChannelTest.php

@@ -82,6 +82,9 @@ public function it_throws_an_exception_when_it_could_not_send_the_notification()
         $this->channel->send(new Notifiable(), new TestNotification());
     }
 
+    /**
+     * @test
+     */
     public function it_can_send_a_notification_with_email()
     {
         $response = new Response(200);
@@ -98,10 +101,36 @@ public function it_can_send_a_notification_with_email()
                 'chrome_icon' => 'Icon',
                 'adm_small_icon' => 'Icon',
                 'small_icon' => 'Icon',
-                'filters' => collect(["field" => "email", "relation" => "=", "value" => '[email protected]']),
+                'filters' => collect([["field" => "email", "relation" => "=", "value" => '[email protected]']]),
             ])
             ->andReturn($response);
 
         $this->channel->send(new NotifiableEMail(), new TestNotification());
     }
+
+    /**
+     * @test
+     */
+    public function it_can_send_a_notification_with_multiple_email()
+    {
+        $response = new Response(200);
+
+        $this->oneSignal->shouldReceive('sendNotificationCustom')
+            ->once()
+            ->with([
+                'contents' => ['en' => 'Body'],
+                'headings' => ['en' => 'Subject'],
+                'url' => 'URL',
+                'buttons' => [],
+                'web_buttons' => [],
+                'chrome_web_icon' => 'Icon',
+                'chrome_icon' => 'Icon',
+                'adm_small_icon' => 'Icon',
+                'small_icon' => 'Icon',
+                'filters' => collect([["field" => "email", "relation" => "=", "value" => '[email protected]'], ['operator' => 'OR'], ["field" => "email", "relation" => "=", "value" => '[email protected]']]),
+            ])
+            ->andReturn($response);
+
+        $this->channel->send(new NotifiableMultipleEMail(), new TestNotification());
+    }
 }

tests/NotifiableEMail.php

@@ -4,10 +4,11 @@
 
 class NotifiableEMail
 {
+
     use \Illuminate\Notifications\Notifiable;
 
     /**
-     * @return int
+     * @return array
      */
     public function routeNotificationForOneSignal()
     {

tests/NotifiableMultipleEMail.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace NotificationChannels\OneSignal\Test;
+
+class NotifiableMultipleEMail
+{
+
+    use \Illuminate\Notifications\Notifiable;
+
+    /**
+     * @return array
+     */
+    public function routeNotificationForOneSignal()
+    {
+        return ['email' => ['[email protected]', '[email protected]']];
+    }
+}