- Replaces custom method to get newsletter with ORM's native one-to-one model

relationship

lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php

@@ -22,7 +22,7 @@ class Newsletter {
   }
 
   function getAndPreProcess($queue) {
-    $newsletter = $queue->getNewsletter();
+    $newsletter = $queue->newsletter()->findOne();
     if(!$newsletter) {
       return false;
     }

lib/Models/SendingQueue.php

@@ -10,6 +10,10 @@ class SendingQueue extends Model {
   const STATUS_SCHEDULED = 'scheduled';
   const STATUS_PAUSED = 'paused';
 
+  function newsletter() {
+    return $this->has_one(__NAMESPACE__.'\Newsletter', 'id', 'newsletter_id');
+  }
+
   function pause() {
     if($this->count_processed === $this->count_total) {
       return false;
@@ -63,10 +67,6 @@ class SendingQueue extends Model {
     return $subscribers;
   }
 
-  function getNewsletter() {
-    return Newsletter::findOne($this->newsletter_id);
-  }
-
   function getNewsletterRenderedBody() {
     return (!is_serialized($this->newsletter_rendered_body)) ?
       $this->newsletter_rendered_body :