deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify *One methods in the persister

Browse source
This commit is contained in:
Tim Nagel 2014-07-03 23:37:44 +10:00
parent c200e8fdfd
commit 21e5d906a7
3 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Persister/ObjectPersister.php
View file

@ -71,8 +71,7 @@ class ObjectPersister implements ObjectPersisterInterface
*/ */
public function insertOne($object) public function insertOne($object)
{ {
$document = $this->transformToElasticaDocument($object); $this->insertMany(array($object));
$this->type->addDocument($document);
} }
/** /**
@ -83,11 +82,7 @@ class ObjectPersister implements ObjectPersisterInterface
**/ **/
public function replaceOne($object) public function replaceOne($object)
{ {
$document = $this->transformToElasticaDocument($object); $this->replaceMany(array($object));
try {
$this->type->deleteById($document->getId());
} catch (NotFoundException $e) {}
$this->type->addDocument($document);
} }
/** /**
@ -98,10 +93,7 @@ class ObjectPersister implements ObjectPersisterInterface
**/ **/
public function deleteOne($object) public function deleteOne($object)
{ {
$document = $this->transformToElasticaDocument($object); $this->deleteMany(array($object));
try {
$this->type->deleteById($document->getId());
} catch (NotFoundException $e) {}
} }
/** /**
@ -113,9 +105,7 @@ class ObjectPersister implements ObjectPersisterInterface
**/ **/
public function deleteById($id) public function deleteById($id)
{ {
try { $this->deleteManyByIdentifiers(array($id));
$this->type->deleteById($id);
} catch (NotFoundException $e) {}
} }
/** /**

9
Tests/Persister/ObjectPersisterTest.php
View file

@ -47,10 +47,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('deleteById') ->method('updateDocuments');
->with($this->equalTo(123));
$typeMock->expects($this->once())
->method('addDocument');
$fields = array('name' => array()); $fields = array('name' => array());
@ -91,7 +88,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
$typeMock->expects($this->never()) $typeMock->expects($this->never())
->method('deleteById'); ->method('deleteById');
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('addDocument'); ->method('addDocuments');
$fields = array('name' => array()); $fields = array('name' => array());
@ -130,7 +127,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('deleteById'); ->method('deleteDocuments');
$typeMock->expects($this->never()) $typeMock->expects($this->never())
->method('addDocument'); ->method('addDocument');

9
Tests/Persister/ObjectSerializerPersisterTest.php
View file

@ -42,10 +42,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('deleteById') ->method('updateDocuments');
->with($this->equalTo(123));
$typeMock->expects($this->once())
->method('addDocument');
$serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock(); $serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock();
$serializerMock->expects($this->once())->method('serialize'); $serializerMock->expects($this->once())->method('serialize');
@ -65,7 +62,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
$typeMock->expects($this->never()) $typeMock->expects($this->never())
->method('deleteById'); ->method('deleteById');
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('addDocument'); ->method('addDocuments');
$serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock(); $serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock();
$serializerMock->expects($this->once())->method('serialize'); $serializerMock->expects($this->once())->method('serialize');
@ -83,7 +80,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$typeMock->expects($this->once()) $typeMock->expects($this->once())
->method('deleteById'); ->method('deleteDocuments');
$typeMock->expects($this->never()) $typeMock->expects($this->never())
->method('addDocument'); ->method('addDocument');