From ce23fac283ba33d4cc60b9cf78402039dbf598e2 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Wed, 13 Dec 2017 22:40:51 +0700
Subject: [PATCH] Added new errors count to main dashboard and builds list.

---
 src/PHPCensor/Languages/lang.en.php           |  1 +
 src/PHPCensor/Languages/lang.ru.php           |  1 +
 src/PHPCensor/Model/Build.php                 | 25 +++++++++++++++++--
 src/PHPCensor/Store/BuildErrorStore.php       | 23 +++++++++++++++++
 src/PHPCensor/View/Project/ajax-builds.phtml  | 23 ++++++++++++-----
 src/PHPCensor/View/Project/view.phtml         |  1 +
 .../View/WidgetLastBuilds/update.phtml        | 15 +++++++----
 7 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 7d889a21..182fc2ce 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -191,6 +191,7 @@ PHP Censor',
     'all_errors' => 'All errors',
     'only_new'   => 'Only new errors',
     'only_old'   => 'Only old errors',
+    'new_errors' => 'New errors',
 
     'committed_by_x' => 'Committed by %s',
     'commit_id_x' => 'Commit: %s',
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index 8bf3fbb0..0d6aeec3 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -184,6 +184,7 @@ PHP Censor',
     'all_errors' => 'Все ошибки',
     'only_new'   => 'Только новые',
     'only_old'   => 'Только старые',
+    'new_errors' => 'Новых ошибок',
 
     'committed_by_x' => 'Отправил %s',
     'commit_id_x' => 'Коммит: %s',
diff --git a/src/PHPCensor/Model/Build.php b/src/PHPCensor/Model/Build.php
index f2aadc90..5b9d6d5c 100644
--- a/src/PHPCensor/Model/Build.php
+++ b/src/PHPCensor/Model/Build.php
@@ -3,6 +3,7 @@
 namespace PHPCensor\Model;
 
 use PHPCensor\Builder;
+use PHPCensor\Store\BuildErrorStore;
 use Symfony\Component\Yaml\Parser as YamlParser;
 use PHPCensor\Model;
 use b8\Store\Factory;
@@ -20,12 +21,12 @@ class Build extends Model
     const STAGE_FAILURE  = 'failure';
     const STAGE_FIXED    = 'fixed';
     const STAGE_BROKEN   = 'broken';
-    
+
     const STATUS_PENDING = 0;
     const STATUS_RUNNING = 1;
     const STATUS_SUCCESS = 2;
     const STATUS_FAILED  = 3;
-    
+
     const SOURCE_UNKNOWN        = 0;
     const SOURCE_MANUAL_WEB     = 1;
     const SOURCE_MANUAL_CONSOLE = 2;
@@ -47,6 +48,11 @@ class Build extends Model
      */
     protected $modelName = 'Build';
 
+    /**
+     * @var integer
+     */
+    protected $newErrorsCount = null;
+
     /**
      * @var array
      */
@@ -1042,4 +1048,19 @@ OUT;
                 return 'source_unknown';
         }
     }
+
+    /**
+     * @return integer
+     */
+    public function getNewErrorsCount()
+    {
+        if (null === $this->newErrorsCount) {
+            /** @var BuildErrorStore $store */
+            $store = Factory::getStore('BuildError');
+
+            $this->newErrorsCount = $store->getNewErrorsCount($this->getId());
+        }
+
+        return $this->newErrorsCount;
+    }
 }
diff --git a/src/PHPCensor/Store/BuildErrorStore.php b/src/PHPCensor/Store/BuildErrorStore.php
index f6f14c93..b13ede4a 100644
--- a/src/PHPCensor/Store/BuildErrorStore.php
+++ b/src/PHPCensor/Store/BuildErrorStore.php
@@ -143,6 +143,7 @@ class BuildErrorStore extends Store
      * @param integer $buildId
      * @param string  $plugin
      * @param integer $severity
+     * @param string  $isNew
      *
      * @return integer
      */
@@ -295,4 +296,26 @@ class BuildErrorStore extends Store
 
         return true;
     }
+
+    /**
+     * @param integer $buildId
+     *
+     * @return integer
+     */
+    public function getNewErrorsCount($buildId)
+    {
+        $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_error}} WHERE {{build_id}} = :build AND {{is_new}} = true';
+
+        $stmt = Database::getConnection('read')->prepareCommon($query);
+
+        $stmt->bindValue(':build', $buildId);
+
+        if ($stmt->execute()) {
+            $res = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            return (integer)$res['total'];
+        }
+
+        return 0;
+    }
 }
