refactored bundle to fit new structure of php-task

Author: wachterjohannes

src/Command/DebugTasksCommand.php

@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table = new Table($output);
-        $table->setHeaders(array('uuid', 'key', 'task-name', 'execution-date', 'completed', 'start', 'duration'));
+        $table->setHeaders(['uuid', 'key', 'task-name', 'execution-date', 'completed', 'start', 'duration']);
 
         foreach ($tasks as $task) {
             $start = null;

src/DoctrineStorage/TaskExecutionRepository.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Task\TaskBundle\DoctrineStorage;
+
+use Doctrine\Common\Persistence\ObjectManager;
+use Task\Execution\TaskExecutionInterface;
+use Task\Storage\TaskExecutionRepositoryInterface;
+use Task\TaskBundle\Entity\TaskExecutionRepository as ORMTaskExecutionRepository;
+use Task\TaskInterface;
+
+class TaskExecutionRepository implements TaskExecutionRepositoryInterface
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ORMTaskExecutionRepository
+     */
+    private $taskExecutionRepository;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save(TaskExecutionInterface $execution)
+    {
+        $this->objectManager->persist($execution);
+        $this->objectManager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(TaskExecutionInterface $execution)
+    {
+        $this->objectManager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findScheduled()
+    {
+        return $this->taskExecutionRepository->findScheduled(new \DateTime());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findByStartTime(TaskInterface $task, \DateTime $scheduleTime)
+    {
+        return $this->taskExecutionRepository->findByStartTime($task, $scheduleTime);
+    }
+}

src/DoctrineStorage/TaskRepository.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Task\TaskBundle\DoctrineStorage;
+
+use Doctrine\Common\Persistence\ObjectManager;
+use Task\Storage\TaskRepositoryInterface;
+use Task\TaskBundle\Entity\TaskRepository as ORMTaskRepository;
+use Task\TaskInterface;
+
+class TaskRepository implements TaskRepositoryInterface
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ORMTaskRepository
+     */
+    private $taskRepository;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(TaskInterface $task)
+    {
+        $this->objectManager->persist($task);
+        $this->objectManager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findAll()
+    {
+        return $this->taskRepository->findAll();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findEndBeforeNow()
+    {
+        return $this->taskRepository->findEndBefore(new \DateTime());
+    }
+}

src/Entity/Task.php

@@ -2,9 +2,10 @@
 
 namespace Task\TaskBundle\Entity;
 
-use Task\TaskInterface;
+use Cron\CronExpression;
+use Task\Task as BaseTask;
 
-class Task
+class Task extends BaseTask
 {
     /**
      * @var int
@@ -14,27 +15,7 @@ class Task
     /**
      * @var string
      */
-    private $uuid;
-
-    /**
-     * @var string
-     */
-    private $key;
-
-    /**
-     * @var TaskInterface
-     */
-    private $task;
-
-    /**
-     * @var \DateTime
-     */
-    private $executionDate;
-
-    /**
-     * @var bool
-     */
-    private $completed;
+    private $intervalExpression;
 
     /**
      * @return int
@@ -45,84 +26,20 @@ public function getId()
     }
 
     /**
-     * @return string
-     */
-    public function getUuid()
-    {
-        return $this->uuid;
-    }
-
-    /**
-     * @param string $uuid
-     */
-    public function setUuid($uuid)
-    {
-        $this->uuid = $uuid;
-    }
-
-    /**
-     * @return TaskInterface
-     */
-    public function getTask()
-    {
-        return $this->task;
-    }
-
-    /**
-     * @param TaskInterface $task
-     */
-    public function setTask($task)
-    {
-        $this->task = $task;
-    }
-
-    /**
-     * @return \DateTime
-     */
-    public function getExecutionDate()
-    {
-        return $this->executionDate;
-    }
-
-    /**
-     * @param \DateTime $executionDate
-     */
-    public function setExecutionDate($executionDate)
-    {
-        $this->executionDate = $executionDate;
-    }
-
-    /**
-     * @return bool
+     * @return mixed
      */
-    public function isCompleted()
+    public function getIntervalExpression()
     {
-        return $this->completed;
+        return $this->intervalExpression;
     }
 
     /**
-     * @param bool $completed
+     * {@inheritdoc}
      */
-    public function setCompleted($completed)
+    public function setInterval(CronExpression $interval, \DateTime $firstExecution = null, \DateTime $lastExecution = null)
     {
-        $this->completed = $completed;
-    }
+        parent::setInterval($interval, $firstExecution, $lastExecution);
 
-    /**
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @param string $key
-     *
-     * @return $this
-     */
-    public function setKey($key)
-    {
-        $this->key = $key;
+        $this->intervalExpression = $interval->getExpression();
     }
 }

src/Entity/TaskExecution.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Task\TaskBundle\Entity;
+
+use Task\Execution\TaskExecution as BaseTaskExecution;
+
+class TaskExecution extends BaseTaskExecution
+{
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+}

src/Entity/TaskExecutionRepository.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Task\TaskBundle\Entity;
+
+use Doctrine\ORM\EntityRepository;
+use Task\TaskInterface;
+use Task\TaskStatus;
+
+class TaskExecutionRepository extends EntityRepository
+{
+    public function findByStartTime(TaskInterface $task, \DateTime $scheduleTime)
+    {
+        return $this->createQueryBuilder('e')
+            ->innerJoin('e.task', 't')
+            ->where('t.uuid = :uuid')
+            ->andWhere('e.scheduleTime = :scheduleTime')
+            ->setParameter('uuid', $task->getUuid())
+            ->setParameter('scheduleTime', $scheduleTime)
+            ->getQuery()
+            ->getResult();
+    }
+
+    public function findScheduled(\DateTime $dateTime)
+    {
+        return $this->createQueryBuilder('e')
+            ->innerJoin('e.task', 't')
+            ->where('e.status = :status AND e.scheduleTime < :dateTime')
+            ->setParameter('status', TaskStatus::PLANNED)
+            ->setParameter('dateTime', $dateTime)
+            ->getQuery()
+            ->getResult();
+    }
+}

src/Entity/TaskRepository.php

@@ -6,39 +6,11 @@
 
 class TaskRepository extends EntityRepository
 {
-    public function findScheduled()
+    public function findEndBefore(\DateTime $dateTime)
     {
-        $query = $this->createQueryBuilder('task')
-            ->where('task.completed = :completed')
-            ->andWhere('task.executionDate <= :date')
-            ->setParameter('completed', false)
-            ->setParameter('date', new \DateTime())
-            ->getQuery();
-
-        return $query->getResult();
-    }
-
-    /**
-     * @param string $uuid
-     *
-     * @return Task
-     */
-    public function findByUuid($uuid)
-    {
-        $query = $this->createQueryBuilder('task')
-            ->where('task.uuid = :uuid')
-            ->setParameter('uuid', $uuid)
-            ->getQuery();
-
-        return $query->getSingleResult();
-    }
-
-    public function deleteAll()
-    {
-        $query = $this->_em->createQueryBuilder()
-            ->delete($this->_entityName, 'task')
-            ->getQuery();
-
-        $query->execute();
+        $this->createQueryBuilder('t')
+            ->where('t.lastExecution IS NOT NULL OR t.lastExecution > :dateTime')
+            ->setParameter('dateTime', $dateTime)
+            ->getQuery()->getResult();
     }
 }

src/Handler/TaskHandlerFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Task\TaskBundle\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\HandlerInterface;
+use Task\Handler\TaskHandlerFactoryInterface;
+use Task\Handler\TaskHandlerNotExistsException;
+
+class TaskHandlerFactory implements TaskHandlerFactoryInterface
+{
+    /**
+     * @var HandlerInterface[]
+     */
+    private $handler = [];
+
+    public function __construct(array $handler)
+    {
+        $this->handler = $handler;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($className)
+    {
+        if (!array_key_exists($className, $this->handler)) {
+            throw new TaskHandlerNotExistsException($className);
+        }
+
+        return $this->handler[$className];
+    }
+}