espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repository inteface

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-07-28 13:04:14 +03:00
parent 676e516f73
commit ef7c94f4e0
17 changed files with 138 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Repositories/CategoryTree.php
+2 -2
View File
@@ -39,7 +39,7 @@ class CategoryTree extends Database
$parentId = $entity->get('parentId');
$em = $this->getEntityManager();
$em = $this->entityManager;
$pathEntityType = $entity->getEntityType() . 'Path';
@@ -152,7 +152,7 @@ class CategoryTree extends Database
$pathEntityType = $entity->getEntityType() . 'Path';
$em = $this->getEntityManager();
$em = $this->entityManager;
$delete = $em->getQueryBuilder()
->delete()
application/Espo/Core/Repositories/Database.php
+5 -2
View File
@@ -48,6 +48,9 @@ use Espo\Core\{
Utils\Id\RecordIdGenerator,
};
/**
* The default repository used for all entities.
*/
class Database extends RDBRepository
{
protected $hooksDisabled = false;
@@ -195,7 +198,7 @@ class Database extends RDBRepository
$foreignEntityType = $entity->getRelationParam($relationName, 'entity');
if ($foreignEntityType) {
$foreign = $this->getEntityManager()->getEntity($foreignEntityType);
$foreign = $this->entityManager->getEntity($foreignEntityType);
$foreign->set('id', $foreignId);
@@ -226,7 +229,7 @@ class Database extends RDBRepository
$foreignEntityType = $entity->getRelationParam($relationName, 'entity');
if ($foreignEntityType) {
$foreign = $this->getEntityManager()->getEntity($foreignEntityType);
$foreign = $this->entityManager->getEntity($foreignEntityType);
$foreign->id = $foreignId;
$foreign->setAsFetched();
}
application/Espo/Core/Repositories/Event.php
+2 -2
View File
@@ -132,7 +132,7 @@ class Event extends Database implements
{
parent::afterRemove($entity, $options);
$delete = $this->getEntityManager()->getQueryBuilder()
$delete = $this->entityManager->getQueryBuilder()
->delete()
->from('Reminder')
->where([
@@ -141,7 +141,7 @@ class Event extends Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->execute($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function convertDateTimeToDefaultTimezone($string)
application/Espo/Modules/Crm/Repositories/CaseObj.php
+2 -2
View File
@@ -67,7 +67,7 @@ class CaseObj extends \Espo\Core\Repositories\Database implements
$fetchedContactId = $entity->getFetched('contactId');
if ($fetchedContactId) {
$previousPortalUser = $this->getEntityManager()
$previousPortalUser = $this->entityManager
->getRepository('User')
->select(['id'])
->where([
@@ -89,7 +89,7 @@ class CaseObj extends \Espo\Core\Repositories\Database implements
return;
}
$portalUser = $this->getEntityManager()
$portalUser = $this->entityManager
->getRepository('User')
->select(['id'])
->where([
application/Espo/Modules/Crm/Repositories/Contact.php
+8 -2
View File
@@ -47,13 +47,17 @@ class Contact extends \Espo\Core\Repositories\Database
protected function handleAfterSaveAccounts(Entity $entity, array $options = [])
{
$accountIdChanged = $entity->has('accountId') && $entity->get('accountId') != $entity->getFetched('accountId');
$accountIdChanged = $entity->has('accountId') &&
$entity->get('accountId') != $entity->getFetched('accountId');
$titleChanged = $entity->has('title') && $entity->get('title') != $entity->getFetched('title');
if ($accountIdChanged) {
$accountId = $entity->get('accountId');
if (empty($accountId)) {
$this->unrelate($entity, 'accounts', $entity->getFetched('accountId'));
return;
}
}
@@ -61,6 +65,7 @@ class Contact extends \Espo\Core\Repositories\Database
if ($titleChanged) {
if (empty($accountId)) {
$accountId = $entity->getFetched('accountId');
if (empty($accountId)) {
return;
}
@@ -68,7 +73,7 @@ class Contact extends \Espo\Core\Repositories\Database
}
if ($accountIdChanged || $titleChanged) {
$accountContact = $this->getEntityManager()->getRepository('AccountContact')
$accountContact = $this->entityManager->getRepository('AccountContact')
->select(['role'])
->where([
'accountId' => $accountId,
@@ -83,6 +88,7 @@ class Contact extends \Espo\Core\Repositories\Database
'role' => $entity->get('title')
]);
}
return;
}
application/Espo/Modules/Crm/Repositories/Task.php
+1 -1
View File
@@ -69,7 +69,7 @@ class Task extends EventRepository
$parentId = $entity->get('parentId');
$parentType = $entity->get('parentType');
if ($parentId && $parentType && $this->getEntityManager()->hasRepository($parentType)) {
if ($parentId && $parentType && $this->entityManager->hasRepository($parentType)) {
$columnList = ['id', 'name'];
$defs = $this->entityManager->getMetadata()->getDefs();
application/Espo/ORM/Repository/RDBRepository.php
+38 -19
View File
@@ -29,25 +29,29 @@
namespace Espo\ORM\Repository;
use Espo\ORM\{
EntityManager,
EntityFactory,
Collection,
SthCollection,
Entity,
Mapper\RDBMapper,
Query\Select,
Query\Part\WhereItem,
Query\Part\Selection,
Query\Part\Join,
};
use Espo\ORM\EntityManager;
use Espo\ORM\EntityFactory;
use Espo\ORM\Collection;
use Espo\ORM\SthCollection;
use Espo\ORM\Entity;
use Espo\ORM\Mapper\RDBMapper;
use Espo\ORM\Query\Select;
use Espo\ORM\Query\Part\WhereItem;
use Espo\ORM\Query\Part\Selection;
use Espo\ORM\Query\Part\Join;
use StdClass;
use stdClass;
use RuntimeException;
use PDO;
class RDBRepository extends Repository
class RDBRepository implements Repository
{
protected $entityType;
protected $entityManager;
protected $entityFactory;
protected $mapper;
protected $hookMediator;
@@ -60,16 +64,18 @@ class RDBRepository extends Repository
EntityFactory $entityFactory,
?HookMediator $hookMediator = null
) {
parent::__construct($entityType, $entityManager, $entityFactory);
$this->entityType = $entityType;
$this->entityFactory = $entityFactory;
$this->entityManager = $entityManager;
$this->hookMediator = $hookMediator ?? (new EmptyHookMediator());
$this->transactionManager = new RDBTransactionManager($entityManager->getTransactionManager());
}
protected function getMapper(): RDBMapper
public function getEntityType(): string
{
return $this->entityManager->getMapper();
return $this->entityType;
}
/**
@@ -456,7 +462,7 @@ class RDBRepository extends Repository
else {
$data = $columnData;
if ($columnData instanceof StdClass) {
if ($columnData instanceof stdClass) {
$data = get_object_vars($columnData);
}
@@ -582,7 +588,7 @@ class RDBRepository extends Repository
throw new RuntimeException("Bad foreign value.");
}
if ($columnData instanceof StdClass) {
if ($columnData instanceof stdClass) {
$columnData = get_object_vars($columnData);
}
@@ -860,4 +866,17 @@ class RDBRepository extends Repository
{
$this->hookMediator->afterRemove($entity, $options);
}
protected function getMapper(): RDBMapper
{
return $this->entityManager->getMapper();
}
/**
* @deprecated Use `$this->entityManager`.
*/
protected function getEntityManager(): EntityManager
{
return $this->entityManager;
}
}
application/Espo/ORM/Repository/Repository.php
+5 -46
View File
@@ -29,66 +29,25 @@
namespace Espo\ORM\Repository;
use Espo\ORM\{
Entity,
EntityManager,
EntityFactory,
};
use Espo\ORM\Entity;
/**
* An access point for fetching and storing records.
*/
abstract class Repository
interface Repository
{
/**
* @var EntityFactory
*/
protected $entityFactory;
/**
* @var EntityManager
*/
protected $entityManager;
/**
* @var string
*/
protected $entityType;
public function __construct(string $entityType, EntityManager $entityManager, EntityFactory $entityFactory)
{
$this->entityType = $entityType;
$this->entityFactory = $entityFactory;
$this->entityManager = $entityManager;
}
protected function getEntityFactory(): EntityFactory
{
return $this->entityFactory;
}
protected function getEntityManager(): EntityManager
{
return $this->entityManager;
}
public function getEntityType(): string
{
return $this->entityType;
}
/**
* Get a new entity.
*/
abstract public function getNew(): Entity;
public function getNew(): Entity;
/**
* Fetch an entity by ID.
*/
abstract public function getById(string $id): ?Entity;
public function getById(string $id): ?Entity;
/**
* Store an entity.
*/
abstract public function save(Entity $entity): void;
public function save(Entity $entity): void;
}
application/Espo/Repositories/Email.php
+12 -12
View File
@@ -44,7 +44,7 @@ class Email extends \Espo\Core\Repositories\Database implements
return;
}
$eaRepository = $this->getEntityManager()->getRepository('EmailAddress');
$eaRepository = $this->entityManager->getRepository('EmailAddress');
$addressValue = $entity->get($type);
$idList = [];
@@ -75,7 +75,7 @@ class Email extends \Espo\Core\Repositories\Database implements
protected function addUserByEmailAddressId(Entity $entity, $emailAddressId, $addAssignedUser = false)
{
$userList = $this->getEntityManager()
$userList = $this->entityManager
->getRepository('EmailAddress')
->getEntityListByAddressId($emailAddressId, null, 'User', true);
@@ -97,7 +97,7 @@ class Email extends \Espo\Core\Repositories\Database implements
}
if ($entity->get('fromEmailAddressId')) {
$ea = $this->getEntityManager()
$ea = $this->entityManager
->getRepository('EmailAddress')
->get($entity->get('fromEmailAddressId'));
@@ -230,12 +230,12 @@ class Email extends \Espo\Core\Repositories\Database implements
$idHash = (object) [];
foreach ($addressList as $address) {
$p = $this->getEntityManager()
$p = $this->entityManager
->getRepository('EmailAddress')
->getEntityByAddress($address);
if (!$p) {
$p = $this->getEntityManager()
$p = $this->entityManager
->getRepository('InboundEmail')
->where(array('emailAddress' => $address))
->findOne();
@@ -292,7 +292,7 @@ class Email extends \Espo\Core\Repositories\Database implements
$from = trim($entity->get('from'));
if (!empty($from)) {
$ids = $this->getEntityManager()
$ids = $this->entityManager
->getRepository('EmailAddress')
->getIds([$from]);
@@ -303,7 +303,7 @@ class Email extends \Espo\Core\Repositories\Database implements
$this->addUserByEmailAddressId($entity, $ids[0], true);
if (!$entity->get('sentById')) {
$user = $this->getEntityManager()
$user = $this->entityManager
->getRepository('EmailAddress')
->getEntityByAddressId(
$entity->get('fromEmailAddressId'),
@@ -373,7 +373,7 @@ class Email extends \Espo\Core\Repositories\Database implements
$parentType = $entity->get('parentType');
if ($parentId && $parentType) {
$parent = $this->getEntityManager()->getEntity($parentType, $parentId);
$parent = $this->entityManager->getEntity($parentType, $parentId);
if ($parent) {
$accountId = null;
@@ -391,7 +391,7 @@ class Email extends \Espo\Core\Repositories\Database implements
}
if ($accountId) {
$account = $this->getEntityManager()->getEntity('Account', $accountId);
$account = $this->entityManager->getEntity('Account', $accountId);
if ($account) {
$entity->set('accountId', $accountId);
@@ -453,7 +453,7 @@ class Email extends \Espo\Core\Repositories\Database implements
'parentType' => $entity->get('parentType')
]);
$this->getEntityManager()->saveEntity($reply);
$this->entityManager->saveEntity($reply);
}
}
}
@@ -465,10 +465,10 @@ class Email extends \Espo\Core\Repositories\Database implements
($entity->isAttributeChanged('status') || $entity->isNew())
) {
if ($entity->get('repliedId')) {
$replied = $this->getEntityManager()->getEntity('Email', $entity->get('repliedId'));
$replied = $this->entityManager->getEntity('Email', $entity->get('repliedId'));
if ($replied && $replied->id !== $entity->id && !$replied->get('isReplied')) {
$replied->set('isReplied', true);
$this->getEntityManager()->saveEntity($replied, ['silent' => true]);
$this->entityManager->saveEntity($replied, ['silent' => true]);
}
}
}
application/Espo/Repositories/EmailAddress.php
+11 -11
View File
@@ -170,7 +170,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
];
}
$itemList = $this->getEntityManager()->getRepository('EntityEmailAddress')
$itemList = $this->entityManager->getRepository('EntityEmailAddress')
->sth()
->select(['entityType', 'entityId'])
->where($where)
@@ -184,7 +184,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
continue;
}
if (!$this->getEntityManager()->hasRepository($itemEntityType)) {
if (!$this->entityManager->hasRepository($itemEntityType)) {
continue;
}
@@ -195,13 +195,13 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
$select[] = 'isActive';
}
$entity = $this->getEntityManager()->getRepository($itemEntityType)
$entity = $this->entityManager->getRepository($itemEntityType)
->select($select)
->where(['id' => $itemEntityId])
->findOne();
}
else {
$entity = $this->getEntityManager()->getEntity($itemEntityType, $itemEntityId);
$entity = $this->entityManager->getEntity($itemEntityType, $itemEntityId);
}
if (!$entity) {
@@ -232,7 +232,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
$where[] = ['entityType' => $entityType];
}
$itemList = $this->getEntityManager()->getRepository('EntityEmailAddress')
$itemList = $this->entityManager->getRepository('EntityEmailAddress')
->sth()
->select(['entityType', 'entityId'])
->where($where)
@@ -251,7 +251,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
continue;
}
if (!$this->getEntityManager()->hasRepository($itemEntityType)) {
if (!$this->entityManager->hasRepository($itemEntityType)) {
continue;
}
@@ -262,13 +262,13 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
$select[] = 'isActive';
}
$entity = $this->getEntityManager()->getRepository($itemEntityType)
$entity = $this->entityManager->getRepository($itemEntityType)
->select($select)
->where(['id' => $itemEntityId])
->findOne();
}
else {
$entity = $this->getEntityManager()->getEntity($itemEntityType, $itemEntityId);
$entity = $this->entityManager->getEntity($itemEntityType, $itemEntityId);
}
if ($entity) {
@@ -291,7 +291,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
array $order = ['User', 'Contact', 'Lead', 'Account']
): ?Entity {
$selectBuilder = $this->getEntityManager()
$selectBuilder = $this->entityManager
->getRepository('EntityEmailAddress')
->select();
@@ -317,11 +317,11 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
continue;
}
if (!$this->getEntityManager()->hasRepository($itemEntityType)) {
if (!$this->entityManager->hasRepository($itemEntityType)) {
continue;
}
$entity = $this->getEntityManager()->getEntity($itemEntityType, $itemEntityId);
$entity = $this->entityManager->getEntity($itemEntityType, $itemEntityId);
if ($entity) {
if ($entity->getEntityType() === 'User') {
application/Espo/Repositories/Import.php
+6 -6
View File
@@ -48,7 +48,7 @@ class Import extends Database
$modifiedQuery = $this->addImportEntityJoin($entity, $relationName, $query);
return $this->getEntityManager()
return $this->entityManager
->getRepository($entityType)
->clone($modifiedQuery)
->find();
@@ -109,7 +109,7 @@ class Import extends Database
$modifiedQuery = $this->addImportEntityJoin($entity, $relationName, $query);
return $this->getEntityManager()
return $this->entityManager
->getRepository($entityType)
->clone($modifiedQuery)
->count();
@@ -118,13 +118,13 @@ class Import extends Database
protected function afterRemove(Entity $entity, array $options = [])
{
if ($entity->get('fileId')) {
$attachment = $this->getEntityManager()->getEntity('Attachment', $entity->get('fileId'));
$attachment = $this->entityManager->getEntity('Attachment', $entity->get('fileId'));
if ($attachment) {
$this->getEntityManager()->removeEntity($attachment);
$this->entityManager->removeEntity($attachment);
}
}
$delete = $this->getEntityManager()
$delete = $this->entityManager
->getQueryBuilder()
->delete()
->from('ImportEntity')
@@ -133,7 +133,7 @@ class Import extends Database
])
->build();
$this->getEntityManager()->getQueryExecutor()->execute($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
parent::afterRemove($entity, $options);
}
application/Espo/Repositories/LayoutSet.php
+4 -4
View File
@@ -43,7 +43,7 @@ class LayoutSet extends \Espo\Core\Repositories\Database
foreach ($listBefore as $name) {
if (!in_array($name, $listNow)) {
$layout = $this->getEntityManager()
$layout = $this->entityManager
->getRepository('LayoutRecord')
->where([
'layoutSetId' => $entity->id,
@@ -52,7 +52,7 @@ class LayoutSet extends \Espo\Core\Repositories\Database
->findOne();
if ($layout) {
$this->getEntityManager()->removeEntity($layout);
$this->entityManager->removeEntity($layout);
}
}
}
@@ -61,7 +61,7 @@ class LayoutSet extends \Espo\Core\Repositories\Database
protected function afterRemove(Entity $entity, array $options = [])
{
$layoutList = $this->getEntityManager()
$layoutList = $this->entityManager
->getRepository('LayoutRecord')
->where([
'layoutSetId' => $entity->id,
@@ -69,7 +69,7 @@ class LayoutSet extends \Espo\Core\Repositories\Database
->find();
foreach ($layoutList as $layout) {
$this->getEntityManager()->removeEntity($layout);
$this->entityManager->removeEntity($layout);
}
}
}
application/Espo/Repositories/PhoneNumber.php
+6 -6
View File
@@ -151,7 +151,7 @@ class PhoneNumber extends Database implements
];
}
$itemList = $this->getEntityManager()
$itemList = $this->entityManager
->getRepository('EntityPhoneNumber')
->sth()
->select(['entityType', 'entityId'])
@@ -166,11 +166,11 @@ class PhoneNumber extends Database implements
continue;
}
if (!$this->getEntityManager()->hasRepository($itemEntityType)) {
if (!$this->entityManager->hasRepository($itemEntityType)) {
continue;
}
$entity = $this->getEntityManager()->getEntity($itemEntityType, $itemEntityId);
$entity = $this->entityManager->getEntity($itemEntityType, $itemEntityId);
if (!$entity) {
continue;
@@ -192,7 +192,7 @@ class PhoneNumber extends Database implements
$where[] = ['entityType' => $entityType];
}
$itemList = $this->getEntityManager()->getRepository('EntityPhoneNumber')
$itemList = $this->entityManager->getRepository('EntityPhoneNumber')
->sth()
->select(['entityType', 'entityId'])
->where($where)
@@ -211,11 +211,11 @@ class PhoneNumber extends Database implements
continue;
}
if (!$this->getEntityManager()->hasRepository($itemEntityType)) {
if (!$this->entityManager->hasRepository($itemEntityType)) {
continue;
}
$entity = $this->getEntityManager()->getEntity($itemEntityType, $itemEntityId);
$entity = $this->entityManager->getEntity($itemEntityType, $itemEntityId);
if ($entity) {
if ($entity->getEntityType() === 'User') {
application/Espo/Repositories/Preferences.php
+24 -15
View File
@@ -30,15 +30,17 @@
namespace Espo\Repositories;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\EntityFactory;
use Espo\ORM\Repository\Repository;
use Espo\Core\Utils\Json;
use PDO;
use StdClass;
use stdClass;
use Espo\Core\Di;
class Preferences extends Repository implements
class Preferences implements Repository,
Di\MetadataAware,
Di\ConfigAware,
Di\EntityManagerAware
@@ -47,6 +49,14 @@ class Preferences extends Repository implements
use Di\ConfigSetter;
use Di\EntityManagerSetter;
public function __construct(
EntityManager $entityManager,
EntityFactory $entityFactory
) {
$this->entityFactory = $entityFactory;
$this->entityManager = $entityManager;
}
protected $defaultAttributeListFromSettings = [
'decimalMark',
'thousandSeparator',
@@ -54,9 +64,7 @@ class Preferences extends Repository implements
'followCreatedEntities',
];
protected $data = [];
protected $entityType = 'Preferences';
private $data = [];
public function getNew(): Entity
{
@@ -95,7 +103,7 @@ class Preferences extends Repository implements
{
$data = null;
$select = $this->getEntityManager()->getQueryBuilder()
$select = $this->entityManager->getQueryBuilder()
->select()
->from('Preferences')
->select(['id', 'data'])
@@ -105,9 +113,9 @@ class Preferences extends Repository implements
->limit(0, 1)
->build();
$sth = $this->getEntityManager()->getQueryExecutor()->execute($select);
$sth = $this->entityManager->getQueryExecutor()->execute($select);
while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
while ($row = $sth->fetch()) {
$data = Json::decode($row['data']);
break;
@@ -157,7 +165,7 @@ class Preferences extends Repository implements
$autoFollowEntityTypeList = [];
$autofollowList = $this->entityManager
->getRepository('Autofollow')
->getRDBRepository('Autofollow')
->select(['entityType'])
->where([
'userId' => $id,
@@ -224,7 +232,7 @@ class Preferences extends Repository implements
$dataString = Json::encode($data, \JSON_PRETTY_PRINT);
$insert = $this->getEntityManager()->getQueryBuilder()
$insert = $this->entityManager->getQueryBuilder()
->insert()
->into('Preferences')
->columns(['id', 'data'])
@@ -237,9 +245,10 @@ class Preferences extends Repository implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->execute($insert);
$this->entityManager->getQueryExecutor()->execute($insert);
$user = $this->entityManager->getEntity('User', $entity->id);
if ($user && !$user->isPortal()) {
$this->storeAutoFollowEntityTypeList($entity);
}
@@ -247,7 +256,7 @@ class Preferences extends Repository implements
public function deleteFromDb(string $id): void
{
$delete = $this->getEntityManager()->getQueryBuilder()
$delete = $this->entityManager->getQueryBuilder()
->delete()
->from('Preferences')
->where([
@@ -255,7 +264,7 @@ class Preferences extends Repository implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->execute($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
public function remove(Entity $entity, array $options = []): void
@@ -271,7 +280,7 @@ class Preferences extends Repository implements
}
}
public function resetToDefaults(string $userId): ?StdClass
public function resetToDefaults(string $userId): ?stdClass
{
$this->deleteFromDb($userId);
application/Espo/Repositories/ScheduledJob.php
+2 -2
View File
@@ -42,7 +42,7 @@ class ScheduledJob extends \Espo\Core\Repositories\Database
parent::afterSave($entity, $options);
if ($entity->isAttributeChanged('scheduling')) {
$jobList = $this->getEntityManager()
$jobList = $this->entityManager
->getRepository('Job')
->where([
'scheduledJobId' => $entity->id,
@@ -51,7 +51,7 @@ class ScheduledJob extends \Espo\Core\Repositories\Database
->find();
foreach ($jobList as $job) {
$this->getEntityManager()->removeEntity($job);
$this->entityManager->removeEntity($job);
}
}
}
application/Espo/Repositories/User.php
+9 -9
View File
@@ -83,7 +83,7 @@ class User extends Database
throw new Error("Username can't be empty.");
}
$this->getEntityManager()->getLocker()->lockExclusive($this->entityType);
$this->entityManager->getLocker()->lockExclusive($this->entityType);
$user = $this
->select(['id'])
@@ -93,7 +93,7 @@ class User extends Database
->findOne();
if ($user) {
$this->getEntityManager()->getLocker()->rollback();
$this->entityManager->getLocker()->rollback();
throw new Conflict(json_encode(['reason' => 'userNameExists']));
}
@@ -105,7 +105,7 @@ class User extends Database
throw new Error("Username can't be empty.");
}
$this->getEntityManager()->getLocker()->lockExclusive($this->entityType);
$this->entityManager->getLocker()->lockExclusive($this->entityType);
$user = $this
->select(['id'])
@@ -116,7 +116,7 @@ class User extends Database
->findOne();
if ($user) {
$this->getEntityManager()->getLocker()->rollback();
$this->entityManager->getLocker()->rollback();
throw new Conflict(json_encode(['reason' => 'userNameExists']));
}
@@ -126,8 +126,8 @@ class User extends Database
protected function afterSave(Entity $entity, array $options = [])
{
if ($this->getEntityManager()->getLocker()->isLocked()) {
$this->getEntityManager()->getLocker()->commit();
if ($this->entityManager->getLocker()->isLocked()) {
$this->entityManager->getLocker()->commit();
}
parent::afterSave($entity, $options);
@@ -137,10 +137,10 @@ class User extends Database
{
parent::afterRemove($entity, $options);
$userData = $this->getEntityManager()->getRepository('UserData')->getByUserId($entity->id);
$userData = $this->entityManager->getRepository('UserData')->getByUserId($entity->id);
if ($userData) {
$this->getEntityManager()->removeEntity($userData);
$this->entityManager->removeEntity($userData);
}
}
@@ -150,7 +150,7 @@ class User extends Database
return false;
}
return (bool) $this->getEntityManager()
return (bool) $this->entityManager
->getRepository('TeamUser')
->where([
'deleted' => false,
application/Espo/Repositories/UserData.php
+1 -1
View File
@@ -43,7 +43,7 @@ class UserData extends \Espo\Core\Repositories\Database
return $userData;
}
$user = $this->getEntityManager()
$user = $this->entityManager
->getRepository('User')
->getById($userId);