Add changeable appId feature (#3)

* Add changeable appId feature * Add set app id feature for message * Add change app id test * Update readme * Code refactoring Co-authored-by: Enver Cigal <[email protected]>
macellan · Mar 2, 2022 · 8944571 · 8944571
1 parent cfbf223
commit 8944571
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,16 @@ class AccountApproved extends Notification
 }
 ```
 
+You can change appId of a specific notification, just add the setAppId() method
+
+```php
+ public function toOneSignal($notifiable)
+ {
+ return OneSignalMessage::create()
+ ->setAppId('Other AppId')
+ }
+```
+
 In your notifiable model, make sure to include a routeNotificationForOneSignal() method.
 
 ```php

diff --git a/src/OneSignalChannel.php b/src/OneSignalChannel.php
@@ -42,7 +42,7 @@ public function send($notifiable, Notification $notification): ?object
  $result = Http::timeout($this->timeout)
  ->asJson()->acceptJson()
  ->post(self::ENDPOINT, [
- 'app_id' => $this->appId,
+ 'app_id' => $message->getAppId() ?? $this->appId,
  'headings' => $message->getHeadings(),
  'contents' => $message->getBody(),
  'data' => $message->getData(),

diff --git a/src/OneSignalMessage.php b/src/OneSignalMessage.php
@@ -4,6 +4,8 @@
 
 class OneSignalMessage
 {
+ private ?string $appId = null;
+
  private array $contents;
 
  private array $headings;
@@ -71,6 +73,22 @@ public function setData(array $value): self
  return $this;
  }
 
+ /**
+ * @param string $appId
+ * @return $this
+ */
+ public function setAppId(string $appId): self
+ {
+ $this->appId = $appId;
+
+ return $this;
+ }
+
+ public function getAppId(): ?string
+ {
+ return $this->appId;
+ }
+
  public function getData(): ?array
  {
  return $this->data;

diff --git a/tests/ChannelTest.php b/tests/ChannelTest.php
@@ -6,6 +6,8 @@
 use Illuminate\Support\Facades\Http;
 use Macellan\OneSignal\Exceptions\CouldNotSendNotification;
 use Macellan\OneSignal\OneSignalChannel;
+use Macellan\OneSignal\Tests\Notifications\TestOtherAppIdNotification;
+use Macellan\OneSignal\Tests\Notifications\TestNotification;
 
 class ChannelTest extends TestCase
 {
@@ -62,4 +64,21 @@ public function test_not_success_notification()
 
  (new Notifiable)->notify(new TestNotification());
  }
+
+ public function test_change_app_id()
+ {
+ Http::fake([
+ 'api/v1/notifications' => Http::response([
+ "id" => "931082f5-e442-42b1-a951-19e7e45dee39",
+ "recipients" => 1,
+ "external_id" => null,
+ ]),
+ ]);
+
+ (new Notifiable)->notify(new TestOtherAppIdNotification());
+
+ Http::assertSent(function (Request $request) {
+ return $request['app_id'] == 'other_app_id';
+ });
+ }
 }
diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -47,4 +47,16 @@ public function test_create_multiple_lang()
  $this->assertEquals($subject, $message->getHeadings());
  $this->assertEquals($data, $message->getData());
  }
+
+ public function test_change_app_id()
+ {
+ $body = 'body';
+
+ $appId = 'other_app_id';
+
+ $message = OneSignalMessage::create($body)->setAppId($appId);
+
+ $this->assertEquals(['en' => $body], $message->getBody());
+ $this->assertEquals($appId, $message->getAppId());
+ }
 }
diff --git a/tests/TestNotification.php → tests/Notifications/TestNotification.php b/tests/TestNotification.php → tests/Notifications/TestNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Macellan\OneSignal\Tests;
+namespace Macellan\OneSignal\Tests\Notifications;
 
 use Illuminate\Notifications\Notification;
 use Macellan\OneSignal\OneSignalMessage;

diff --git a/tests/Notifications/TestOtherAppIdNotification.php b/tests/Notifications/TestOtherAppIdNotification.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Macellan\OneSignal\Tests\Notifications;
+
+use Illuminate\Notifications\Notification;
+use Macellan\OneSignal\OneSignalMessage;
+
+class TestOtherAppIdNotification extends Notification
+{
+ public function via()
+ {
+ return ['onesignal'];
+ }
+
+ public function toOneSignal($notifiable)
+ {
+ return OneSignalMessage::create()
+ ->setAppId('other_app_id')
+ ->setSubject('Subject')
+ ->setBody('Body');
+ }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -10,7 +10,9 @@ protected function setUp(): void
  {
  parent::setUp();
 
- config(['services.onesignal.app_id' => $this->appId]);
+ config([
+ 'services.onesignal.app_id' => $this->appId,
+ ]);
  }
 
  protected function getPackageProviders($app)