test path fixes

Models/AccountMapper.php

@@ -37,7 +37,7 @@ final class AccountMapper extends DataMapperAbstract
      * @since 1.0.0
      */
     protected static array $columns = [
-        'account_id'           => ['name' => 'account_id',           'type' => 'int',      'internal' => 'id',    'autocomplete' => true],
+        'account_id'           => ['name' => 'account_id',           'type' => 'int',      'internal' => 'id'],
         'account_status'       => ['name' => 'account_status',       'type' => 'int',      'internal' => 'status'],
         'account_type'         => ['name' => 'account_type',         'type' => 'int',      'internal' => 'type'],
         'account_login'        => ['name' => 'account_login',        'type' => 'string',   'internal' => 'login', 'autocomplete' => true],

Models/GroupMapper.php

@@ -15,6 +15,7 @@ declare(strict_types=1);
 namespace Modules\Admin\Models;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\RelationType;
 
 /**
  * Group mapper class.
@@ -99,11 +100,12 @@ final class GroupMapper extends DataMapperAbstract
      */
     public static function getPermissionForModule(string $module) : array
     {
+        $depth = 3;
         $query = self::getQuery();
         $query->innerJoin(GroupPermissionMapper::getTable())
-            ->on(self::$table . '.group_id', '=', GroupPermissionMapper::getTable() . '.group_permission_group')
+            ->on(self::$table . '_' . $depth . '.group_id', '=', GroupPermissionMapper::getTable() . '.group_permission_group')
             ->where(GroupPermissionMapper::getTable() . '.group_permission_module', '=', $module);
 
-        return self::getAllByQuery($query);
+        return self::getAllByQuery($query, RelationType::ALL, $depth);
     }
 }

tests/Controller/ApiControllerTest.php

@@ -14,17 +14,15 @@ declare(strict_types=1);
 
 namespace Modules\Admin\tests\Controller;
 
-require_once __DIR__ . '/../../tests/../Autoloader.php';
-
 use Model\CoreSettings;
 
 use Modules\Admin\Models\AccountPermission;
 
-use Modules\tests\Admin\Controller\Api\ApiControllerAccountTrait;
-use Modules\tests\Admin\Controller\Api\ApiControllerGroupTrait;
-use Modules\tests\Admin\Controller\Api\ApiControllerModuleTrait;
-use Modules\tests\Admin\Controller\Api\ApiControllerPermissionTrait;
-use Modules\tests\Admin\Controller\Api\ApiControllerSettingsTrait;
+use Modules\Admin\tests\Controller\Api\ApiControllerAccountTrait;
+use Modules\Admin\tests\Controller\Api\ApiControllerGroupTrait;
+use Modules\Admin\tests\Controller\Api\ApiControllerModuleTrait;
+use Modules\Admin\tests\Controller\Api\ApiControllerPermissionTrait;
+use Modules\Admin\tests\Controller\Api\ApiControllerSettingsTrait;
 
 use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
@@ -38,7 +36,7 @@ use phpOMS\Router\WebRouter;
 use phpOMS\Utils\TestUtils;
 
 /**
- * @testdox Modules\tests\Admin\Controller\ApiControllerTest: Admin api controller
+ * @testdox Modules\Admin\tests\Controller\ApiControllerTest: Admin api controller
  *
  * @internal
  */

tests/Models/AccountMapperTest.php

@@ -21,7 +21,7 @@ use phpOMS\Account\AccountType;
 use phpOMS\Auth\LoginReturnType;
 
 /**
- * @testdox Modules\tests\Admin\Models\LocalizationMapperTest: Account database mapper
+ * @testdox Modules\Admin\tests\Models\LocalizationMapperTest: Account database mapper
  *
  * @internal
  */

tests/Models/AccountPermissionTest.php

@@ -17,7 +17,7 @@ namespace Modules\Admin\tests\Models;
 use Modules\Admin\Models\AccountPermission;
 
 /**
- * @testdox Modules\tests\Admin\Models\AccountPermissionTest: Account permission
+ * @testdox Modules\Admin\tests\Models\AccountPermissionTest: Account permission
  *
  * @internal
  */

tests/Models/AccountTest.php

@@ -17,7 +17,7 @@ namespace Modules\Admin\tests\Models;
 use Modules\Admin\Models\Account;
 
 /**
- * @testdox Modules\tests\Admin\Models\AccountTest: Account model
+ * @testdox Modules\Admin\tests\Models\AccountTest: Account model
  *
  * @internal
  */

tests/Models/GroupMapperTest.php

@@ -20,7 +20,7 @@ use Modules\Admin\Models\GroupPermission;
 use Modules\Admin\Models\GroupPermissionMapper;
 
 /**
- * @testdox Modules\tests\Admin\Models\GroupMapperTest: Group mapper
+ * @testdox Modules\Admin\tests\Models\GroupMapperTest: Group mapper
  *
  * @internal
  */

tests/Models/GroupPermissionTest.php

@@ -17,7 +17,7 @@ namespace Modules\Admin\tests\Models;
 use Modules\Admin\Models\GroupPermission;
 
 /**
- * @testdox Modules\tests\Admin\Models\GroupPermissionTest: Group permission
+ * @testdox Modules\Admin\tests\Models\GroupPermissionTest: Group permission
  *
  * @internal
  */

tests/Models/GroupTest.php

@@ -18,7 +18,7 @@ use Modules\Admin\Models\Group;
 use Modules\Admin\Models\NullAccount;
 
 /**
- * @testdox Modules\tests\Admin\Models\GroupTest: Group model
+ * @testdox Modules\Admin\tests\Models\GroupTest: Group model
  *
  * @internal
  */

tests/Models/LocalizationMapperTest.php

@@ -18,7 +18,7 @@ use Modules\Admin\Models\LocalizationMapper;
 use phpOMS\Localization\Localization;
 
 /**
- * @testdox Modules\tests\Admin\Models\LocalizationMapperTest: Localization database mapper
+ * @testdox Modules\Admin\tests\Models\LocalizationMapperTest: Localization database mapper
  *
  * @internal
  */

tests/Models/ModuleTest.php

@@ -18,7 +18,7 @@ use Modules\Admin\Models\Module;
 use phpOMS\Module\ModuleStatus;
 
 /**
- * @testdox Modules\tests\Admin\Models\ModuleTest: Module container
+ * @testdox Modules\Admin\tests\Models\ModuleTest: Module container
  *
  * @internal
  */