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

Simplify newsletter stats query

Browse Source 
[MAILPOET-2213]
This commit is contained in:
Rostislav Wolny
2019-08-14 14:15:29 +02:00
committed by M. Shull
parent 3a120d8a17
commit d285fdba1d
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Models/Newsletter.php
View File

@ -585,18 +585,7 @@ class Newsletter extends Model {
$result = [];
foreach ($statisticsExprs as $name => $statisticsExpr) {
if (!in_array($this->type, [self::TYPE_WELCOME, self::TYPE_AUTOMATIC])) {
$row = $statisticsExpr->whereRaw('`queue_id` = ?', [$this->queue['id']])->findOne();
} else {
$row = $statisticsExpr
->join(MP_SENDING_QUEUES_TABLE, ["queue_id", "=", "qt.id"], "qt")
->join(MP_SCHEDULED_TASKS_TABLE, ["qt.task_id", "=", "tasks.id"], "tasks")
->where([
"tasks.status" => SendingQueue::STATUS_COMPLETED,
"stat.newsletter_id" => $this->id,
])->findOne();
}
$row = $statisticsExpr->where('newsletter_id', $this->id)->findOne();
$result[$name] = !empty($row->cnt) ? (int)$row->cnt : 0;
}