Merge pull request #1567 from ConductionNL/fix/XRZ-1/max-depth

Do not check max depth if value is of type json
ConductionNL · Oct 12, 2023 · 62b4d98 · 62b4d98
2 parents 66a294d + 367c102
commit 62b4d98
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/api/src/Entity/ObjectEntity.php b/api/src/Entity/ObjectEntity.php
@@ -1213,7 +1213,21 @@ public function toArray(array $configuration = []): array
                         // If we don't set the full object then we want to set self
                         else {
                             // $array[$attribute->getName()] = $object->getSelf() ?? ('/api' . ($object->getEntity()->getRoute() ?? $object->getEntity()->getName()) . '/' . $object->getId());
-                            $array[$attribute->getName()] = $object->getSelf();
+                            switch ($attribute->getFormat()) {
+                                case 'uuid':
+                                    $array[$attribute->getName()] = $object->getId()->toString();
+                                    break;
+                                case 'url':
+                                    $array[$attribute->getName()] = $object->getUri();
+                                    break;
+                                case 'json':
+                                    $array[$attribute->getName()] = $objectToArray;
+                                    break;
+                                case 'iri':
+                                default:
+                                    $array[$attribute->getName()] = $object->getSelf();
+                                    break;
+                            }
                         }
                     }
                 } elseif (count($valueObject->getObjects()) === 0) {
@@ -1261,8 +1275,22 @@ public function toArray(array $configuration = []): array
                         }
                         // If we don't set the full object then we want to set self
                         else {
-                            // $array[$attribute->getName()][] = $object->getSelf() ?? ('/api' . ($object->getEntity()->getRoute() ?? $object->getEntity()->getName()) . '/' . $object->getId());
-                            $array[$attribute->getName()][] = $object->getSelf();
+                            switch ($attribute->getFormat()) {
+                                case 'uuid':
+                                    $array[$attribute->getName()][] = $object->getId()->toString();
+                                    break;
+                                case 'url':
+                                case 'uri':
+                                    $array[$attribute->getName()][] = $object->getUri();
+                                    break;
+                                case 'json':
+                                    $array[$attribute->getName()][] = $objectToArray;
+                                    break;
+                                case 'iri':
+                                default:
+                                    $array[$attribute->getName()][] = $object->getSelf();
+                                    break;
+                            }
                         }
                     }
                 }