Enable fetchable attribute on property metadata

Author: abluchet

src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -184,7 +184,7 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
                 }
 
                 //the field test allows to add methods to a Resource which do not reflect real database fields
-                if (true === $targetClassMetadata->hasField($property) && true === $propertyMetadata->isReadable()) {
+                if (true === $targetClassMetadata->hasField($property) && (true === $propertyMetadata->getAttribute('fetchable') || true === $propertyMetadata->isReadable())) {
                     $select[] = $property;
                 }
             }

src/Metadata/Property/PropertyMetadata.php

@@ -305,6 +305,23 @@ public function withAttributes(array $attributes): self
         return $metadata;
     }
 
+    /**
+     * Gets an attribute.
+     *
+     * @param string $key
+     * @param mixed  $defaultValue
+     *
+     * @return mixed
+     */
+    public function getAttribute(string $key, $defaultValue = null)
+    {
+        if (isset($this->attributes[$key])) {
+            return $this->attributes[$key];
+        }
+
+        return $defaultValue;
+    }
+
     /**
      * Is the property inherited from a child class?
      *
@@ -330,11 +347,23 @@ public function withChildInherited(string $childInherited): self
         return $metadata;
     }
 
+    /**
+     * Does the property have a subresource?
+     *
+     * @return bool|null
+     */
     public function hasSubresource()
     {
         return $this->subresource;
     }
 
+    /**
+     * Returns a new instance with the given subresource flag.
+     *
+     * @param bool $subresource
+     *
+     * @return self
+     */
     public function withSubresource(bool $subresource = null): self
     {
         $metadata = clone $this;

tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php

@@ -49,7 +49,7 @@ public function testApplyToCollection()
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
 
-        $relatedNameCollection = new PropertyNameCollection(['id', 'name', 'notindatabase', 'notreadable']);
+        $relatedNameCollection = new PropertyNameCollection(['id', 'name', 'notindatabase', 'notreadable', 'notreadablebutfetchable']);
 
         $propertyNameCollectionFactoryProphecy->create(RelatedDummy::class)->willReturn($relatedNameCollection)->shouldBeCalled();
 
@@ -69,10 +69,15 @@ public function testApplyToCollection()
         $notReadablePropertyMetadata = new PropertyMetadata();
         $notReadablePropertyMetadata = $notReadablePropertyMetadata->withReadable(false);
 
+        $notReadableButFetchablePropertyMetadata = new PropertyMetadata();
+        $notReadableButFetchablePropertyMetadata = $notReadableButFetchablePropertyMetadata->withAttributes(['fetchable' => true]);
+        $notReadableButFetchablePropertyMetadata = $notReadableButFetchablePropertyMetadata->withReadable(false);
+
         $propertyMetadataFactoryProphecy->create(RelatedDummy::class, 'id', [])->willReturn($idPropertyMetadata)->shouldBeCalled();
         $propertyMetadataFactoryProphecy->create(RelatedDummy::class, 'name', [])->willReturn($namePropertyMetadata)->shouldBeCalled();
         $propertyMetadataFactoryProphecy->create(RelatedDummy::class, 'notindatabase', [])->willReturn($notInDatabasePropertyMetadata)->shouldBeCalled();
         $propertyMetadataFactoryProphecy->create(RelatedDummy::class, 'notreadable', [])->willReturn($notReadablePropertyMetadata)->shouldBeCalled();
+        $propertyMetadataFactoryProphecy->create(RelatedDummy::class, 'notreadablebutfetchable', [])->willReturn($notReadableButFetchablePropertyMetadata)->shouldBeCalled();
 
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
 
@@ -101,8 +106,8 @@ public function testApplyToCollection()
 
         $queryBuilderProphecy->leftJoin('o.relatedDummy', 'relatedDummy_a1')->shouldBeCalled(1);
         $queryBuilderProphecy->innerJoin('o.relatedDummy2', 'relatedDummy2_a2')->shouldBeCalled(1);
-        $queryBuilderProphecy->addSelect('partial relatedDummy_a1.{id,name}')->shouldBeCalled(1);
-        $queryBuilderProphecy->addSelect('partial relatedDummy2_a2.{id,name}')->shouldBeCalled(1);
+        $queryBuilderProphecy->addSelect('partial relatedDummy_a1.{id,name,notreadablebutfetchable}')->shouldBeCalled(1);
+        $queryBuilderProphecy->addSelect('partial relatedDummy2_a2.{id,name,notreadablebutfetchable}')->shouldBeCalled(1);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false);