expanded the persistence API

Author: xabbuh

Manager/StatementManager.php

@@ -12,15 +12,17 @@
 namespace Xabbuh\XApi\Storage\Doctrine\Manager;
 
 use Xabbuh\XApi\Model\Statement;
-use Xabbuh\XApi\Storage\Api\StatementManager as BaseStatementManager;
+use Xabbuh\XApi\Model\StatementsFilter;
+use Xabbuh\XApi\Storage\Api\Exception\NotFoundException;
+use Xabbuh\XApi\Storage\Api\StatementManagerInterface;
 use Xabbuh\XApi\Storage\Doctrine\Repository\StatementRepositoryInterface;
 
 /**
  * Doctrine based {@link Statement} manager.
  *
  * @author Christian Flothmann <[email protected]>
  */
-class StatementManager extends BaseStatementManager
+class StatementManager implements StatementManagerInterface
 {
     /**
      * @var StatementRepositoryInterface The statement repository
@@ -35,17 +37,39 @@ public function __construct(StatementRepositoryInterface $repository)
     /**
      * {@inheritDoc}
      */
-    public function findStatementBy(array $criteria)
+    public function findStatementById($statementId)
     {
-        return $this->repository->findOneBy($criteria);
+        /** @var Statement $statement */
+        $statement = $this->repository->findOneBy(array('id' => $statementId));
+
+        if (null === $statement) {
+            throw new NotFoundException();
+        }
+
+        return $statement;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findVoidedStatementById($statementId)
+    {
+        /** @var Statement $statement */
+        $statement = $this->repository->findOneBy(array('id' => $statementId));
+
+        if (null === $statement) {
+            throw new NotFoundException();
+        }
+
+        return $statement;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function findStatementsBy(array $criteria)
+    public function findStatementsBy(StatementsFilter $filter)
     {
-        return $this->repository->findBy($criteria);
+        return $this->repository->findBy($filter->getFilter());
     }
 
     /**

Tests/Manager/StatementManagerTest.php

@@ -12,6 +12,8 @@
 namespace Xabbuh\XApi\Storage\Doctrine\Tests\Manager;
 
 use Xabbuh\XApi\DataFixtures\StatementFixtures;
+use Xabbuh\XApi\DataFixtures\VerbFixtures;
+use Xabbuh\XApi\Model\StatementsFilter;
 use Xabbuh\XApi\Storage\Doctrine\Manager\StatementManager;
 
 /**
@@ -42,37 +44,25 @@ public function testFindStatementById()
             ->repository
             ->expects($this->once())
             ->method('findOneBy')
-            ->with(array('id' => $statementId));
+            ->with(array('id' => $statementId))
+            ->will($this->returnValue(StatementFixtures::getMinimalStatement()));
 
         $this->statementManager->findStatementById($statementId);
     }
 
-    public function testFindStatementByCriteria()
-    {
-        $this
-            ->repository
-            ->expects($this->once())
-            ->method('findOneBy')
-            ->with($this->equalTo(array('foo' => 'bar', 'baz' => 'foobar')));
-
-        $this->statementManager->findStatementBy(array(
-            'foo' => 'bar',
-            'baz' => 'foobar',
-        ));
-    }
-
     public function testFindStatementsByCriteria()
     {
+        $verb = VerbFixtures::getVerb();
+
         $this
             ->repository
             ->expects($this->once())
             ->method('findBy')
-            ->with($this->equalTo(array('foo' => 'bar', 'baz' => 'foobar')));
+            ->with($this->equalTo(array('verb' => $verb->getId())));
 
-        $this->statementManager->findStatementsBy(array(
-            'foo' => 'bar',
-            'baz' => 'foobar',
-        ));
+        $filter = new StatementsFilter();
+        $filter->byVerb($verb);
+        $this->statementManager->findStatementsBy($filter);
     }
 
     public function testSave()