Added find-by-task and remove function (#20)

* added find-by-task function * added remove method
php-task · Nov 23, 2016 · e9bda57 · e9bda57
1 parent cc16388
commit e9bda57
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 0 deletions.
diff --git a/src/Task/Storage/ArrayStorage/ArrayTaskExecutionRepository.php b/src/Task/Storage/ArrayStorage/ArrayTaskExecutionRepository.php
@@ -55,6 +55,16 @@ public function persist(TaskExecutionInterface $execution)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function remove(TaskExecutionInterface $execution)
+    {
+        $this->taskExecutionCollection->removeElement($execution);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -83,6 +93,18 @@ function (TaskExecutionInterface $execution) use ($task, $scheduleTime) {
         return $filtered->first();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function findByTask(TaskInterface $task)
+    {
+        return array_values($this->taskExecutionCollection->filter(
+            function (TaskExecutionInterface $execution) use ($task) {
+                return $execution->getTask()->getUuid() === $task->getUuid();
+            }
+        )->toArray());
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Task/Storage/ArrayStorage/ArrayTaskRepository.php b/src/Task/Storage/ArrayStorage/ArrayTaskRepository.php
@@ -66,6 +66,16 @@ public function persist(TaskInterface $task)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function remove(TaskInterface $task)
+    {
+        $this->taskCollection->removeElement($task);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Task/Storage/TaskExecutionRepositoryInterface.php b/src/Task/Storage/TaskExecutionRepositoryInterface.php
@@ -38,6 +38,15 @@ public function create(TaskInterface $task, \DateTime $scheduleTime);
      */
     public function persist(TaskExecutionInterface $execution);
 
+    /**
+     * Remove task-execution.
+     *
+     * @param TaskExecutionInterface $execution
+     *
+     * @return $this
+     */
+    public function remove(TaskExecutionInterface $execution);
+
     /**
      * Flush storage.
      *
@@ -55,6 +64,15 @@ public function flush();
      */
     public function findByStartTime(TaskInterface $task, \DateTime $scheduleTime);
 
+    /**
+     * Find executions of given task.
+     *
+     * @param TaskInterface $task
+     *
+     * @return TaskExecutionInterface[]
+     */
+    public function findByTask(TaskInterface $task);
+
     /**
      * Returns all task-executions.
      *

diff --git a/src/Task/Storage/TaskRepositoryInterface.php b/src/Task/Storage/TaskRepositoryInterface.php
@@ -44,6 +44,13 @@ public function create($handlerClass, $workload = null);
      */
     public function persist(TaskInterface $task);
 
+    /**
+     * Persist task.
+     *
+     * @param TaskInterface $task
+     */
+    public function remove(TaskInterface $task);
+
     /**
      * Flush storage.
      *

diff --git a/tests/Unit/Storage/ArrayStorage/ArrayTaskExecutionRepositoryTest.php b/tests/Unit/Storage/ArrayStorage/ArrayTaskExecutionRepositoryTest.php
@@ -40,6 +40,21 @@ public function testPersist()
         );
     }
 
+    public function testRemove()
+    {
+        $taskExecutionCollection = $this->prophesize(Collection::class);
+        $taskExecutionRepository = new ArrayTaskExecutionRepository($taskExecutionCollection->reveal());
+
+        $execution = $this->prophesize(TaskExecutionInterface::class);
+
+        $taskExecutionCollection->removeElement($execution->reveal())->shouldBeCalled();
+
+        $this->assertEquals(
+            $taskExecutionRepository,
+            $taskExecutionRepository->remove($execution->reveal())
+        );
+    }
+
     public function testFlush()
     {
         $taskExecutionCollection = $this->prophesize(Collection::class);
@@ -68,6 +83,22 @@ public function testFindByStartTime()
         $this->assertEquals($executions[1], $repository->findByStartTime($task, $executions[1]->getScheduleTime()));
     }
 
+    public function testFindByTask()
+    {
+        $task1 = new Task(\stdClass::class, 'Test 1', '123-123-123');
+        $task2 = new Task(\stdClass::class, 'Test 1');
+        $executions = [
+            new TaskExecution($task1, \stdClass::class, new \DateTime('+1 day'), 'Test 1'),
+            new TaskExecution($task2, \stdClass::class, new \DateTime('1 day ago'), 'Test 1'),
+            new TaskExecution($task1, \stdClass::class, new \DateTime('1 hour ago'), 'Test 1'),
+        ];
+
+        $repository = new ArrayTaskExecutionRepository(new ArrayCollection($executions));
+
+        $this->assertEquals([$executions[0], $executions[2]], $repository->findByTask($task1));
+        $this->assertEquals([$executions[1]], $repository->findByTask($task2));
+    }
+
     public function testFindByStartTimeNoResult()
     {
         $task = new Task(\stdClass::class, 'Test 1', '123-123-123');

diff --git a/tests/Unit/Storage/ArrayStorage/ArrayTaskRepositoryTest.php b/tests/Unit/Storage/ArrayStorage/ArrayTaskRepositoryTest.php
@@ -65,6 +65,21 @@ public function testPersist()
         );
     }
 
+    public function testRemove()
+    {
+        $collection = $this->prophesize(Collection::class);
+        $repository = new ArrayTaskRepository($collection->reveal());
+
+        $task = $this->prophesize(TaskInterface::class);
+
+        $collection->removeElement($task->reveal())->shouldBeCalled();
+
+        $this->assertEquals(
+            $repository,
+            $repository->remove($task->reveal())
+        );
+    }
+
     public function testFlush()
     {
         $collection = $this->prophesize(Collection::class);