Merge pull request #19 from RhubarbPHP/fix/EnsureRecipientReturned

fix: Ensure recipient is returned with the Sendable

Author: acuthbert

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.2.4
+
+* Fixed CommunicationItem `getSendable()` to include the recipient on the `Sendable`.
+* Removed duplicate `FailureReason` field from CommunicationItem
+* Changed `FailureReason` to LongStringColumn in CommunicationItemSendAttempt to ensure full message logged.
+
 ### 1.2.3
 
 * Fixed: Mysql 5.6 support by optionally not using native json columns

src/Models/CommunicationItem.php

@@ -3,15 +3,15 @@
 namespace Rhubarb\Scaffolds\Communications\Models;
 
 use Rhubarb\Crown\DateTime\RhubarbDateTime;
-use Rhubarb\Crown\Sendables\Email\Email;
+use Rhubarb\Crown\Sendables\Email\EmailRecipient;
+use Rhubarb\Crown\Sendables\Sendable;
 use Rhubarb\Scaffolds\Communications\Settings\CommunicationsSettings;
 use Rhubarb\Stem\Filters\AndGroup;
 use Rhubarb\Stem\Filters\Equals;
 use Rhubarb\Stem\Models\Model;
 use Rhubarb\Stem\Repositories\MySql\Schema\Columns\MySqlEnumColumn;
 use Rhubarb\Stem\Repositories\MySql\Schema\Columns\MySqlJsonColumn;
 use Rhubarb\Stem\Schema\Columns\AutoIncrementColumn;
-use Rhubarb\Stem\Schema\Columns\BooleanColumn;
 use Rhubarb\Stem\Schema\Columns\DateTimeColumn;
 use Rhubarb\Stem\Schema\Columns\ForeignKeyColumn;
 use Rhubarb\Stem\Schema\Columns\LongStringColumn;
@@ -59,7 +59,6 @@ protected function createSchema()
             new MySqlJsonColumn("Data", "", true, CommunicationsSettings::singleton()->nativeJSONColumns),
             new DateTimeColumn("DateCreated"),
             new DateTimeColumn("DateSent"),
-            new StringColumn("FailureReason", 500),
             new StringColumn("ProviderMessageID", 200),
             new StringColumn("ProviderStatus", 50),
             new DateTimeColumn("ProviderStatusChangeTime")
@@ -108,13 +107,17 @@ protected function beforeSave()
     }
 
     /**
-     * @return Email
+     * @return Sendable
+     * @throws \Rhubarb\Crown\Exceptions\EmailException
      */
     public function getSendable()
     {
         $className = $this->SendableClassName;
 
-        return $className::fromArray($this->Data);
+        /** @var Sendable $sendable */
+        $sendable = $className::fromArray($this->Data);
+        $sendable->addRecipient(new EmailRecipient($this->Recipient));
+        return $sendable;
     }
 
     public function addAttachment($path, $newName = "")

src/Models/CommunicationItemSendAttempt.php

@@ -9,6 +9,7 @@
 use Rhubarb\Stem\Schema\Columns\DateTimeColumn;
 use Rhubarb\Stem\Schema\Columns\ForeignKeyColumn;
 use Rhubarb\Stem\Schema\Columns\IntegerColumn;
+use Rhubarb\Stem\Schema\Columns\LongStringColumn;
 use Rhubarb\Stem\Schema\Columns\StringColumn;
 use Rhubarb\Stem\Schema\ModelSchema;
 
@@ -28,7 +29,7 @@ protected function createSchema()
             new DateTimeColumn("DateSent"),
             new IntegerColumn("SystemProcessID"),
             new MySqlEnumColumn("Status", self::STATUS_NOT_SENT, [self::STATUS_NOT_SENT, self::STATUS_SUCCESS, self::STATUS_FAILED]),
-            new StringColumn("FailureReason", 500),
+            new LongStringColumn("FailureReason"),
             new StringColumn("ProviderMessageID", 200)
         );
 
@@ -39,7 +40,7 @@ protected function beforeSave()
     {
         parent::beforeSave();
 
-        if ($this->isNewRecord()){
+        if ($this->isNewRecord()) {
             $this->SystemProcessID = getmypid();
             $this->DateSent = new RhubarbDateTime("now");
         }