From 92ea2775e99cb4d72e12ccb272e61c805c597a96 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 4 Feb 2016 21:10:48 +0100 Subject: [PATCH] Unit test fixes --- Admin/Installer.php | 8 ++++---- Models/CalendarMapper.php | 10 +++++----- Models/Event.php | 2 +- Models/EventMapper.php | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index c9c7abd..ecc2f3d 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -48,16 +48,16 @@ class Installer extends InstallerAbstract `calendar_name` varchar(25) NOT NULL, `calendar_password` varchar(64) NOT NULL, `calendar_description` varchar(255) NOT NULL, - `task_created_by` int(11) NOT NULL, - `task_created_at` datetime NOT NULL, + `calendar_created_by` int(11) NOT NULL, + `calendar_created_at` datetime NOT NULL, PRIMARY KEY (`calendar_id`), - KEY `task_created_by` (`task_created_by`) + KEY `calendar_created_by` (`calendar_created_by`) )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )->execute(); $dbPool->get('core')->con->prepare( 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'calendar` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'calendar_ibfk_1` FOREIGN KEY (`task_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' + ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'calendar_ibfk_1` FOREIGN KEY (`calendar_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' )->execute(); $dbPool->get('core')->con->prepare( diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php index 6006280..1fc7b9f 100644 --- a/Models/CalendarMapper.php +++ b/Models/CalendarMapper.php @@ -32,13 +32,13 @@ class CalendarMapper extends DataMapperAbstract 'calendar_id' => ['name' => 'calendar_id', 'type' => 'int', 'internal' => 'id'], 'calendar_name' => ['name' => 'calendar_name', 'type' => 'string', 'internal' => 'name'], 'calendar_password' => ['name' => 'calendar_password', 'type' => 'string', 'internal' => 'password'], - 'calendar_description' => ['name' => 'calendar_description', 'type' => 'int', 'internal' => 'description'], + 'calendar_description' => ['name' => 'calendar_description', 'type' => 'string', 'internal' => 'description'], 'calendar_created_by' => ['name' => 'calendar_created_by', 'type' => 'int', 'internal' => 'createdBy'], 'calendar_created_at' => ['name' => 'calendar_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], ]; protected static $hasMany = [ - 'taskElements' => [ + 'events' => [ 'mapper' => '\Modules\Calendar\Models\EventMapper', 'relationmapper' => '\Modules\Calendar\Models\EventMapper', 'table' => 'calendar_event', @@ -98,7 +98,7 @@ class CalendarMapper extends DataMapperAbstract $this->db->con->prepare($query->toSql())->execute(); } catch (\Exception $e) { - var_dump($e->getMessage()); + var_dump($e); return false; } @@ -119,9 +119,9 @@ class CalendarMapper extends DataMapperAbstract public function find(...$columns) : Builder { return parent::find(...$columns)->from('account_permission') - ->where('account_permission.account_permission_for', '=', 'task') + ->where('account_permission.account_permission_for', '=', 'calendar') ->where('account_permission.account_permission_id1', '=', 1) - ->where('task.task_id', '=', new Column('account_permission.account_permission_id2')) + ->where('calendar.calendar_id', '=', new Column('account_permission.account_permission_id2')) ->where('account_permission.account_permission_r', '=', 1); } } diff --git a/Models/Event.php b/Models/Event.php index 3a5fc60..f876e80 100644 --- a/Models/Event.php +++ b/Models/Event.php @@ -39,7 +39,7 @@ class Event * @var int * @since 1.0.0 */ - private $id = null; + private $id = 0; /** * Name. diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 0d41fba..cc06b39 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -35,8 +35,8 @@ class EventMapper extends DataMapperAbstract 'calendar_event_location' => ['name' => 'calendar_event_location', 'type' => 'Serializable', 'internal' => 'location'], 'calendar_event_status' => ['name' => 'calendar_event_status', 'type' => 'int', 'internal' => 'status'], 'calendar_event_calendar' => ['name' => 'calendar_event_calendar', 'type' => 'int', 'internal' => 'calendar'], - 'calendar_event_created_by' => ['name' => 'task_created_by', 'type' => 'int', 'internal' => 'createdBy'], - 'calendar_event_created_at' => ['name' => 'task_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], + 'calendar_event_created_by' => ['name' => 'calendar_event_created_by', 'type' => 'int', 'internal' => 'createdBy'], + 'calendar_event_created_at' => ['name' => 'calendar_event_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], ]; /** @@ -86,7 +86,7 @@ class EventMapper extends DataMapperAbstract 'account_permission_p' ) ->into('account_permission') - ->values($obj->getCreatedBy(), 'task', 'task', 1, $objId, 1, 1, 1, 1, 1); + ->values($obj->getCreatedBy(), 'calendar_event', 'calendar_event', 1, $objId, 1, 1, 1, 1, 1); $this->db->con->prepare($query->toSql())->execute(); } catch (\Exception $e) { @@ -111,9 +111,9 @@ class EventMapper extends DataMapperAbstract public function find(...$columns) : Builder { return parent::find(...$columns)->from('account_permission') - ->where('account_permission.account_permission_for', '=', 'task') + ->where('account_permission.account_permission_for', '=', 'calendar_event') ->where('account_permission.account_permission_id1', '=', 1) - ->where('task.task_id', '=', new Column('account_permission.account_permission_id2')) + ->where('calendar_event.calendar_event_id', '=', new Column('account_permission.account_permission_id2')) ->where('account_permission.account_permission_r', '=', 1); } }