From cbe52e57200a66522d88dfc5d5f46de8eb87ffb2 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 17 Jul 2016 18:47:06 -0400
Subject: File events refactoring

---
 app/Subscriber/ProjectDailySummarySubscriber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Subscriber/ProjectDailySummarySubscriber.php')

diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index 6971a121..7e3c11c3 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -22,7 +22,7 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc
 
     public function execute(TaskEvent $event)
     {
-        if (isset($event['project_id']) && !$this->isExecuted()) {
+        if (isset($event['project_id'])) {
             $this->logger->debug('Subscriber executed: '.__METHOD__);
             $this->queueManager->push(ProjectMetricJob::getInstance($this->container)->withParams($event['project_id']));
         }
-- 
cgit v1.2.3


From adb5023cfc075ce5d6f73a4ba5b4ab51f6c500c0 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 23 Jul 2016 20:30:06 -0400
Subject: Add unit test for ProjectMetricJob

---
 app/Core/Base.php                                |  1 +
 app/ServiceProvider/JobProvider.php              |  5 +++
 app/Subscriber/ProjectDailySummarySubscriber.php |  7 +---
 tests/units/Job/ProjectMetricJobTest.php         | 47 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 tests/units/Job/ProjectMetricJobTest.php

(limited to 'app/Subscriber/ProjectDailySummarySubscriber.php')

diff --git a/app/Core/Base.php b/app/Core/Base.php
index 6931d93a..41f5d2e0 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -157,6 +157,7 @@ use Pimple\Container;
  * @property \Kanboard\Job\TaskLinkEventJob                      $taskLinkEventJob
  * @property \Kanboard\Job\ProjectFileEventJob                   $projectFileEventJob
  * @property \Kanboard\Job\NotificationJob                       $notificationJob
+ * @property \Kanboard\Job\ProjectMetricJob                      $projectMetricJob
  * @property \Psr\Log\LoggerInterface                            $logger
  * @property \PicoDb\Database                                    $db
  * @property \Symfony\Component\EventDispatcher\EventDispatcher  $dispatcher
diff --git a/app/ServiceProvider/JobProvider.php b/app/ServiceProvider/JobProvider.php
index 5b42794b..2194b11c 100644
--- a/app/ServiceProvider/JobProvider.php
+++ b/app/ServiceProvider/JobProvider.php
@@ -5,6 +5,7 @@ namespace Kanboard\ServiceProvider;
 use Kanboard\Job\CommentEventJob;
 use Kanboard\Job\NotificationJob;
 use Kanboard\Job\ProjectFileEventJob;
+use Kanboard\Job\ProjectMetricJob;
 use Kanboard\Job\SubtaskEventJob;
 use Kanboard\Job\TaskEventJob;
 use Kanboard\Job\TaskFileEventJob;
@@ -57,6 +58,10 @@ class JobProvider implements ServiceProviderInterface
             return new NotificationJob($c);
         });
 
+        $container['projectMetricJob'] = $container->factory(function ($c) {
+            return new ProjectMetricJob($c);
+        });
+
         return $container;
     }
 }
diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index 7e3c11c3..eaa9d468 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Subscriber;
 
 use Kanboard\Event\TaskEvent;
-use Kanboard\Job\ProjectMetricJob;
 use Kanboard\Model\TaskModel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -22,9 +21,7 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc
 
     public function execute(TaskEvent $event)
     {
-        if (isset($event['project_id'])) {
-            $this->logger->debug('Subscriber executed: '.__METHOD__);
-            $this->queueManager->push(ProjectMetricJob::getInstance($this->container)->withParams($event['project_id']));
-        }
+        $this->logger->debug('Subscriber executed: '.__METHOD__);
+        $this->queueManager->push($this->projectMetricJob->withParams($event['task']['project_id']));
     }
 }
diff --git a/tests/units/Job/ProjectMetricJobTest.php b/tests/units/Job/ProjectMetricJobTest.php
new file mode 100644
index 00000000..e5b0474d
--- /dev/null
+++ b/tests/units/Job/ProjectMetricJobTest.php
@@ -0,0 +1,47 @@
+<?php
+
+use Kanboard\Job\ProjectMetricJob;
+
+require_once __DIR__.'/../Base.php';
+
+class ProjectMetricJobTest extends Base
+{
+    public function testJobParams()
+    {
+        $projectMetricJob = new ProjectMetricJob($this->container);
+        $projectMetricJob->withParams(123);
+
+        $this->assertSame(
+            array(123),
+            $projectMetricJob->getJobParams()
+        );
+    }
+
+    public function testJob()
+    {
+        $this->container['projectDailyColumnStatsModel'] = $this
+            ->getMockBuilder('\Kanboard\Model\ProjectDailyColumnStatsModel')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('updateTotals'))
+            ->getMock();
+
+        $this->container['projectDailyStatsModel'] = $this
+            ->getMockBuilder('\Kanboard\Model\ProjectDailyStatsModel')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('updateTotals'))
+            ->getMock();
+
+        $this->container['projectDailyColumnStatsModel']
+            ->expects($this->once())
+            ->method('updateTotals')
+            ->with(42, date('Y-m-d'));
+
+        $this->container['projectDailyStatsModel']
+            ->expects($this->once())
+            ->method('updateTotals')
+            ->with(42, date('Y-m-d'));
+
+        $job = new ProjectMetricJob($this->container);
+        $job->execute(42);
+    }
+}
-- 
cgit v1.2.3