fix(mongodb): enhance ExactFilter and IriFilter to better handle relations

Author: vinceAmstoutz

src/Doctrine/Odm/Filter/ExactFilter.php

@@ -13,33 +13,80 @@
 
 namespace ApiPlatform\Doctrine\Odm\Filter;
 
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareTrait;
 use ApiPlatform\Doctrine\Common\Filter\OpenApiFilterTrait;
 use ApiPlatform\Metadata\BackwardCompatibleFilterDescriptionTrait;
 use ApiPlatform\Metadata\OpenApiParameterFilterInterface;
 use ApiPlatform\Metadata\Operation;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
+use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\LockException;
+use Doctrine\ODM\MongoDB\Mapping\MappingException;
 
 /**
  * @author Vincent Amstoutz <[email protected]>
  */
-final class ExactFilter implements FilterInterface, OpenApiParameterFilterInterface
+final class ExactFilter implements FilterInterface, OpenApiParameterFilterInterface, ManagerRegistryAwareInterface
 {
     use BackwardCompatibleFilterDescriptionTrait;
+    use ManagerRegistryAwareTrait;
     use OpenApiFilterTrait;
 
+    /**
+     * @throws MappingException
+     * @throws LockException
+     */
     public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         $parameter = $context['parameter'];
         $property = $parameter->getProperty();
-
         $value = $parameter->getValue();
-        if (is_numeric($value)) {
-            $property .= '.id';
+
+        $documentManager = $this->getManagerRegistry()->getManagerForClass($resourceClass);
+        if (!$documentManager instanceof DocumentManager) {
+            return;
+        }
+
+        $classMetadata = $documentManager->getClassMetadata($resourceClass);
+
+        if (!$classMetadata->hasReference($property)) {
+            $aggregationBuilder
+                ->match()
+                ->field($property)
+                ->{is_iterable($value) ? 'in' : 'equals'}($value);
+
+            return;
         }
 
+        $mapping = $classMetadata->getFieldMapping($property);
+        $targetDocument = $mapping['targetDocument'];
+        $repository = $documentManager->getRepository($targetDocument);
+        $method = $classMetadata->isCollectionValuedAssociation($property) ? 'includesReferenceTo' : 'references';
+
+        if (is_iterable($value)) {
+            $documents = [];
+            foreach ($value as $v) {
+                if ($doc = $repository->find($v)) {
+                    $documents[] = $doc;
+                }
+            }
+
+            $match = $aggregationBuilder->match();
+            $or = $match->expr();
+            foreach ($documents as $doc) {
+                $or->addOr($match->expr()->field($property)->{$method}($doc));
+            }
+            $match->addAnd($or);
+
+            return;
+        }
+
+        $referencedDoc = $repository->find($value);
+
         $aggregationBuilder
             ->match()
             ->field($property)
-            ->{(is_iterable($value)) ? 'in' : 'equals'}($value);
+            ->{$method}($referencedDoc);
     }
 }

src/Doctrine/Odm/Filter/IriFilter.php

@@ -23,6 +23,8 @@
 use ApiPlatform\State\ParameterProvider\IriConverterParameterProvider;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Mapping\MappingException;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 
 /**
  * @author Vincent Amstoutz <[email protected]>
@@ -33,24 +35,52 @@ final class IriFilter implements FilterInterface, OpenApiParameterFilterInterfac
     use ManagerRegistryAwareTrait;
     use OpenApiFilterTrait;
 
+    /**
+     * @throws MappingException
+     */
     public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
         $parameter = $context['parameter'];
         $property = $parameter->getProperty();
         $value = $parameter->getValue();
 
-        $documentManager = $this->getManagerRegistry()?->getManagerForClass($resourceClass);
-
+        $documentManager = $this->getManagerRegistry()->getManagerForClass($resourceClass);
         if (!$documentManager instanceof DocumentManager) {
             return;
         }
 
         $classMetadata = $documentManager->getClassMetadata($resourceClass);
-
         if (!$classMetadata->hasReference($property)) {
             return;
         }
 
+        $mapping = $classMetadata->getFieldMapping($property);
+
+        if (isset($mapping['mappedBy'])) {
+            $propertyAccessor = PropertyAccess::createPropertyAccessor();
+            $mappedByProperty = $mapping['mappedBy'];
+            $identifier = '_id';
+
+            if (is_iterable($value)) {
+                $ids = [];
+                foreach ($value as $v) {
+                    if ($relatedDoc = $propertyAccessor->getValue($v, $mappedByProperty)) {
+                        $ids[] = $propertyAccessor->getValue($relatedDoc, 'id');
+                    }
+                }
+
+                $aggregationBuilder->match()->field($identifier)->in($ids);
+
+                return;
+            }
+
+            if ($relatedDoc = $propertyAccessor->getValue($value, $mappedByProperty)) {
+                $aggregationBuilder->match()->field($identifier)->equals($propertyAccessor->getValue($relatedDoc, 'id'));
+            }
+
+            return;
+        }
+
         $method = $classMetadata->isCollectionValuedAssociation($property) ? 'includesReferenceTo' : 'references';
 
         if (is_iterable($value)) {