Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

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

Browse Source 
relationship
This commit is contained in:
Vlad
2016-09-19 20:47:49 -04:00
parent 4538cab6c8
commit 8360377992
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

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

8
lib/Models/SendingQueue.php
View File

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