From b076c12280159b80a3549b0808c55bcd883dba3d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 21 Oct 2020 22:50:27 +0200 Subject: [PATCH] correct datamapper self/external usage (invert) --- Models/EmployeeHistoryMapper.php | 8 ++++---- Models/EmployeeMapper.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Models/EmployeeHistoryMapper.php b/Models/EmployeeHistoryMapper.php index 4ef62a7..847cc13 100755 --- a/Models/EmployeeHistoryMapper.php +++ b/Models/EmployeeHistoryMapper.php @@ -54,19 +54,19 @@ final class EmployeeHistoryMapper extends DataMapperAbstract protected static array $belongsTo = [ 'unit' => [ 'mapper' => UnitMapper::class, - 'self' => 'hr_staff_history_unit', + 'external' => 'hr_staff_history_unit', ], 'department' => [ 'mapper' => DepartmentMapper::class, - 'self' => 'hr_staff_history_department', + 'external' => 'hr_staff_history_department', ], 'position' => [ 'mapper' => PositionMapper::class, - 'self' => 'hr_staff_history_position', + 'external' => 'hr_staff_history_position', ], 'employee' => [ 'mapper' => EmployeeMapper::class, - 'self' => 'hr_staff_history_staff', + 'external' => 'hr_staff_history_staff', ], ]; diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php index 31c3a14..6b1ff62 100755 --- a/Models/EmployeeMapper.php +++ b/Models/EmployeeMapper.php @@ -51,7 +51,7 @@ final class EmployeeMapper extends DataMapperAbstract protected static array $belongsTo = [ 'profile' => [ 'mapper' => ProfileMapper::class, - 'self' => 'hr_staff_profile', + 'external' => 'hr_staff_profile', ], ]; @@ -65,8 +65,8 @@ final class EmployeeMapper extends DataMapperAbstract 'companyHistory' => [ 'mapper' => EmployeeHistoryMapper::class, 'table' => 'hr_staff_history', // @todo: is this requried? This is stored in the mapper already. In other places I'm not using this, either use it everywhere or nowhere. Using the mapper is slower but protects us from table name changes! - 'external' => 'hr_staff_history_staff', - 'self' => null, + 'self' => 'hr_staff_history_staff', + 'external' => null, ], ];