fix(metadata): enhance resource class determination before Object Mapper Processor return

Author: Spomky

src/Metadata/Resource/Factory/ObjectMapperMetadataCollectionFactory.php

@@ -52,11 +52,14 @@ public function create(string $resourceClass): ResourceMetadataCollection
                     $entityClass = $options->getDocumentClass();
                 }
 
-                $class = $operation->getInput()['class'] ?? $operation->getClass();
+                $inputClass = $operation->getInput()['class'] ?? $operation->getClass();
+                $outputClass = $operation->getOutput()['class'] ?? null;
                 $entityMap = null;
 
                 // Look for Mapping metadata
-                if ($this->canBeMapped($class) || ($entityClass && ($entityMap = $this->canBeMapped($entityClass)))) {
+                if ($this->canBeMapped($inputClass)
+                    || ($outputClass && $this->canBeMapped($outputClass))
+                    || ($entityClass && ($entityMap = $this->canBeMapped($entityClass)))) {
                     $found = true;
                     if ($entityMap) {
                         foreach ($entityMap as $mapping) {

src/State/Processor/ObjectMapperProcessor.php

@@ -34,35 +34,43 @@ public function __construct(
 
     public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
-        $class = $operation->getInput()['class'] ?? $operation->getClass();
-
         if (
             $data instanceof Response
             || !$this->objectMapper
             || !$operation->canWrite()
             || null === $data
-            || !is_a($data, $class, true)
             || !$operation->canMap()
         ) {
             return $this->decorated->process($data, $operation, $uriVariables, $context);
         }
 
         $request = $context['request'] ?? null;
-        $persisted = $this->decorated->process(
-            // maps the Resource to an Entity
-            $this->objectMapper->map($data, $request?->attributes->get('mapped_data')),
-            $operation,
-            $uriVariables,
-            $context,
-        );
+        $resourceClass = $operation->getClass();
+        $inputClass = $operation->getInput()['class'] ?? null;
+        $outputClass = $operation->getOutput()['class'] ?? null;
+
+        $hasCustomInput = null !== $inputClass && $inputClass !== $resourceClass;
+        $hasCustomOutput = null !== $outputClass && $outputClass !== $resourceClass;
+
+        if (!$hasCustomInput && !$hasCustomOutput) {
+            return $this->decorated->process($data, $operation, $uriVariables, $context);
+        }
 
+        if ($hasCustomInput) {
+            if (!is_a($data, $inputClass, true)) {
+                return $this->decorated->process($data, $operation, $uriVariables, $context);
+            }
+
+            $data = $this->objectMapper->map($data, $request?->attributes->get('mapped_data'));
+        }
+
+        $persisted = $this->decorated->process($data, $operation, $uriVariables, $context);
         $request?->attributes->set('persisted_data', $persisted);
 
-        // return the Resource representation of the persisted entity
-        return $this->objectMapper->map(
-            // persist the entity
-            $persisted,
-            $operation->getClass()
-        );
+        if ($hasCustomOutput) {
+            return $this->objectMapper->map($persisted, $outputClass);
+        }
+
+        return $persisted;
     }
 }