Jingga/oms-Calendar
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Calendar.git synced 2026-02-16 08:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unit test fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-02-04 21:10:48 +01:00
parent cf51115707
commit 92ea2775e9
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin/Installer.php
View File

@ -48,16 +48,16 @@ class Installer extends InstallerAbstract
`calendar_name` varchar(25) NOT NULL, `calendar_name` varchar(25) NOT NULL,
`calendar_password` varchar(64) NOT NULL, `calendar_password` varchar(64) NOT NULL,
`calendar_description` varchar(255) NOT NULL, `calendar_description` varchar(255) NOT NULL,
`task_created_by` int(11) NOT NULL, `calendar_created_by` int(11) NOT NULL,
`task_created_at` datetime NOT NULL, `calendar_created_at` datetime NOT NULL,
PRIMARY KEY (`calendar_id`), 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;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get('core')->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'calendar` '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(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get('core')->con->prepare(

10
Models/CalendarMapper.php
View File

@ -32,13 +32,13 @@ class CalendarMapper extends DataMapperAbstract
'calendar_id' => ['name' => 'calendar_id', 'type' => 'int', 'internal' => 'id'], 'calendar_id' => ['name' => 'calendar_id', 'type' => 'int', 'internal' => 'id'],
'calendar_name' => ['name' => 'calendar_name', 'type' => 'string', 'internal' => 'name'], 'calendar_name' => ['name' => 'calendar_name', 'type' => 'string', 'internal' => 'name'],
'calendar_password' => ['name' => 'calendar_password', 'type' => 'string', 'internal' => 'password'], '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_by' => ['name' => 'calendar_created_by', 'type' => 'int', 'internal' => 'createdBy'],
'calendar_created_at' => ['name' => 'calendar_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], 'calendar_created_at' => ['name' => 'calendar_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
]; ];
protected static $hasMany = [ protected static $hasMany = [
'taskElements' => [ 'events' => [
'mapper' => '\Modules\Calendar\Models\EventMapper', 'mapper' => '\Modules\Calendar\Models\EventMapper',
'relationmapper' => '\Modules\Calendar\Models\EventMapper', 'relationmapper' => '\Modules\Calendar\Models\EventMapper',
'table' => 'calendar_event', 'table' => 'calendar_event',
@ -98,7 +98,7 @@ class CalendarMapper extends DataMapperAbstract
$this->db->con->prepare($query->toSql())->execute(); $this->db->con->prepare($query->toSql())->execute();
} catch (\Exception $e) { } catch (\Exception $e) {
var_dump($e->getMessage()); var_dump($e);
return false; return false;
} }
@ -119,9 +119,9 @@ class CalendarMapper extends DataMapperAbstract
public function find(...$columns) : Builder public function find(...$columns) : Builder
{ {
return parent::find(...$columns)->from('account_permission') 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('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); ->where('account_permission.account_permission_r', '=', 1);
} }
} }

2
Models/Event.php
View File

@ -39,7 +39,7 @@ class Event
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private $id = null; private $id = 0;
/** /**
* Name. * Name.

10
Models/EventMapper.php
View File

@ -35,8 +35,8 @@ class EventMapper extends DataMapperAbstract
'calendar_event_location' => ['name' => 'calendar_event_location', 'type' => 'Serializable', 'internal' => 'location'], 'calendar_event_location' => ['name' => 'calendar_event_location', 'type' => 'Serializable', 'internal' => 'location'],
'calendar_event_status' => ['name' => 'calendar_event_status', 'type' => 'int', 'internal' => 'status'], 'calendar_event_status' => ['name' => 'calendar_event_status', 'type' => 'int', 'internal' => 'status'],
'calendar_event_calendar' => ['name' => 'calendar_event_calendar', 'type' => 'int', 'internal' => 'calendar'], '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_by' => ['name' => 'calendar_event_created_by', 'type' => 'int', 'internal' => 'createdBy'],
'calendar_event_created_at' => ['name' => 'task_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], 'calendar_event_created_at' => ['name' => 'calendar_event_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
]; ];
/** /**
@ -86,7 +86,7 @@ class EventMapper extends DataMapperAbstract
'account_permission_p' 'account_permission_p'
) )
->into('account_permission') ->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(); $this->db->con->prepare($query->toSql())->execute();
} catch (\Exception $e) { } catch (\Exception $e) {
@ -111,9 +111,9 @@ class EventMapper extends DataMapperAbstract
public function find(...$columns) : Builder public function find(...$columns) : Builder
{ {
return parent::find(...$columns)->from('account_permission') 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('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); ->where('account_permission.account_permission_r', '=', 1);
} }
} }