From 7fcb4742c3565baba7ff88d0638ff75dc87bba89 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 19 Dec 2021 20:20:39 +0100 Subject: [PATCH] bug fixes / dbmapper fixes --- Models/ProjectAttribute.php | 8 ++--- Models/ProjectAttributeMapper.php | 16 +++++----- Models/ProjectAttributeType.php | 2 +- Models/ProjectAttributeTypeL11n.php | 4 +-- Models/ProjectAttributeTypeL11nMapper.php | 8 ++--- Models/ProjectAttributeTypeMapper.php | 30 +++++++++--------- Models/ProjectAttributeValueMapper.php | 20 ++++++------ Models/ProjectMapper.php | 38 +++++++++++------------ 8 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Models/ProjectAttribute.php b/Models/ProjectAttribute.php index 8a8b431..9de068c 100644 --- a/Models/ProjectAttribute.php +++ b/Models/ProjectAttribute.php @@ -87,10 +87,10 @@ class ProjectAttribute implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'item' => $this->item, - 'type' => $this->type, - 'value' => $this->value, + 'id' => $this->id, + 'project' => $this->project, + 'type' => $this->type, + 'value' => $this->value, ]; } diff --git a/Models/ProjectAttributeMapper.php b/Models/ProjectAttributeMapper.php index 7bce61f..ccf3036 100644 --- a/Models/ProjectAttributeMapper.php +++ b/Models/ProjectAttributeMapper.php @@ -33,10 +33,10 @@ final class ProjectAttributeMapper extends DataMapperFactory * @since 1.0.0 */ 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'], - 'projectmanagement_project_attr_value' => ['name' => 'projectmanagement_project_attr_value', 'type' => 'int', 'internal' => 'value'], + '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'], + 'projectmanagement_project_attr_value' => ['name' => 'projectmanagement_project_attr_value', 'type' => 'int', 'internal' => 'value'], ]; /** @@ -47,12 +47,12 @@ final class ProjectAttributeMapper extends DataMapperFactory */ public const OWNS_ONE = [ 'type' => [ - 'mapper' => ProjectAttributeTypeMapper::class, - 'external' => 'projectmanagement_project_attr_type', + 'mapper' => ProjectAttributeTypeMapper::class, + 'external' => 'projectmanagement_project_attr_type', ], 'value' => [ - 'mapper' => ProjectAttributeValueMapper::class, - 'external' => 'projectmanagement_project_attr_value', + 'mapper' => ProjectAttributeValueMapper::class, + 'external' => 'projectmanagement_project_attr_value', ], ]; diff --git a/Models/ProjectAttributeType.php b/Models/ProjectAttributeType.php index 7613e31..8b4b59a 100644 --- a/Models/ProjectAttributeType.php +++ b/Models/ProjectAttributeType.php @@ -105,7 +105,7 @@ class ProjectAttributeType implements \JsonSerializable, ArrayableInterface * Set l11n * * @param string|ProjectAttributeTypeL11n $l11n Tag article l11n - * @param string $lang Language + * @param string $lang Language * * @return void * diff --git a/Models/ProjectAttributeTypeL11n.php b/Models/ProjectAttributeTypeL11n.php index 74787bd..b737d56 100644 --- a/Models/ProjectAttributeTypeL11n.php +++ b/Models/ProjectAttributeTypeL11n.php @@ -63,8 +63,8 @@ class ProjectAttributeTypeL11n implements \JsonSerializable, ArrayableInterface * Constructor. * * @param int|ProjectAttributeType $type Attribute type - * @param string $title Localized title - * @param string $language Language + * @param string $title Localized title + * @param string $language Language * * @since 1.0.0 */ diff --git a/Models/ProjectAttributeTypeL11nMapper.php b/Models/ProjectAttributeTypeL11nMapper.php index b19c9f4..f6643ff 100644 --- a/Models/ProjectAttributeTypeL11nMapper.php +++ b/Models/ProjectAttributeTypeL11nMapper.php @@ -33,10 +33,10 @@ final class ProjectAttributeTypeL11nMapper extends DataMapperFactory * @since 1.0.0 */ 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'], - 'projectmanagement_project_attr_type_l11n_lang' => ['name' => 'projectmanagement_project_attr_type_l11n_lang', 'type' => 'string', 'internal' => 'language'], + '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'], + 'projectmanagement_project_attr_type_l11n_lang' => ['name' => 'projectmanagement_project_attr_type_l11n_lang', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/ProjectAttributeTypeMapper.php b/Models/ProjectAttributeTypeMapper.php index 2ad14e7..353ff8e 100644 --- a/Models/ProjectAttributeTypeMapper.php +++ b/Models/ProjectAttributeTypeMapper.php @@ -33,12 +33,12 @@ final class ProjectAttributeTypeMapper extends DataMapperFactory * @since 1.0.0 */ 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'], - 'projectmanagement_project_attr_type_custom' => ['name' => 'projectmanagement_project_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], - 'projectmanagement_project_attr_type_pattern' => ['name' => 'projectmanagement_project_attr_type_pattern', 'type' => 'string', 'internal' => 'validationPattern'], - 'projectmanagement_project_attr_type_required' => ['name' => 'projectmanagement_project_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'], + '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'], + 'projectmanagement_project_attr_type_custom' => ['name' => 'projectmanagement_project_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'], + 'projectmanagement_project_attr_type_pattern' => ['name' => 'projectmanagement_project_attr_type_pattern', 'type' => 'string', 'internal' => 'validationPattern'], + 'projectmanagement_project_attr_type_required' => ['name' => 'projectmanagement_project_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'], ]; /** @@ -49,17 +49,17 @@ final class ProjectAttributeTypeMapper extends DataMapperFactory */ public const HAS_MANY = [ 'l11n' => [ - 'mapper' => ProjectAttributeTypeL11nMapper::class, - 'table' => 'projectmanagement_project_attr_type_l11n', - 'self' => 'projectmanagement_project_attr_type_l11n_type', - 'column' => 'title', - 'external' => null, + 'mapper' => ProjectAttributeTypeL11nMapper::class, + 'table' => 'projectmanagement_project_attr_type_l11n', + 'self' => 'projectmanagement_project_attr_type_l11n_type', + 'column' => 'title', + 'external' => null, ], 'defaults' => [ - 'mapper' => ProjectAttributeValueMapper::class, - 'table' => 'projectmanagement_project_attr_default', - 'self' => 'projectmanagement_project_attr_default_type', - 'external' => 'projectmanagement_project_attr_default_value' + 'mapper' => ProjectAttributeValueMapper::class, + 'table' => 'projectmanagement_project_attr_default', + 'self' => 'projectmanagement_project_attr_default_type', + 'external' => 'projectmanagement_project_attr_default_value' ], ]; diff --git a/Models/ProjectAttributeValueMapper.php b/Models/ProjectAttributeValueMapper.php index dc41cdb..c5745c8 100644 --- a/Models/ProjectAttributeValueMapper.php +++ b/Models/ProjectAttributeValueMapper.php @@ -8,7 +8,7 @@ * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 - * @link https: //orange-management.org + * @link https://orange-management.org */ declare(strict_types=1); @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * * @package Modules\ProjectManagement\Models * @license OMS License 1.0 - * @link https: //orange-management.org + * @link https://orange-management.org * @since 1.0.0 */ final class ProjectAttributeValueMapper extends DataMapperFactory @@ -33,15 +33,15 @@ final class ProjectAttributeValueMapper extends DataMapperFactory * @since 1.0.0 */ 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'], - 'projectmanagement_project_attr_value_valueStr' => ['name' => 'projectmanagement_project_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'], - 'projectmanagement_project_attr_value_valueInt' => ['name' => 'projectmanagement_project_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'], - 'projectmanagement_project_attr_value_valueDec' => ['name' => 'projectmanagement_project_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'], + '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'], + 'projectmanagement_project_attr_value_valueStr' => ['name' => 'projectmanagement_project_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'], + 'projectmanagement_project_attr_value_valueInt' => ['name' => 'projectmanagement_project_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'], + 'projectmanagement_project_attr_value_valueDec' => ['name' => 'projectmanagement_project_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'], 'projectmanagement_project_attr_value_valueDat' => ['name' => 'projectmanagement_project_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'], - 'projectmanagement_project_attr_value_lang' => ['name' => 'projectmanagement_project_attr_value_lang', 'type' => 'string', 'internal' => 'language'], - 'projectmanagement_project_attr_value_country' => ['name' => 'projectmanagement_project_attr_value_country', 'type' => 'string', 'internal' => 'country'], + 'projectmanagement_project_attr_value_lang' => ['name' => 'projectmanagement_project_attr_value_lang', 'type' => 'string', 'internal' => 'language'], + 'projectmanagement_project_attr_value_country' => ['name' => 'projectmanagement_project_attr_value_country', 'type' => 'string', 'internal' => 'country'], ]; /** diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php index daffa6d..926146a 100755 --- a/Models/ProjectMapper.php +++ b/Models/ProjectMapper.php @@ -37,21 +37,21 @@ final class ProjectMapper extends DataMapperFactory * @since 1.0.0 */ 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'], - 'projectmanagement_project_description_raw' => ['name' => 'projectmanagement_project_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], - 'projectmanagement_project_calendar' => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'], - 'projectmanagement_project_budgetcosts' => ['name' => 'projectmanagement_project_budgetcosts', 'type' => 'Serializable', 'internal' => 'budgetCosts'], - 'projectmanagement_project_budgetearnings' => ['name' => 'projectmanagement_project_budgetearnings', 'type' => 'Serializable', 'internal' => 'budgetEarnings'], - 'projectmanagement_project_actualearnings' => ['name' => 'projectmanagement_project_actualearnings', 'type' => 'Serializable', 'internal' => 'actualEarnings'], - 'projectmanagement_project_actualcosts' => ['name' => 'projectmanagement_project_actualcosts', 'type' => 'Serializable', 'internal' => 'actualCosts'], - 'projectmanagement_project_start' => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'], - 'projectmanagement_project_end' => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'], - 'projectmanagement_project_endestimated' => ['name' => 'projectmanagement_project_endestimated', 'type' => 'DateTime', 'internal' => 'endEstimated'], - 'projectmanagement_project_progress' => ['name' => 'projectmanagement_project_progress', 'type' => 'int', 'internal' => 'progress'], - 'projectmanagement_project_progress_type' => ['name' => 'projectmanagement_project_progress_type', 'type' => 'int', 'internal' => 'progressType'], - 'projectmanagement_project_created_by' => ['name' => 'projectmanagement_project_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], + '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'], + 'projectmanagement_project_description_raw' => ['name' => 'projectmanagement_project_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], + 'projectmanagement_project_calendar' => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'], + 'projectmanagement_project_budgetcosts' => ['name' => 'projectmanagement_project_budgetcosts', 'type' => 'Serializable', 'internal' => 'budgetCosts'], + 'projectmanagement_project_budgetearnings' => ['name' => 'projectmanagement_project_budgetearnings', 'type' => 'Serializable', 'internal' => 'budgetEarnings'], + 'projectmanagement_project_actualearnings' => ['name' => 'projectmanagement_project_actualearnings', 'type' => 'Serializable', 'internal' => 'actualEarnings'], + 'projectmanagement_project_actualcosts' => ['name' => 'projectmanagement_project_actualcosts', 'type' => 'Serializable', 'internal' => 'actualCosts'], + 'projectmanagement_project_start' => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'], + 'projectmanagement_project_end' => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'], + 'projectmanagement_project_endestimated' => ['name' => 'projectmanagement_project_endestimated', 'type' => 'DateTime', 'internal' => 'endEstimated'], + 'projectmanagement_project_progress' => ['name' => 'projectmanagement_project_progress', 'type' => 'int', 'internal' => 'progress'], + 'projectmanagement_project_progress_type' => ['name' => 'projectmanagement_project_progress_type', 'type' => 'int', 'internal' => 'progressType'], + 'projectmanagement_project_created_by' => ['name' => 'projectmanagement_project_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'projectmanagement_project_created_at' => ['name' => 'projectmanagement_project_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; @@ -91,8 +91,8 @@ final class ProjectMapper extends DataMapperFactory */ public const OWNS_ONE = [ 'calendar' => [ - 'mapper' => CalendarMapper::class, - 'external' => 'projectmanagement_project_calendar', + 'mapper' => CalendarMapper::class, + 'external' => 'projectmanagement_project_calendar', ], ]; @@ -104,8 +104,8 @@ final class ProjectMapper extends DataMapperFactory */ public const BELONGS_TO = [ 'createdBy' => [ - 'mapper' => AccountMapper::class, - 'external' => 'projectmanagement_project_created_by', + 'mapper' => AccountMapper::class, + 'external' => 'projectmanagement_project_created_by', ], ];