Renamed status and resolution

Signed-off-by: Emil Kilhage <emilkilhage@gmail.com>
kilhage · Oct 4, 2016 · 9ab19a0 · 9ab19a0
1 parent c1148b0
commit 9ab19a0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/Entity/QueuedTask.php b/src/Entity/QueuedTask.php
@@ -87,14 +87,14 @@ class QueuedTask extends \Glooby\TaskBundle\Model\QueuedTask
     /**
      * @var string
      *
-     * @ORM\Column(name="status", type="string", options={"default": "pending"})
+     * @ORM\Column(name="status", type="string", options={"default": "queued"})
      */
-    protected $status = self::STATUS_PENDING;
+    protected $status = self::STATUS_QUEUED;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="resolution", type="string", options={"default": "pending"})
+     * @ORM\Column(name="resolution", type="string", options={"default": "queued"})
      */
-    protected $resolution = self::RESOLUTION_PENDING;
+    protected $resolution = self::RESOLUTION_QUEUED;
 }
diff --git a/src/Entity/QueuedTaskRepository.php b/src/Entity/QueuedTaskRepository.php
@@ -48,14 +48,14 @@ public function getByNameAndExecuteAtBeforeNow($name)
      * @param int $limit
      * @return QueuedTaskInterface[]
      */
-    public function findPending($limit)
+    public function findQueued($limit)
     {
         return $this->getEntityManager()
             ->createQuery('SELECT r
               FROM GloobyTaskBundle:QueuedTask r
               WHERE r.status = :status AND r.executeAt <= :now
               ORDER BY r.executeAt ASC')
-            ->setParameter('status', QueuedTaskInterface::STATUS_PENDING)
+            ->setParameter('status', QueuedTaskInterface::STATUS_QUEUED)
             ->setParameter('now', new \DateTime())
             ->setMaxResults($limit)
             ->useQueryCache(true)

diff --git a/src/Model/QueuedTask.php b/src/Model/QueuedTask.php
@@ -55,12 +55,12 @@ class QueuedTask implements QueuedTaskInterface
     /**
      * @var string
      */
-    protected $status = self::STATUS_PENDING;
+    protected $status = self::STATUS_QUEUED;
 
     /**
      * @var string
      */
-    protected $resolution = self::RESOLUTION_PENDING;
+    protected $resolution = self::RESOLUTION_QUEUED;
 
     /**
      * QueuedTask constructor.
@@ -74,8 +74,8 @@ public function __construct($name, array $params = null, \DateTime $executeAt =
         $this->params = null === $params ? $params : [];
         $this->executeAt = null === $executeAt ? new \DateTime() : $executeAt;
         $this->created = new \DateTime();
-        $this->status = self::STATUS_PENDING;
-        $this->resolution = self::RESOLUTION_PENDING;
+        $this->status = self::STATUS_QUEUED;
+        $this->resolution = self::RESOLUTION_QUEUED;
     }
 
     /**

diff --git a/src/Model/QueuedTaskInterface.php b/src/Model/QueuedTaskInterface.php
@@ -7,11 +7,11 @@
  */
 interface QueuedTaskInterface
 {
-    const STATUS_PENDING = 'pending';
+    const STATUS_QUEUED = 'queued';
     const STATUS_RUNNING = 'running';
     const STATUS_DONE    = 'done';
 
-    const RESOLUTION_PENDING = 'pending';
+    const RESOLUTION_QUEUED = 'queued';
     const RESOLUTION_SUCCESS = 'success';
     const RESOLUTION_FAILURE = 'failure';
 

diff --git a/src/Queue/QueueProcessor.php b/src/Queue/QueueProcessor.php
@@ -77,7 +77,7 @@ public function process()
         $queueRepo = $this->doctrine->getManager()
             ->getRepository('GloobyTaskBundle:QueuedTask');
 
-        foreach ($queueRepo->findPending($this->limit) as $queuedTask) {
+        foreach ($queueRepo->findQueued($this->limit) as $queuedTask) {
             $this->start($queuedTask);
         }