diff --git a/src/PHPCensor/View/Project/ajax-builds.phtml b/src/PHPCensor/View/Project/ajax-builds.phtml
index d683b131..a04a9787 100644
--- a/src/PHPCensor/View/Project/ajax-builds.phtml
+++ b/src/PHPCensor/View/Project/ajax-builds.phtml
@@ -1,4 +1,12 @@
-<?php use PHPCensor\Helper\Lang; ?>
+<?php
+
+/**
+ * @var \PHPCensor\Model\Build[] $builds
+ */
+
+use PHPCensor\Helper\Lang;
+
+?>
 
 <?php if(empty($builds) || !count($builds)): ?>
     <tr class="">
@@ -15,21 +23,21 @@ switch($build->getStatus())
         $cls = 'active';
         $subcls = 'info';
         $status = Lang::get('pending');
-    
+
     break;
-    
+
     case 1:
         $cls = 'warning';
         $subcls = 'warning';
         $status = Lang::get('running');
     break;
-    
+
     case 2:
         $cls = 'success';
         $subcls = 'success';
         $status = Lang::get('success');
     break;
-    
+
     case 3:
         $cls = 'danger';
         $subcls = 'danger';
@@ -63,7 +71,7 @@ $branches = $build->getExtra('branches');
             <i class="fa fa-code-fork"></i> <?= $build->getBranch(); ?>
         </a>
         <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
-        <?php if ($tag = $build->getTag()): ?> / 
+        <?php if ($tag = $build->getTag()): ?> /
              <a href="<?= $build->getTagLink(); ?>" target="_blank">
                 <i class="fa fa-tag"></i> <?= $tag; ?>
             </a>
@@ -78,6 +86,9 @@ $branches = $build->getExtra('branches');
     <td>
         <?= $build->getDuration(); ?> <?= Lang::get('seconds'); ?>
     </td>
+    <td>
+        <?= $build->getNewErrorsCount(); ?>
+    </td>
     <td>
         <div class="btn-group btn-group-right">
             <a class="btn btn-default btn-sm" href="<?php echo APP_URL ?>build/view/<?php print $build->getId(); ?>"><?php Lang::out('view'); ?></a>
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index bf2dff72..0e71e3f8 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -116,6 +116,7 @@ use PHPCensor\Helper\Lang;
                     <th><?php Lang::out('branch'); ?></th>
                     <th><?php Lang::out('environment'); ?></th>
                     <th><?php Lang::out('duration'); ?></th>
+                    <th><?php Lang::out('new_errors'); ?></th>
                     <th></th>
                 </tr>
                 </thead>
diff --git a/src/PHPCensor/View/WidgetLastBuilds/update.phtml b/src/PHPCensor/View/WidgetLastBuilds/update.phtml
index b9037810..9c0f48b2 100644
--- a/src/PHPCensor/View/WidgetLastBuilds/update.phtml
+++ b/src/PHPCensor/View/WidgetLastBuilds/update.phtml
@@ -61,7 +61,7 @@ use PHPCensor\Model\Build;
             <i class="fa fa-<?php print $build->getProject()->getIcon(); ?> bg-<?php print $color; ?>"></i>
             <div class="timeline-item">
                 <span class="time"><i class="fa fa-clock-o"></i>
-                <?php 
+                <?php
                     echo $updated->format('H:i:s');
                     if ($build->getStatus() != Build::STATUS_PENDING) {
                         echo ' &mdash; ' . $build->getDuration(); ?> <?= Lang::get('seconds');
@@ -73,18 +73,23 @@ use PHPCensor\Model\Build;
                         <?= $build->getProject()->getTitle(); ?>
                     </a>
                     <span><?= $environment; ?></span>
-                    &mdash; 
+                    &mdash;
                     <a href="<?= APP_URL; ?>build/view/<?= $build->getId(); ?>">
-                        Build #<?= $build->getId(); ?>
+                        <?php Lang::out('build'); ?> #<?= $build->getId(); ?>
                     </a>
-                    &mdash; 
+                    &mdash;
                     <?php Lang::out($build->getSourceHumanize()); ?>
+                    <?php if ($newErrorsCount = $build->getNewErrorsCount()): ?>
+                        &mdash;
+                        <?php Lang::out('new_errors'); ?>:
+                        <?= $newErrorsCount; ?>
+                    <?php endif; ?>
                 </h3>
 
                 <div class="timeline-body">
                     <a href="<?= $build->getBranchLink();?>"><i class="fa fa-code-fork"></i> <?php echo $build->getBranch(); ?></a>
                     <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
-                    <?php if ($tag = $build->getTag()): ?> / 
+                    <?php if ($tag = $build->getTag()): ?> /
                         <a href="<?= $build->getTagLink(); ?>" target="_blank">
                             <i class="fa fa-tag"></i> <?= $tag; ?>
                         </a>