fix(elasticsearch): support additional nesting within collections (api-platform#5642)

Author: colinodell

src/Elasticsearch/Util/FieldDatatypeTrait.php

@@ -82,7 +82,9 @@ private function getNestedFieldPath(string $resourceClass, string $property): ?s
             && null !== ($className = $type->getClassName())
             && $this->resourceClassResolver->isResourceClass($className)
         ) {
-            return $currentProperty;
+            $nestedPath = $this->getNestedFieldPath($className, implode('.', $properties));
+
+            return null === $nestedPath ? $currentProperty : "$currentProperty.$nestedPath";
         }
 
         return null;

tests/Elasticsearch/Util/FieldDatatypeTraitTest.php

@@ -36,6 +36,15 @@ public function testGetNestedFieldPath(): void
         self::assertNull($fieldDatatype->getNestedFieldPath(Foo::class, 'baz'));
     }
 
+    public function testGetNestedFieldInNestedCollection(): void
+    {
+        $fieldDatatype = $this->getValidFieldDatatype();
+
+        self::assertSame('bar.foo', $fieldDatatype->getNestedFieldPath(Foo::class, 'bar.foo.baz'));
+        self::assertSame('bar', $fieldDatatype->getNestedFieldPath(Foo::class, 'bar.foo'));
+        self::assertNull($fieldDatatype->getNestedFieldPath(Foo::class, 'baz'));
+    }
+
     public function testGetNestedFieldPathWithPropertyNotFound(): void
     {
         $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);