From cb624c19ebdf2bd0e51f2fd63a14a9c9a5176cc9 Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Wed, 22 May 2019 15:47:10 +0200
Subject: [PATCH] Added second class to debug 1:n relation, which is working in
 general

---
 src/admin/common/abstract/model.php      |  8 +++++--
 src/admin/common/models/factory/club.php |  2 +-
 src/admin/common/models/factory/user.php | 27 ++++++++++++++++++++++++
 src/admin/common/models/user.php         | 19 +++++++++++++++++
 src/admin/views/test/tmpl/default.php    |  2 +-
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/admin/common/models/factory/user.php
 create mode 100644 src/admin/common/models/user.php

diff --git a/src/admin/common/abstract/model.php b/src/admin/common/abstract/model.php
index e3c4ce8..9a1561f 100644
--- a/src/admin/common/abstract/model.php
+++ b/src/admin/common/abstract/model.php
@@ -141,10 +141,14 @@ abstract class AbstractCommonClubsModel
     
     private function loadExternalReferenceAsObject($className, $value)
     {
+        if(is_string($value) && preg_match('/^[0-9]+$/', $value))
+            $value = (int) $value;
+        
         if(! is_int($value))
             throw new Exception('Reference with non-integer value');
         
-        $factory = $this->getFactoryOfClass($className);
+        $factoryName = $this->getFactoryNameOfClass($className);
+        $factory = new $factoryName();
         return $factory->loadById($value);
     }
     
@@ -157,7 +161,7 @@ abstract class AbstractCommonClubsModel
      * @param string $className
      * @return AbstractCommonClubsModelFactory
      */
-    private function getFactoryOfClass($className)
+    private function getFactoryNameOfClass($className)
     {
         if(empty(self::CLASSNAME_MAP[$className]))
         {
diff --git a/src/admin/common/models/factory/club.php b/src/admin/common/models/factory/club.php
index 9df0d93..e10dd2c 100644
--- a/src/admin/common/models/factory/club.php
+++ b/src/admin/common/models/factory/club.php
@@ -16,7 +16,7 @@ class CommonClubsModelFactoryClub extends AbstractCommonClubsModelFactory
             'iban'=>array(),
             'bic'=>array(),
             'charitable'=>array('type'=>'int'),
-            'president'=>array('type'=>'int', 'ref'=>'CommonClubsModelUser')
+            'president'=>array('type'=>'ref', 'ref'=>'CommonClubsModelUser')
         );
     }
 
diff --git a/src/admin/common/models/factory/user.php b/src/admin/common/models/factory/user.php
new file mode 100644
index 0000000..7104187
--- /dev/null
+++ b/src/admin/common/models/factory/user.php
@@ -0,0 +1,27 @@
+<?php
+
+// No direct access.
+defined('_JEXEC') or die;
+
+class CommonClubsModelFactoryUser extends AbstractCommonClubsModelFactory
+{
+    public function getAttributes()
+    {
+        return array(
+            'user'=>array(),
+            'name'=>array()
+        );
+    }
+
+    public function getTableName()
+    {
+        return '#__club_users';
+    }
+
+    public function getClassName()
+    {
+        return 'CommonClubsModelUser';
+    }
+
+    
+}
\ No newline at end of file
diff --git a/src/admin/common/models/user.php b/src/admin/common/models/user.php
new file mode 100644
index 0000000..ce8c821
--- /dev/null
+++ b/src/admin/common/models/user.php
@@ -0,0 +1,19 @@
+<?php
+
+// No direct access.
+defined('_JEXEC') or die;
+
+class CommonClubsModelUser extends AbstractCommonClubsModel
+{
+    protected function getFactory()
+    {
+        return new CommonClubsModelFactoryUser();
+    }
+    
+    public function getName()
+    {
+        return $this->getValues()['name'];
+    }
+
+    
+}
\ No newline at end of file
diff --git a/src/admin/views/test/tmpl/default.php b/src/admin/views/test/tmpl/default.php
index 9c82d19..008dd17 100644
--- a/src/admin/views/test/tmpl/default.php
+++ b/src/admin/views/test/tmpl/default.php
@@ -13,4 +13,4 @@ ClubName: <?php echo $this->club->getMail(); ?> <br />
 ClubName: <?php echo $this->club->getIban(); ?> <br />
 ClubName: <?php echo $this->club->getBic(); ?> <br />
 ClubName: <?php echo $this->club->isCharitable(); ?> <br />
-ClubName: <?php echo $this->club->getPresident(); ?> <br />
+ClubName: <?php echo $this->club->getPresident()->getName(); ?> <br />