From 15b0f1cba74b2ec27937efa046ad212a1fcff233 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 11 Dec 2021 11:54:17 +0100 Subject: [PATCH] new datamapper mostly implemented --- Controller/BackendController.php | 5 +++-- Models/ProjectAttributeMapper.php | 12 ++++++------ Models/ProjectAttributeTypeL11nMapper.php | 10 +++++----- Models/ProjectAttributeTypeMapper.php | 16 +++++++--------- Models/ProjectAttributeValueMapper.php | 10 +++++----- Models/ProjectMapper.php | 18 +++++++++--------- tests/Bootstrap.php | 4 ++-- tests/Models/ProjectMapperTest.php | 7 ++++--- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3c2cce5..9f7765e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -17,6 +17,7 @@ namespace Modules\ProjectManagement\Controller; use Modules\ProjectManagement\Models\ProjectMapper; use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; +use phpOMS\DataStorage\Database\Query\OrderType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -50,7 +51,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); - $projects = ProjectMapper::getNewest(25); + $projects = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(25); $view->addData('projects', $projects); return $view; @@ -111,7 +112,7 @@ final class BackendController extends Controller $mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list'); $view->addData('medialist', $mediaListView); - $project = ProjectMapper::get((int) $request->getData('id')); + $project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute(); $view->addData('project', $project); return $view; diff --git a/Models/ProjectAttributeMapper.php b/Models/ProjectAttributeMapper.php index 23b57df..7bce61f 100644 --- a/Models/ProjectAttributeMapper.php +++ b/Models/ProjectAttributeMapper.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\ProjectManagement\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Project mapper class. @@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract; * @link https://orange-management.org * @since 1.0.0 */ -final class ProjectAttributeMapper extends DataMapperAbstract +final class ProjectAttributeMapper extends DataMapperFactory { /** * Columns. @@ -32,7 +32,7 @@ final class ProjectAttributeMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $columns = [ + public const COLUMNS = [ 'projectmanagement_project_attr_id' => ['name' => 'projectmanagement_project_attr_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_attr_project' => ['name' => 'projectmanagement_project_attr_project', 'type' => 'int', 'internal' => 'project'], 'projectmanagement_project_attr_type' => ['name' => 'projectmanagement_project_attr_type', 'type' => 'int', 'internal' => 'type'], @@ -45,7 +45,7 @@ final class ProjectAttributeMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $ownsOne = [ + public const OWNS_ONE = [ 'type' => [ 'mapper' => ProjectAttributeTypeMapper::class, 'external' => 'projectmanagement_project_attr_type', @@ -62,7 +62,7 @@ final class ProjectAttributeMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $table = 'projectmanagement_project_attr'; + public const TABLE = 'projectmanagement_project_attr'; /** * Primary field name. @@ -70,5 +70,5 @@ final class ProjectAttributeMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $primaryField = 'projectmanagement_project_attr_id'; + public const PRIMARYFIELD ='projectmanagement_project_attr_id'; } diff --git a/Models/ProjectAttributeTypeL11nMapper.php b/Models/ProjectAttributeTypeL11nMapper.php index 39aba30..b19c9f4 100644 --- a/Models/ProjectAttributeTypeL11nMapper.php +++ b/Models/ProjectAttributeTypeL11nMapper.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\ProjectManagement\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Project mapper class. @@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract; * @link https://orange-management.org * @since 1.0.0 */ -final class ProjectAttributeTypeL11nMapper extends DataMapperAbstract +final class ProjectAttributeTypeL11nMapper extends DataMapperFactory { /** * Columns. @@ -32,7 +32,7 @@ final class ProjectAttributeTypeL11nMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $columns = [ + public const COLUMNS = [ 'projectmanagement_project_attr_type_l11n_id' => ['name' => 'projectmanagement_project_attr_type_l11n_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_attr_type_l11n_title' => ['name' => 'projectmanagement_project_attr_type_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], 'projectmanagement_project_attr_type_l11n_type' => ['name' => 'projectmanagement_project_attr_type_l11n_type', 'type' => 'int', 'internal' => 'type'], @@ -45,7 +45,7 @@ final class ProjectAttributeTypeL11nMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $table = 'projectmanagement_project_attr_type_l11n'; + public const TABLE = 'projectmanagement_project_attr_type_l11n'; /** * Primary field name. @@ -53,5 +53,5 @@ final class ProjectAttributeTypeL11nMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $primaryField = 'projectmanagement_project_attr_type_l11n_id'; + public const PRIMARYFIELD ='projectmanagement_project_attr_type_l11n_id'; } diff --git a/Models/ProjectAttributeTypeMapper.php b/Models/ProjectAttributeTypeMapper.php index 8ce2688..2ad14e7 100644 --- a/Models/ProjectAttributeTypeMapper.php +++ b/Models/ProjectAttributeTypeMapper.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\ProjectManagement\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Project mapper class. @@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract; * @link https://orange-management.org * @since 1.0.0 */ -final class ProjectAttributeTypeMapper extends DataMapperAbstract +final class ProjectAttributeTypeMapper extends DataMapperFactory { /** * Columns. @@ -32,7 +32,7 @@ final class ProjectAttributeTypeMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $columns = [ + public const COLUMNS = [ 'projectmanagement_project_attr_type_id' => ['name' => 'projectmanagement_project_attr_type_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_attr_type_name' => ['name' => 'projectmanagement_project_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], 'projectmanagement_project_attr_type_fields' => ['name' => 'projectmanagement_project_attr_type_fields', 'type' => 'int', 'internal' => 'fields'], @@ -47,21 +47,19 @@ final class ProjectAttributeTypeMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $hasMany = [ + public const HAS_MANY = [ 'l11n' => [ 'mapper' => ProjectAttributeTypeL11nMapper::class, 'table' => 'projectmanagement_project_attr_type_l11n', 'self' => 'projectmanagement_project_attr_type_l11n_type', 'column' => 'title', - 'conditional' => true, 'external' => null, ], 'defaults' => [ 'mapper' => ProjectAttributeValueMapper::class, 'table' => 'projectmanagement_project_attr_default', 'self' => 'projectmanagement_project_attr_default_type', - 'external' => 'projectmanagement_project_attr_default_value', - 'conditional' => false, + 'external' => 'projectmanagement_project_attr_default_value' ], ]; @@ -71,7 +69,7 @@ final class ProjectAttributeTypeMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $table = 'projectmanagement_project_attr_type'; + public const TABLE = 'projectmanagement_project_attr_type'; /** * Primary field name. @@ -79,5 +77,5 @@ final class ProjectAttributeTypeMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $primaryField = 'projectmanagement_project_attr_type_id'; + public const PRIMARYFIELD ='projectmanagement_project_attr_type_id'; } diff --git a/Models/ProjectAttributeValueMapper.php b/Models/ProjectAttributeValueMapper.php index c23669a..dc41cdb 100644 --- a/Models/ProjectAttributeValueMapper.php +++ b/Models/ProjectAttributeValueMapper.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\ProjectManagement\Models; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Project mapper class. @@ -24,7 +24,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract; * @link https: //orange-management.org * @since 1.0.0 */ -final class ProjectAttributeValueMapper extends DataMapperAbstract +final class ProjectAttributeValueMapper extends DataMapperFactory { /** * Columns. @@ -32,7 +32,7 @@ final class ProjectAttributeValueMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $columns = [ + public const COLUMNS = [ 'projectmanagement_project_attr_value_id' => ['name' => 'projectmanagement_project_attr_value_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_attr_value_default' => ['name' => 'projectmanagement_project_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'], 'projectmanagement_project_attr_value_type' => ['name' => 'projectmanagement_project_attr_value_type', 'type' => 'int', 'internal' => 'type'], @@ -50,7 +50,7 @@ final class ProjectAttributeValueMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $table = 'projectmanagement_project_attr_value'; + public const TABLE = 'projectmanagement_project_attr_value'; /** * Primary field name. @@ -58,5 +58,5 @@ final class ProjectAttributeValueMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $primaryField = 'projectmanagement_project_attr_value_id'; + public const PRIMARYFIELD ='projectmanagement_project_attr_value_id'; } diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php index c2b6879..daffa6d 100755 --- a/Models/ProjectMapper.php +++ b/Models/ProjectMapper.php @@ -18,7 +18,7 @@ use Modules\Admin\Models\AccountMapper; use Modules\Calendar\Models\CalendarMapper; use Modules\Media\Models\MediaMapper; use Modules\Tasks\Models\TaskMapper; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Mapper class. @@ -28,7 +28,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract; * @link https://orange-management.org * @since 1.0.0 */ -final class ProjectMapper extends DataMapperAbstract +final class ProjectMapper extends DataMapperFactory { /** * Columns. @@ -36,7 +36,7 @@ final class ProjectMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $columns = [ + public const COLUMNS = [ 'projectmanagement_project_id' => ['name' => 'projectmanagement_project_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_name' => ['name' => 'projectmanagement_project_name', 'type' => 'string', 'internal' => 'name'], 'projectmanagement_project_description' => ['name' => 'projectmanagement_project_description', 'type' => 'string', 'internal' => 'description'], @@ -61,7 +61,7 @@ final class ProjectMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $hasMany = [ + public const HAS_MANY = [ 'tasks' => [ 'mapper' => TaskMapper::class, 'table' => 'projectmanagement_task_relation', @@ -89,7 +89,7 @@ final class ProjectMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $ownsOne = [ + public const OWNS_ONE = [ 'calendar' => [ 'mapper' => CalendarMapper::class, 'external' => 'projectmanagement_project_calendar', @@ -102,7 +102,7 @@ final class ProjectMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static array $belongsTo = [ + public const BELONGS_TO = [ 'createdBy' => [ 'mapper' => AccountMapper::class, 'external' => 'projectmanagement_project_created_by', @@ -115,7 +115,7 @@ final class ProjectMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $table = 'projectmanagement_project'; + public const TABLE = 'projectmanagement_project'; /** * Created at. @@ -123,7 +123,7 @@ final class ProjectMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $createdAt = 'projectmanagement_project_created_at'; + public const CREATED_AT = 'projectmanagement_project_created_at'; /** * Primary field name. @@ -131,5 +131,5 @@ final class ProjectMapper extends DataMapperAbstract * @var string * @since 1.0.0 */ - protected static string $primaryField = 'projectmanagement_project_id'; + public const PRIMARYFIELD ='projectmanagement_project_id'; } diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index f5fc99c..252a62f 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -12,7 +12,7 @@ require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/Autoloader.php'; use phpOMS\DataStorage\Database\DatabasePool; -use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Session\HttpSession; $CONFIG = [ @@ -329,7 +329,7 @@ $GLOBALS['dbpool']->create('delete', $CONFIG['db']['core']['masters']['delete']) $GLOBALS['dbpool']->create('insert', $CONFIG['db']['core']['masters']['insert']); $GLOBALS['dbpool']->create('schema', $CONFIG['db']['core']['masters']['schema']); -DataMapperAbstract::setConnection($GLOBALS['dbpool']->get()); +DataMapperFactory::db($GLOBALS['dbpool']->get()); $GLOBALS['frameworkpath'] = '/phpOMS/'; diff --git a/tests/Models/ProjectMapperTest.php b/tests/Models/ProjectMapperTest.php index a960bc7..0dd0a6c 100755 --- a/tests/Models/ProjectMapperTest.php +++ b/tests/Models/ProjectMapperTest.php @@ -20,6 +20,7 @@ use Modules\ProjectManagement\Models\ProgressType; use Modules\ProjectManagement\Models\Project; use Modules\ProjectManagement\Models\ProjectMapper; use Modules\Tasks\Models\Task; +use phpOMS\DataStorage\Database\Query\OrderType; use phpOMS\Localization\Money; /** @@ -72,11 +73,11 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase $media->name = 'Project Media'; $project->addMedia($media); - $id = ProjectMapper::create($project); + $id = ProjectMapper::create()->execute($project); self::assertGreaterThan(0, $project->getId()); self::assertEquals($id, $project->getId()); - $projectR = ProjectMapper::get($project->getId()); + $projectR = ProjectMapper::get()->with('media')->where('id', $project->getId())->execute(); self::assertEquals($project->getName(), $projectR->getName()); self::assertEquals($project->description, $projectR->description); @@ -102,7 +103,7 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase */ public function testNewest() : void { - $newest = ProjectMapper::getNewest(1); + $newest = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->execute(); self::assertCount(1, $newest); }