Fix saving database notifications

makbeth · Aug 24, 2018 · 637befc · 637befc
1 parent 8ff3bc5
commit 637befc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/src/channels/ActiveRecordChannel.php b/src/channels/ActiveRecordChannel.php
@@ -10,13 +10,15 @@
 use tuyakhov\notifications\NotifiableInterface;
 use tuyakhov\notifications\NotificationInterface;
 use yii\base\Component;
+use yii\base\DynamicModel;
 use yii\db\ActiveRecordInterface;
+use yii\db\BaseActiveRecord;
 use yii\di\Instance;
 
 class ActiveRecordChannel extends Component implements ChannelInterface
 {
     /**
-     * @var ActiveRecordInterface|string
+     * @var BaseActiveRecord|string
      */
     public $model = 'tuyakhov\notifications\models\Notification';
 
@@ -26,20 +28,26 @@ class ActiveRecordChannel extends Component implements ChannelInterface
     public function init()
     {
         parent::init();
-        $this->model = Instance::ensure($this->model, 'yii\db\ActiveRecordInterface');
+        $this->model = Instance::ensure($this->model, 'yii\db\BaseActiveRecord');
     }
 
     public function send(NotifiableInterface $recipient, NotificationInterface $notification)
     {
         /** @var DatabaseMessage $message */
         $message = $notification->exportFor('database');
         list($notifiableType, $notifiableId) = $recipient->routeNotificationFor('database');
-        return $this->model->insert(true, [
+        $data = [
             'level' => $message->level,
             'subject' => $message->subject,
             'body' => $message->body,
             'notifiable_type' => $notifiableType,
             'notifiable_id' => $notifiableId,
-        ]);
+        ];
+
+        if ($this->model->load($data, '')) {
+            return $this->model->insert();
+        }
+
+        return false;
     }
 }
diff --git a/tests/ActiveRecordChannelTest.php b/tests/ActiveRecordChannelTest.php
@@ -24,18 +24,20 @@ public function testSend()
             'subject' => 'It',
             'body' => 'Works',
         ]);
-        $notificationModel = $this->createMock('yii\db\ActiveRecordInterface');
-        $notificationModel->method('insert');
+        $notificationModel = $this->createMock('yii\db\BaseActiveRecord');
+        $notificationModel->method('load')->willReturn(true);
         $notificationModel->expects($this->once())
-            ->method('insert')
-            ->with(true, [
+            ->method('load')
+            ->with([
                 'level' => $message->level,
                 'subject' => $message->subject,
                 'body' => $message->body,
                 'notifiable_type' => 'yii\base\DynamicModel',
                 'notifiable_id' => 123,
-            ])
-            ->willReturnSelf();
+            ], '');
+        $notificationModel->method('insert')->willReturn(true);
+        $notificationModel->expects($this->once())
+            ->method('insert');
 
 
         $channel = \Yii::createObject([

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,5 +11,4 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-Yii::setAlias('@tuyakhov/tests', __DIR__);
-Yii::setAlias('@tuyakhov/braintree', dirname(__DIR__));
+Yii::setAlias('@extension', __DIR__ . '/../');