adapted to fit new architecture

wachterjohannes · wachterjohannes · commit 5e6781778aa7 · 2016-03-12T18:55:12.000+01:00
diff --git a/src/Command/RunCommand.php b/src/Command/RunCommand.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Task\SchedulerInterface;
+use Task\Runner\TaskRunnerInterface;
 
 /**
  * Run pending tasks.
@@ -15,15 +15,15 @@
 class RunCommand extends Command
 {
     /**
-     * @var SchedulerInterface
+     * @var TaskRunnerInterface
      */
-    private $scheduler;
+    private $runner;
 
-    public function __construct($name, SchedulerInterface $scheduler)
+    public function __construct($name, TaskRunnerInterface $scheduler)
     {
         parent::__construct($name);
 
-        $this->scheduler = $scheduler;
+        $this->runner = $scheduler;
     }
 
     /**
@@ -39,6 +39,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->scheduler->run();
+        $this->runner->runTasks();
     }
 }
diff --git a/src/Command/ScheduleTaskCommand.php b/src/Command/ScheduleTaskCommand.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Task\SchedulerInterface;
+use Task\Scheduler\SchedulerInterface;
 
 /**
  * Schedule task.
@@ -38,8 +38,7 @@ protected function configure()
             ->addArgument('handler', InputArgument::REQUIRED)
             ->addArgument('workload', InputArgument::OPTIONAL)
             ->addOption('cron-expression', 'c', InputOption::VALUE_REQUIRED)
-            ->addOption('end-date', 'e', InputOption::VALUE_REQUIRED)
-            ->addOption('key', 'k', InputOption::VALUE_REQUIRED);
+            ->addOption('end-date', 'e', InputOption::VALUE_REQUIRED);
     }
 
     /**
@@ -51,7 +50,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $workload = $input->getArgument('workload');
         $cronExpression = $input->getOption('cron-expression');
         $endDateString = $input->getOption('end-date');
-        $key = $input->getOption('key');
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln(sprintf('Schedule task "%s" with workload "%s"', $handler, $workload));
@@ -68,10 +66,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $taskBuilder->cron($cronExpression, new \DateTime(), $endDate);
         }
 
-        if ($key !== null) {
-            $taskBuilder->setKey($key);
-        }
-
         $taskBuilder->schedule();
     }
 }
diff --git a/src/DependencyInjection/HandlerCompilerPass.php b/src/DependencyInjection/HandlerCompilerPass.php
@@ -15,7 +15,6 @@ class HandlerCompilerPass implements CompilerPassInterface
 {
     const REGISTRY_ID = 'task.handler_registry';
     const HANDLER_TAG = 'task.handler';
-    const ADD_FUNCTION_NAME = 'add';
     const HANDLER_NAME_ATTRIBUTE = 'handler-name';
 
     /**
@@ -27,16 +26,14 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $definition = $container->findDefinition(self::REGISTRY_ID);
-
+        $handler = [];
         $taggedServices = $container->findTaggedServiceIds(self::HANDLER_TAG);
         foreach ($taggedServices as $id => $tags) {
-            foreach ($tags as $attributes) {
-                $definition->addMethodCall(
-                    self::ADD_FUNCTION_NAME,
-                    [$attributes[self::HANDLER_NAME_ATTRIBUTE], new Reference($id)]
-                );
-            }
+            $service = $container->getDefinition($id);
+            $handler[$service->getClass()] = new Reference($id);
         }
+
+        $definition = $container->findDefinition(self::REGISTRY_ID);
+        $definition->replaceArgument(0, $handler);
     }
 }
diff --git a/src/Entity/TaskExecutionRepository.php b/src/Entity/TaskExecutionRepository.php
@@ -3,10 +3,12 @@
 namespace Task\TaskBundle\Entity;
 
 use Doctrine\ORM\EntityRepository;
+use Task\Execution\TaskExecutionInterface;
+use Task\Storage\TaskExecutionRepositoryInterface;
 use Task\TaskInterface;
 use Task\TaskStatus;
 
-class TaskExecutionRepository extends EntityRepository
+class TaskExecutionRepository extends EntityRepository implements TaskExecutionRepositoryInterface
 {
     public function findByStartTime(TaskInterface $task, \DateTime $scheduleTime)
     {
@@ -20,8 +22,12 @@ public function findByStartTime(TaskInterface $task, \DateTime $scheduleTime)
             ->getResult();
     }
 
-    public function findScheduled(\DateTime $dateTime)
+    public function findScheduled(\DateTime $dateTime = null)
     {
+        if ($dateTime === null) {
+            $dateTime = new \DateTime();
+        }
+
         return $this->createQueryBuilder('e')
             ->innerJoin('e.task', 't')
             ->where('e.status = :status AND e.scheduleTime < :dateTime')
@@ -30,4 +36,15 @@ public function findScheduled(\DateTime $dateTime)
             ->getQuery()
             ->getResult();
     }
+
+    public function save(TaskExecutionInterface $execution)
+    {
+        $this->_em->flush();
+    }
+
+    public function add(TaskExecutionInterface $execution)
+    {
+        $this->_em->persist($execution);
+        $this->_em->flush();
+    }
 }
diff --git a/src/Entity/TaskRepository.php b/src/Entity/TaskRepository.php
@@ -3,14 +3,37 @@
 namespace Task\TaskBundle\Entity;
 
 use Doctrine\ORM\EntityRepository;
+use Task\Storage\TaskRepositoryInterface;
+use Task\TaskInterface;
 
-class TaskRepository extends EntityRepository
+class TaskRepository extends EntityRepository implements TaskRepositoryInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function findEndBefore(\DateTime $dateTime)
     {
-        $this->createQueryBuilder('t')
+        return $this->createQueryBuilder('t')
             ->where('t.lastExecution IS NOT NULL OR t.lastExecution > :dateTime')
             ->setParameter('dateTime', $dateTime)
-            ->getQuery()->getResult();
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(TaskInterface $task)
+    {
+        $this->_em->persist($task);
+        $this->_em->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findEndBeforeNow()
+    {
+        return $this->findEndBefore(new \DateTime());
     }
 }
diff --git a/src/Factory.php b/src/Factory.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Task\TaskBundle;
+
+use Task\TaskBundle\Entity\Task;
+
+class Factory extends \Task\Factory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createTask($handlerClass, $workload)
+    {
+        return new Task($handlerClass, $workload);
+    }
+}
diff --git a/src/Resources/config/command.xml b/src/Resources/config/command.xml
@@ -5,17 +5,17 @@
     <services>
         <service id="task.command.run" class="Task\TaskBundle\Command\RunCommand">
             <argument type="string">task:run</argument>
-            <argument type="service" id="task.scheduler"/>
+            <argument type="service" id="task.runner"/>
 
             <tag name="console.command"/>
         </service>
 
-        <service id="task.command.run.handler" class="Task\TaskBundle\Command\RunHandlerCommand">
+        <!--<service id="task.command.run.handler" class="Task\TaskBundle\Command\RunHandlerCommand">
             <argument type="string">task:run:handler</argument>
             <argument type="service" id="task.handler_registry"/>
 
             <tag name="console.command"/>
-        </service>
+        </service>-->
 
         <service id="task.command.schedule_task" class="Task\TaskBundle\Command\ScheduleTaskCommand">
             <argument type="string">task:schedule:task</argument>
@@ -24,11 +24,11 @@
             <tag name="console.command"/>
         </service>
 
-        <service id="task.command.debug_tasks" class="Task\TaskBundle\Command\DebugTasksCommand">
+        <!--<service id="task.command.debug_tasks" class="Task\TaskBundle\Command\DebugTasksCommand">
             <argument type="string">debug:tasks</argument>
             <argument type="service" id="task.storage"/>
 
             <tag name="console.command"/>
-        </service>
+        </service>-->
     </services>
 </container>
diff --git a/src/Resources/config/doctrine/Task.orm.xml b/src/Resources/config/doctrine/Task.orm.xml
@@ -2,7 +2,8 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Task\TaskBundle\Entity\Task" table="ta_tasks" repository-class="Entity\TaskRepository">
+    <entity name="Task\TaskBundle\Entity\Task" table="ta_tasks"
+            repository-class="Task\TaskBundle\Entity\TaskRepository">
 
         <indexes>
             <index columns="uuid"/>
@@ -15,7 +16,7 @@
         <field name="uuid" type="string" length="100" unique="true"/>
         <field name="handlerClass" type="string" length="255"/>
         <field name="intervalExpression" type="string" length="255" nullable="true"/>
-        <field name="firstExecution" type="datetime"/>
+        <field name="firstExecution" type="datetime" nullable="true"/>
         <field name="lastExecution" type="datetime" nullable="true"/>
         <field name="workload" type="object"/>
 
diff --git a/src/Resources/config/doctrine/TaskExecution.orm.xml b/src/Resources/config/doctrine/TaskExecution.orm.xml
@@ -3,11 +3,11 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Task\TaskBundle\Entity\TaskExecution" table="ta_task_executions"
-            repository-class="Entity\TaskExecutionRepository">
+            repository-class="Task\TaskBundle\Entity\TaskExecutionRepository">
 
         <indexes>
             <index columns="uuid"/>
-            <index columns="scheduleTime"/>
+            <index columns="schedule_time"/>
         </indexes>
 
         <id name="id" type="integer">
@@ -20,7 +20,7 @@
         <field name="duration" type="float"/>
         <field name="startTime" type="datetime"/>
         <field name="endTime" type="datetime"/>
-        <field name="scheduleTime" type="datetime"/>
+        <field name="scheduleTime" column="schedule_time" type="datetime"/>
         <field name="exception" type="object"/>
         <field name="result" type="object"/>
         <field name="status" type="string" length="20"/>
diff --git a/src/Resources/config/scheduler.xml b/src/Resources/config/scheduler.xml
@@ -3,15 +3,33 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="task.handler_registry" class="Task\Handler\Registry"/>
-        <service id="task.builder_factory" class="Task\TaskBuilderFactory"/>
+        <service id="task.factory" class="Task\TaskBundle\Factory"/>
 
-        <service id="task.scheduler" class="Task\Scheduler">
-            <argument type="service" id="task.storage"/>
-            <argument type="service" id="task.handler_registry"/>
-            <argument type="service" id="task.builder_factory"/>
-            <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="logger" on-invalid="ignore"/>
+        <service id="task.storage.task" class="Task\TaskBundle\Entity\TaskRepository">
+            <factory service="doctrine.orm.entity_manager" method="getRepository"/>
+
+            <argument type="string">TaskBundle:Task</argument>
+        </service>
+
+        <service id="task.storage.task_execution" class="Task\TaskBundle\Entity\TaskExecutionRepository">
+            <factory service="doctrine.orm.entity_manager" method="getRepository"/>
+
+            <argument type="string">TaskBundle:TaskExecution</argument>
+        </service>
+
+        <service id="task.scheduler" class="Task\Scheduler\Scheduler">
+            <argument type="service" id="task.factory"/>
+            <argument type="service" id="task.storage.task"/>
+            <argument type="service" id="task.storage.task_execution"/>
+        </service>
+
+        <service id="task.handler.factory" class="Task\TaskBundle\Handler\TaskHandlerFactory">
+            <argument type="collection"/>
+        </service>
+
+        <service id="task.runner" class="Task\Runner\TaskRunner">
+            <argument type="service" id="task.storage.task_execution"/>
+            <argument type="service" id="task.handler.factory"/>
         </service>
     </services>
 </container>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Symfony\Component\Console\Command\Command;`
`6`	`6`	`use Symfony\Component\Console\Input\InputInterface;`
`7`	`7`	`use Symfony\Component\Console\Output\OutputInterface;`
`8`		`-use Task\SchedulerInterface;`
	`8`	`+use Task\Runner\TaskRunnerInterface;`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Run pending tasks.`
`@@ -15,15 +15,15 @@`
`15`	`15`	`class RunCommand extends Command`
`16`	`16`	`{`
`17`	`17`	`/**`
`18`		`- * @var SchedulerInterface`
	`18`	`+ * @var TaskRunnerInterface`
`19`	`19`	`*/`
`20`		`- private $scheduler;`
	`20`	`+ private $runner;`
`21`	`21`
`22`		`- public function __construct($name, SchedulerInterface $scheduler)`
	`22`	`+ public function __construct($name, TaskRunnerInterface $scheduler)`
`23`	`23`	`{`
`24`	`24`	`parent::__construct($name);`
`25`	`25`
`26`		`- $this->scheduler = $scheduler;`
	`26`	`+ $this->runner = $scheduler;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`@@ -39,6 +39,6 @@ protected function configure()`
`39`	`39`	`*/`
`40`	`40`	`protected function execute(InputInterface $input, OutputInterface $output)`
`41`	`41`	`{`
`42`		`- $this->scheduler->run();`
	`42`	`+ $this->runner->runTasks();`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ class HandlerCompilerPass implements CompilerPassInterface`
`15`	`15`	`{`
`16`	`16`	`const REGISTRY_ID = 'task.handler_registry';`
`17`	`17`	`const HANDLER_TAG = 'task.handler';`
`18`		`- const ADD_FUNCTION_NAME = 'add';`
`19`	`18`	`const HANDLER_NAME_ATTRIBUTE = 'handler-name';`
`20`	`19`
`21`	`20`	`/**`
`@@ -27,16 +26,14 @@ public function process(ContainerBuilder $container)`
`27`	`26`	`return;`
`28`	`27`	`}`
`29`	`28`
`30`		`- $definition = $container->findDefinition(self::REGISTRY_ID);`
`31`		`-`
	`29`	`+ $handler = [];`
`32`	`30`	`$taggedServices = $container->findTaggedServiceIds(self::HANDLER_TAG);`
`33`	`31`	`foreach ($taggedServices as $id => $tags) {`
`34`		`- foreach ($tags as $attributes) {`
`35`		`- $definition->addMethodCall(`
`36`		`- self::ADD_FUNCTION_NAME,`
`37`		`- [$attributes[self::HANDLER_NAME_ATTRIBUTE], new Reference($id)]`
`38`		`- );`
`39`		`- }`
	`32`	`+ $service = $container->getDefinition($id);`
	`33`	`+ $handler[$service->getClass()] = new Reference($id);`
`40`	`34`	`}`
	`35`	`+`
	`36`	`+ $definition = $container->findDefinition(self::REGISTRY_ID);`
	`37`	`+ $definition->replaceArgument(0, $handler);`
`41`	`38`	`}`
`42`	`39`	`}`