This commit is contained in:
Yuri Kuznetsov
2024-01-30 14:12:49 +02:00
parent 4d1776f9ff
commit eef7fef69b
2 changed files with 22 additions and 41 deletions
@@ -88,6 +88,7 @@ class HookProcessor
}
}
/** @noinspection PhpUnusedParameterInspection */
public function afterRemove(Entity $entity, RemoveOptions $options): void
{
if ($this->checkHasStream($entity->getEntityType())) {
@@ -110,8 +111,8 @@ class HookProcessor
if (!array_key_exists($key, $this->isLinkObservableInStreamCache)) {
$this->isLinkObservableInStreamCache[$key] =
(bool) $this->metadata->get(['scopes', $entityType, 'stream']) &&
(bool) $this->metadata->get(['entityDefs', $entityType, 'links', $link, 'audited']);
$this->metadata->get(['scopes', $entityType, 'stream']) &&
$this->metadata->get(['entityDefs', $entityType, 'links', $link, 'audited']);
}
return $this->isLinkObservableInStreamCache[$key];
@@ -147,6 +148,7 @@ class HookProcessor
if ($type === Entity::HAS_MANY) {
$this->handleCreateRelatedHasMany($entity, $relation, $notifiedEntityTypeList, $options);
/** @noinspection PhpUnnecessaryStopStatementInspection */
continue;
}
}
@@ -436,7 +438,6 @@ class HookProcessor
return;
}
/** @var string[] $assignedUserIdList */
$assignedUserIdList = $entity->getLinkMultipleIdList($multipleField);
$fetchedAssignedUserIdList = $entity->getFetched($multipleField . 'Ids') ?? [];
+18 -38
View File
@@ -29,19 +29,13 @@
namespace Espo\Tools\Stream;
use DateTimeInterface;
use Espo\Core\Acl\Exceptions\NotAvailable;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
use Espo\Core\Utils\SystemUser;
use Espo\Entities\Subscription;
use Espo\Modules\Crm\Entities\Account;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\Order;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\Order;
use Espo\ORM\Entity;
use Espo\ORM\EntityCollection;
use Espo\ORM\Collection;
@@ -52,6 +46,11 @@ use Espo\Entities\Note;
use Espo\Entities\Email;
use Espo\Entities\EmailAddress;
use Espo\Core\Acl\Exceptions\NotAvailable;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
use Espo\Core\Utils\SystemUser;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\Utils\Config;
use Espo\Core\Utils\Metadata;
@@ -66,6 +65,7 @@ use Espo\Core\Utils\Acl\UserAclManagerProvider;
use stdClass;
use DateTime;
use DateTimeInterface;
use LogicException;
class Service
@@ -116,38 +116,18 @@ class Service
*/
private const NOTE_NOTIFICATION_PERIOD = '1 hour';
private EntityManager $entityManager;
private Config $config;
private User $user;
private Metadata $metadata;
private AclManager $aclManager;
private FieldUtil $fieldUtil;
private SelectBuilderFactory $selectBuilderFactory;
private UserAclManagerProvider $userAclManagerProvider;
private RecordServiceContainer $recordServiceContainer;
public function __construct(
EntityManager $entityManager,
Config $config,
User $user,
Metadata $metadata,
AclManager $aclManager,
FieldUtil $fieldUtil,
SelectBuilderFactory $selectBuilderFactory,
UserAclManagerProvider $userAclManagerProvider,
RecordServiceContainer $recordServiceContainer,
private EntityManager $entityManager,
private Config $config,
private User $user,
private Metadata $metadata,
private AclManager $aclManager,
private FieldUtil $fieldUtil,
private SelectBuilderFactory $selectBuilderFactory,
private UserAclManagerProvider $userAclManagerProvider,
private RecordServiceContainer $recordServiceContainer,
private SystemUser $systemUser
) {
$this->entityManager = $entityManager;
$this->config = $config;
$this->user = $user;
$this->metadata = $metadata;
$this->aclManager = $aclManager;
$this->fieldUtil = $fieldUtil;
$this->selectBuilderFactory = $selectBuilderFactory;
$this->userAclManagerProvider = $userAclManagerProvider;
$this->recordServiceContainer = $recordServiceContainer;
}
) {}
/**
* @return array<string, string>