Implemented method to remove document

README.md

@@ -6,7 +6,7 @@ professional [elasticsearch](https://www.elastic.co/products/elasticsearch) inte
 
 * Supported by [ONGR.io](http://ongr.io) development team.
 * Uses the official [elasticsearch-php](https://github.com/elastic/elasticsearch-php) client.
-* Ensures full integration with Symfony 2 framework.
+* Ensures full integration with Symfony framework.
 
 Technical goodies:
 

Resources/doc/crud.md

@@ -86,8 +86,7 @@ $manager->commit();
 
 ```php
 
-$repo = $this->get('es.manager.default.content');
-$content = $repo->find(5);
+$content = $manager->find('AppBundle:Content', 5);
 $content->title = 'changed Acme title';
 $manager->persist($content);
 $manager->commit();
@@ -134,6 +133,15 @@ $response = $repo->update(1, ['title' => 'new title'], null, ['fields' => 'title
 
 ## Delete a document
 
+Document removal can be performed similar to create or update action:
+
+```php
+$manager->remove($content);
+$manager->commit();
+```
+
+Alternatively you can remove document by ID (requires to have repository service):
+
 ```php
 
 $repo = $this->get('es.manager.default.content');

Resources/doc/index.md

@@ -1,6 +1,6 @@
 ## Elasticsearch Bundle
 
-Welcome to the ElasticsearchBundle, the modern solution to work with [Elasticsearch database](https://www.elastic.co/products/elasticsearch) in the [Symfony 2](https://github.com/symfony/symfony-standard) applications. We created this bundle with love :heart: and we think you will love it too.
+Welcome to the ElasticsearchBundle, the modern solution to work with [Elasticsearch database](https://www.elastic.co/products/elasticsearch) in the [Symfony](https://github.com/symfony/symfony-standard) applications. We created this bundle with love :heart: and we think you will love it too.
 
 > Bundle set up guide you can find in the `README.md` file. 
 

Result/Converter.php

@@ -131,13 +131,17 @@ public function assignArrayToObject(array $array, $object, array $aliases)
      *
      * @param mixed $object
      * @param array $aliases
+     * @param array $fields
      *
      * @return array
      */
-    public function convertToArray($object, $aliases = [])
+    public function convertToArray($object, $aliases = [], $fields = [])
     {
         if (empty($aliases)) {
             $aliases = $this->getAlias($object);
+            if (count($fields) > 0) {
+                $aliases = array_intersect_key($aliases, array_flip($fields));
+            }
         }
 
         $array = [];

Service/Manager.php

@@ -276,6 +276,26 @@ public function persist($document)
         $this->bulk('index', $type, $documentArray);
     }
 
+    /**
+     * Adds document for removal.
+     *
+     * @param object $document
+     */
+    public function remove($document)
+    {
+        $data = $this->converter->convertToArray($document, [], ['_id']);
+
+        if (!isset($data['_id'])) {
+            throw new \LogicException(
+                'In order to use remove() method document class must have @MetaField annotation for "_id" field.'
+            );
+        }
+
+        $type = $this->getMetadataCollector()->getDocumentType(get_class($document));
+
+        $this->bulk('delete', $type, ['_id' => $data['_id']]);
+    }
+
     /**
      * Flushes elasticsearch index.
      *

Tests/Functional/Service/ManagerTest.php

@@ -14,6 +14,7 @@
 use ONGR\ElasticsearchBundle\Service\Repository;
 use ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\BarBundle\Document\CategoryObject;
 use ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\BarBundle\Document\Product;
+use ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\BarBundle\Document\WithoutId;
 use ONGR\ElasticsearchDSL\Query\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchBundle\Service\Manager;
@@ -320,4 +321,32 @@ public function testExecuteQueryOnMultipleTypes()
 
         $this->assertCount(5, $result);
     }
+
+    /**
+     * Test for remove().
+     */
+    public function testRemove()
+    {
+        $manager = $this->getManager('foo');
+
+        $product = $manager->find('AcmeBarBundle:Product', 1);
+        $this->assertInstanceOf('ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\BarBundle\Document\Product', $product);
+
+        $manager->remove($product);
+        $manager->commit();
+
+        $product = $manager->find('AcmeBarBundle:Product', 1);
+        $this->assertNull($product);
+    }
+
+    /**
+     * Test for remove() in case document has no annotation for ID field.
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage must have @MetaField annotation for "_id"
+     */
+    public function testRemoveException()
+    {
+        $this->getManager()->remove(new WithoutId());
+    }
 }

Tests/app/fixture/Acme/BarBundle/Document/WithoutId.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\BarBundle\Document;
+
+use ONGR\ElasticsearchBundle\Annotation as ES;
+
+/**
+ * Document without ID meta field.
+ *
+ * @ES\Document()
+ */
+class WithoutId
+{
+    /**
+     * @var string
+     * @ES\Property(type="string")
+     */
+    public $description;
+}