From 3dbd981f9743c8d1eb027dc24cc614890f3e12d5 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.de>
Date: Wed, 30 Jun 2021 23:46:59 +0200
Subject: [PATCH] [TASK] Improve ApiUtility mapping handling

---
 Classes/Utility/ApiUtility.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Classes/Utility/ApiUtility.php b/Classes/Utility/ApiUtility.php
index a448854..9bac2b3 100644
--- a/Classes/Utility/ApiUtility.php
+++ b/Classes/Utility/ApiUtility.php
@@ -93,15 +93,18 @@ class ApiUtility
                 ) {
                     $rowResult[$attributeName] = $methodResult;
                 }
-                if (array_key_exists($rowClass, $mapping)
-                    && array_key_exists($attributeName, $mapping[$rowClass])
-                ) {
-                    $mappingFunction = $mapping[$rowClass][$attributeName];
-                    $rowResult[$attributeName] = $mappingFunction(
-                        $methodResult,
+            }
+            // ---
+            if (array_key_exists($rowClass, $mapping)) {
+                foreach ($mapping[$rowClass] as $attributeName => $function) {
+                    $rowResult[$attributeName] = $function(
+                        $rowResult[$attributeName],
                         $row
                     );
                 }
+            }
+            // ---
+            foreach ($propertieResults as $attributeName => $methodResult) {
                 if (gettype($methodResult) == 'object'
                     && get_class($methodResult) == 'DateTime'
                 ) {