Fixed data object loading for different variations (#481)

Author: mcop1

src/Tool/DataObjectLoader.php

@@ -74,18 +74,14 @@ public function loadByAttribute(string $className,
         }
 
         if ($this->isObjectBrickAttribute($attributeName) === false && $operator === '=' && $identifier !== '') {
-            $getter = 'getBy' . $attributeName;
-            if (empty($attributeLanguage) === false) {
-                $element = $className::$getter($identifier, $attributeLanguage, $limit, 0, $objectTypes);
-            } else {
-                if (method_exists($className, $getter)) {
-                    $element = $className::$getter($identifier);
-                }
-
-                if (!$element) {
-                    $element = $className::$getter($identifier, $limit, 0, $objectTypes);
-                }
-            }
+           $element = $this->getDataObject(
+                $attributeName,
+                $className,
+                $identifier,
+                $attributeLanguage,
+                $limit,
+                $objectTypes
+            );
         } else {
             $queryFieldName = $attributeName;
             if ($this->isObjectBrickAttribute($attributeName) === true) {
@@ -132,4 +128,25 @@ public function loadByPath(string $identifier,
     {
         return $className::getByPath($identifier);
     }
+
+    private function getDataObject(
+        string $attributeName,
+        string $className,
+        string $identifier,
+        string $attributeLanguage,
+        int $limit,
+        array $objectTypes
+    ): ?ElementInterface {
+        $getter = 'getBy' . $attributeName;
+
+        if (empty($attributeLanguage) === false) {
+            return $className::$getter($identifier, $attributeLanguage, $limit, 0, $objectTypes);
+        }
+
+        if(method_exists($className, $getter)) {
+            return $className::$getter($identifier);
+        }
+
+        return $className::$getter($identifier, $limit, 0, $objectTypes);
+    }
 }