Bugfixing mail type stats view when no stats are present yet

remp2020 · May 7, 2019 · b417af8 · b417af8
1 parent 23c8d41
commit b417af8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Mailer/app/models/Repositories/MailTypeStatsRepository.php b/Mailer/app/models/Repositories/MailTypeStatsRepository.php
@@ -37,7 +37,7 @@ public function getDashboardDataGroupedByTypes(DateTime $from, DateTime $to)
     public function getDashboardDetailData($id, DateTime $from, DateTime $to)
     {
         return $this->getTable()
-            ->select('mail_type_id, SUM(subscribers_count) AS count, DATE(created_at) AS created_date')
+            ->select('SUM(subscribers_count) AS count, DATE(created_at) AS created_date')
             ->where('id IN (
                 SELECT MAX(id) FROM mail_type_stats
                 WHERE mail_type_id = ?

diff --git a/Mailer/app/presenters/ListPresenter.php b/Mailer/app/presenters/ListPresenter.php
@@ -152,6 +152,7 @@ public function renderShow($id)
 
         $week = new DateTime('-7 days');
         $month = new DateTime('-30 days');
+
         $this->template->stats = [
             'subscribed' => $list->related('mail_user_subscriptions')
                 ->where(['subscribed' => true])
@@ -163,21 +164,21 @@ public function renderShow($id)
                 '7-days' => $this->mailTemplateStatsRepository->byMailTypeId($list->id)
                     ->where('date > DATE(?)', $week)
                     ->select('SUM(mail_template_stats.opened) AS opened')
-                    ->fetch()->opened,
+                    ->fetch()->opened ?? 0,
                 '30-days' => $this->mailTemplateStatsRepository->byMailTypeId($list->id)
                     ->where('date > DATE(?)', $month)
                     ->select('SUM(mail_template_stats.opened) AS opened')
-                    ->fetch()->opened,
+                    ->fetch()->opened ?? 0,
             ],
             'clicked' => [
                 '7-days' => $this->mailTemplateStatsRepository->byMailTypeId($list->id)
                     ->where('date > DATE(?)', $week)
                     ->select('SUM(mail_template_stats.clicked) AS opened')
-                    ->fetch()->opened,
+                    ->fetch()->opened ?? 0,
                 '30-days' => $this->mailTemplateStatsRepository->byMailTypeId($list->id)
                     ->where('date > DATE(?)', $month)
                     ->select('SUM(mail_template_stats.clicked) AS opened')
-                    ->fetch()->opened,
+                    ->fetch()->opened ?? 0,
             ]
         ];