Implemented requested changes

owlchester · Nov 23, 2023 · 2db8b09 · 2db8b09
1 parent c35d175
commit 2db8b09
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/app/Http/Resources/EntityResource.php b/app/Http/Resources/EntityResource.php
@@ -202,21 +202,23 @@ public function entity(array $prepared = [])
             $merged['inventory'] = InventoryResource::collection($misc->entity->inventories);
             $merged['entity_abilities'] = EntityAbilityResource::collection($misc->entity->abilities);
             $merged['entity_assets'] = EntityAssetResource::collection($misc->entity->assets);
-        }
-        if ($misc->ancestors) {
-            $ancestors = [];
-            foreach ($misc->getAncestors(['id']) as $ancestor) {
-                $ancestors[] = $ancestor->id;
+
+            if ($misc->ancestors) {
+                $ancestors = [];
+                foreach ($misc->getAncestors(['id']) as $ancestor) {
+                    $ancestors[] = $ancestor->id;
+                }
+                $merged['parents'] = $ancestors;
             }
-            $merged['parents'] = $ancestors;
-        }
-        if ($misc->children) {
-            $descendants = [];
-            foreach ($misc->children as $descendant) {
-                $descendants[] = $descendant->id;
+            if ($misc->children) {
+                $descendants = [];
+                foreach ($misc->children as $descendant) {
+                    $descendants[] = $descendant->id;
+                }
+                $merged['children'] = $descendants;
             }
-            $merged['children'] = $descendants;
         }
+
         $final = array_merge($merged, $prepared);
         //ksort($final);
         return $final;