fixed type checking, added getLastJobId() method

Author: metalagman

src/Jobs/SendMessageJob.php

@@ -16,31 +16,23 @@ class SendMessageJob extends BaseObject implements JobInterface
 {
     /** @var MessageInterface */
     public $message;
-    /** @var Mailer */
+    /** @var string */
     public $mailer;
 
     /**
+     * @inheritdoc
+     * @see JobInterface::execute(
+     *
      * @throws InvalidConfigException
      * @throws \InvalidArgumentException
      */
-    public function init()
+    public function execute($queue)
     {
-        parent::init();
         if (!$this->message instanceof MessageInterface) {
             throw new \InvalidArgumentException('Message must be an instance of ' . MessageInterface::class);
         }
-
         /** @var Mailer $mailer */
-        $this->mailer = Instance::ensure($this->mailer, Mailer::class);
-    }
-
-    /**
-     * @inheritdoc
-     * @see JobInterface::execute()
-     */
-    public function execute($queue)
-    {
-
-        return $this->mailer->syncMailer->send($this->message);
+        $mailer = Instance::ensure($this->mailer, Mailer::class);
+        return $mailer->getSyncMailer()->send($this->message);
     }
 }

src/Jobs/SendMultipleMessagesJob.php

@@ -30,9 +30,8 @@ public function execute($queue)
         if (!is_array($this->messages)) {
             throw new \InvalidArgumentException('Message must be an instance of ' . MessageInterface::class);
         }
-
         /** @var Mailer $mailer */
         $mailer = Instance::ensure($this->mailer, Mailer::class);
-        return $mailer->syncMailer->sendMultiple($this->messages);
+        return $mailer->getSyncMailer()->sendMultiple($this->messages);
     }
 }

src/Mailer.php

@@ -20,6 +20,8 @@ class Mailer extends Component implements MailerInterface
     protected $queue = 'queue';
     /** @var MailerInterface */
     protected $syncMailer;
+    /** @var int|null */
+    protected $lastJobId;
 
     /**
      * @return object|Queue
@@ -81,7 +83,8 @@ public function send($message)
         $job = \Yii::createObject(SendMessageJob::class);
         $job->mailer = $this->id;
         $job->message = $message;
-        return $this->getQueue()->push($job);
+        $this->lastJobId = $this->getQueue()->push($job);
+        return $this->lastJobId !== null;
     }
 
     /**
@@ -95,6 +98,19 @@ public function sendMultiple(array $messages)
         $job = \Yii::createObject(SendMultipleMessagesJob::class);
         $job->mailer = $this->id;
         $job->messages = $messages;
-        return $this->getQueue()->push($job);
+        $this->lastJobId = $this->getQueue()->push($job);
+        if ($this->lastJobId !== null) {
+            return count($messages);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getLastJobId()
+    {
+        return $this->lastJobId;
     }
 }

tests/MailerTest.php

@@ -5,15 +5,17 @@
 class MailerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \YarCode\Yii2\QueueMailer\Mailer */
-    public $a;
-
+    public $mailer;
+    /** @var \yii\mail\MessageInterface */
+    public $message;
     /**
      * @throws \yii\base\InvalidConfigException
      */
     public function setUp()
     {
         parent::setUp();
-        $this->a = \Yii::createObject([
+
+        $this->mailer = \Yii::createObject([
             'class' => \YarCode\Yii2\QueueMailer\Mailer::class,
             'queue' => [
                 'class' => \yii\queue\sync\Queue::class,
@@ -24,10 +26,31 @@ public function setUp()
                 'useFileTransport' => true,
             ],
         ]);
+
+        $this->message = $this->mailer->compose();
+        $this->message->setTo('[email protected]');
+        $this->message->setFrom('[email protected]');
+        $this->message->setHtmlBody('test message');
     }
 
     public function testInterface()
     {
-        $this->assertInstanceOf(\yii\mail\MailerInterface::class, $this->a);
+        $this->assertInstanceOf(\yii\mail\MailerInterface::class, $this->mailer);
+    }
+
+    public function testSend()
+    {
+        $this->assertTrue($this->mailer->send($this->message));
+    }
+
+    public function testSendMultiple()
+    {
+        $this->assertEquals(2, $this->mailer->send([$this->message, $this->message]));
+    }
+
+    public function testGetLastJobId()
+    {
+        $this->mailer->send($this->message);
+        $this->assertEquals(1, $this->mailer->getLastJobId());
     }
 }