Merge pull request #373 from martiis/extra_document_properties

Added dynamic, transform, dynamic_date_format properties for Document an...

Author: saimaz

Annotation/Document.php

@@ -11,13 +11,15 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
+use ONGR\ElasticsearchBundle\Mapping\DumperInterface;
+
 /**
  * Annotation to mark a class as an Elasticsearch document.
  *
  * @Annotation
  * @Target("CLASS")
  */
-final class Document
+final class Document implements DumperInterface
 {
     /**
      * @var bool
@@ -48,4 +50,37 @@ final class Document
      * @var array
      */
     public $all;
+
+    /**
+     * @var string
+     */
+    public $dynamic;
+
+    /**
+     * @var array
+     */
+    public $transform;
+
+    /**
+     * @var array
+     */
+    public $dynamicDateFormats;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump(array $exclude = [])
+    {
+        return array_diff_key(
+            [
+                '_ttl' => $this->ttl,
+                '_all' => $this->all,
+                'enabled' => $this->enabled,
+                'dynamic' => $this->dynamic,
+                'transform' => $this->transform,
+                'dynamic_date_formats' => $this->dynamicDateFormats,
+            ],
+            $exclude
+        );
+    }
 }

Mapping/DocumentParser.php

@@ -112,12 +112,10 @@ public function parse(\ReflectionClass $reflectionClass)
             return [
                 $type => [
                     'properties' => $properties,
-                    'fields' => [
-                        '_parent' => $parent === null ? null : ['type' => $parent],
-                        '_ttl' => $class->ttl,
-                        'enabled' => $class->enabled,
-                        '_all' => $class->all,
-                    ],
+                    'fields' => array_merge(
+                        $class->dump(),
+                        ['_parent' => $parent === null ? null : ['type' => $parent]]
+                    ),
                     'aliases' => $this->getAliases($reflectionClass),
                     'objects' => $this->getObjects(),
                     'proxyNamespace' => ProxyFactory::getProxyNamespace($reflectionClass, true),

Tests/Functional/Annotation/DocumentTest.php

@@ -29,6 +29,9 @@ public function testDocumentMappingWithAllFieldSetToFalse()
             '_ttl' => null,
             'enabled' => null,
             '_all' => ['enabled' => false],
+            'dynamic' => null,
+            'transform' => null,
+            'dynamic_date_formats' => null,
         ];
         $this->assertEquals($expectedResult, $result);
     }

Tests/Functional/DSL/Aggregation/DateRangeAggregationTest.php

@@ -28,22 +28,22 @@ protected function getDataArray()
                 'comment' => [
                     [
                         '_parent' => 1,
-                        'sub_title' => 'foo',
+                        'userName' => 'foo',
                         'createdAt' => '2010',
                     ],
                     [
                         '_parent' => 1,
-                        'sub_title' => 'bar bar',
+                        'userName' => 'bar bar',
                         'createdAt' => '2011',
                     ],
                     [
                         '_parent' => 2,
-                        'sub_title' => 'foo bar',
+                        'userName' => 'foo bar',
                         'createdAt' => '2013',
                     ],
                     [
                         '_parent' => 2,
-                        'sub_title' => 'bar',
+                        'userName' => 'bar',
                         'createdAt' => '2015',
                     ],
                 ],

Tests/app/fixture/Acme/TestBundle/Document/Comment.php

@@ -19,7 +19,12 @@
 /**
  * Comment document for testing.
  *
- * @ES\Document(type="comment", parent="AcmeTestBundle:Content", ttl={"enabled":true, "default": "1d"})
+ * @ES\Document(
+ *      type="comment",
+ *      parent="AcmeTestBundle:Content",
+ *      ttl={"enabled":true, "default": "1d"},
+ *      dynamic="strict"
+ * )
  */
 class Comment extends AbstractDocument
 {

Tests/app/fixture/Json/collector_body_0.json

@@ -7,8 +7,8 @@
         }
     },
     "fields": [
-        "_parent",
         "_ttl",
+        "_parent",
         "_source"
     ]
 }