Add payload factory (#50)

* add payload factory

* add doc block

* add new tags logic to factory

Author: timacdonald

src/OneSignalChannel.php

@@ -32,25 +32,27 @@ public function send($notifiable, Notification $notification)
             return;
         }
 
-        $payload = $notification->toOneSignal($notifiable)->toArray();
-
-        if (is_array($userIds)) {
-            if (array_key_exists('email', $userIds)) {
-                $payload['filters'] = collect([['field' => 'email', 'value' => $userIds['email']]]);
-            } elseif (array_key_exists('tags', $userIds)) {
-                $payload['tags'] = collect([$userIds['tags']]);
-            }
-        } else {
-            $payload['include_player_ids'] = collect($userIds);
-        }
-
         /** @var ResponseInterface $response */
-        $response = $this->oneSignal->sendNotificationCustom($payload);
+        $response = $this->oneSignal->sendNotificationCustom(
+            $this->payload($notifiable, $notification, $userIds)
+        );
 
         if ($response->getStatusCode() !== 200) {
             throw CouldNotSendNotification::serviceRespondedWithAnError($response);
         }
 
         return $response;
     }
+
+    /**
+     * @param mixed $notifiable
+     * @param \Illuminate\Notifications\Notification $notification
+     * @param mixed $targeting
+     *
+     * @return array
+     */
+    protected function payload($notifiable, $notification, $userIds)
+    {
+        return OneSignalPayloadFactory::make($notifiable, $notification, $userIds);
+    }
 }

src/OneSignalPayloadFactory.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace NotificationChannels\OneSignal;
+
+use Illuminate\Notifications\Notification;
+
+class OneSignalPayloadFactory
+{
+    /**
+     * Make a one signal notification payload.
+     *
+     * @param mixed $notifiable
+     * @param \Illuminate\Notifications\Notification $notification
+     * @param mixed $targeting
+     *
+     * @return array
+     */
+    public static function make($notifiable, Notification $notification, $targeting) : array
+    {
+        $payload = $notification->toOneSignal($notifiable)->toArray();
+
+        if (static::isTargetingEmail($targeting)) {
+            $payload['filters'] = collect([['field' => 'email', 'value' => $targeting['email']]]);
+        } elseif (static::isTargetingTags($targeting)) {
+            $payload['tags'] = collect([$targeting['tags']]);
+        } else {
+            $payload['include_player_ids'] = collect($targeting);
+        }
+
+        return $payload;
+    }
+
+    /**
+     * @param mixed $targeting
+     *
+     * @return bool
+     */
+    protected static function isTargetingEmail($targeting)
+    {
+        return is_array($targeting) && array_key_exists('email', $targeting);
+    }
+
+    protected static function isTargetingTags($targeting)
+    {
+        return is_array($targeting) && array_key_exists('tags', $targeting);
+    }
+}