Skip to content

EspoCRM – Open Source CRM Application

ref

Yuri Kuznetsovdb030173e295
diff --git a/application/Espo/Core/Action/Actions/Merge/Merger.php b/application/Espo/Core/Action/Actions/Merge/Merger.php
index d2651a49d3..a9f5fb71bb 100644
--- a/application/Espo/Core/Action/Actions/Merge/Merger.php
+++ b/application/Espo/Core/Action/Actions/Merge/Merger.php
@@ -34,12 +34,14 @@ use Espo\Core\Acl\Table;
use Espo\Core\Action\Params;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Name\Field;
use Espo\Core\ORM\EntityManager;
use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Record\ActionHistory\Action;
use Espo\Core\Record\ServiceContainer;
use Espo\Core\Utils\Metadata;
use Espo\Core\Utils\ObjectUtil;
+use Espo\Entities\Note;
use Espo\ORM\Entity;
use Espo\Entities\EmailAddress;
use Espo\Entities\PhoneNumber;
@@ -94,12 +96,12 @@ class Merger
$entityDefs = $this->entityManager->getDefs()->getEntity($entityType);
$hasPhoneNumber =
- $entityDefs->hasField('phoneNumber') &&
- $entityDefs->getField('phoneNumber')->getType() === FieldType::PHONE;
+ $entityDefs->hasField(Field::PHONE_NUMBER) &&
+ $entityDefs->getField(Field::PHONE_NUMBER)->getType() === FieldType::PHONE;
$hasEmailAddress =
- $entityDefs->hasField('emailAddress') &&
- $entityDefs->getField('emailAddress')->getType() === FieldType::EMAIL;
+ $entityDefs->hasField(Field::EMAIL_ADDRESS) &&
+ $entityDefs->getField(Field::EMAIL_ADDRESS)->getType() === FieldType::EMAIL;
if ($hasPhoneNumber) {
$phoneNumberToRelateList = $this->fetchEntityPhoneNumberList($entity);
@@ -196,7 +198,6 @@ class Merger
/** @var iterable<PhoneNumber> $collection */
$collection = $this->entityManager
- ->getRDBRepository($entity->getEntityType())
->getRelation($entity, 'phoneNumbers')
->find();
@@ -216,7 +217,6 @@ class Merger
/** @var iterable<EmailAddress> $collection */
$collection = $this->entityManager
- ->getRDBRepository($entity->getEntityType())
->getRelation($entity, 'emailAddresses')
->find();
@@ -232,13 +232,17 @@ class Merger
$updateQuery = $this->entityManager
->getQueryBuilder()
->update()
- ->in('Note')
+ ->in(Note::ENTITY_TYPE)
->set([
'parentId' => $targetEntity->getId(),
'parentType' => $targetEntity->getEntityType(),
])
->where([
- 'type' => ['Post', 'EmailSent', 'EmailReceived'],
+ 'type' => [
+ Note::TYPE_POST,
+ Note::TYPE_EMAIL_SENT,
+ Note::TYPE_EMAIL_RECEIVED,
+ ],
'parentId' => $sourceEntity->getId(),
'parentType' => $sourceEntity->getEntityType(),
])
@@ -251,14 +255,12 @@ class Merger
private function updateRelations(Entity $sourceEntity, Entity $targetEntity, string $link): void
{
- $repository = $this->entityManager->getRDBRepository($targetEntity->getEntityType());
-
- $collection = $repository
+ $collection = $this->entityManager
->getRelation($sourceEntity, $link)
->find();
foreach ($collection as $relatedEntity) {
- $repository
+ $this->entityManager
->getRelation($targetEntity, $link)
->relate($relatedEntity);
}