From 8f8eb4807d27001fc46d533995559691d7608871 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 17 Feb 2023 10:18:30 +0200 Subject: [PATCH] cs fix --- .../Espo/Tools/Stream/HookProcessor.php | 111 ++++++------------ 1 file changed, 34 insertions(+), 77 deletions(-) diff --git a/application/Espo/Tools/Stream/HookProcessor.php b/application/Espo/Tools/Stream/HookProcessor.php index 27a56ad347..58c8f5d120 100644 --- a/application/Espo/Tools/Stream/HookProcessor.php +++ b/application/Espo/Tools/Stream/HookProcessor.php @@ -30,9 +30,13 @@ namespace Espo\Tools\Stream; use Espo\Core\ORM\Repository\Option\SaveOption; +use Espo\Core\ORM\Entity as CoreEntity; use Espo\Core\Utils\Metadata; +use Espo\Core\Job\QueueName; +use Espo\Core\Job\JobSchedulerFactory; +use Espo\Core\Utils\DateTime as DateTimeUtil; + use Espo\Entities\Autofollow; -use Espo\Tools\Stream\Service as Service; use Espo\Entities\User; use Espo\Entities\Preferences; use Espo\Entities\Note; @@ -41,52 +45,33 @@ use Espo\ORM\EntityManager; use Espo\ORM\Entity; use Espo\ORM\Defs\RelationDefs; -use Espo\Core\Job\QueueName; -use Espo\Core\Job\JobSchedulerFactory; -use Espo\Core\Utils\DateTime as DateTimeUtil; - +use Espo\Tools\Stream\Service as Service; use Espo\Tools\Stream\Jobs\AutoFollow as AutoFollowJob; use Espo\Tools\Stream\Jobs\ControlFollowers as ControlFollowersJob; -use Espo\Core\ORM\Entity as CoreEntity; - /** * Handles operations with entities. */ class HookProcessor { - /** @var array */ + /** @var array */ private $hasStreamCache = []; - /** @var array */ + /** @var array */ private $isLinkObservableInStreamCache = []; - /** @var ?array */ + /** @var ?array */ private $statusFields = null; - private Metadata $metadata; - private EntityManager $entityManager; - private Service $service; - private User $user; - private Preferences $preferences; - private JobSchedulerFactory $jobSchedulerFactory; - public function __construct( - Metadata $metadata, - EntityManager $entityManager, - Service $service, - User $user, - Preferences $preferences, - JobSchedulerFactory $jobSchedulerFactory - ) { - $this->metadata = $metadata; - $this->entityManager = $entityManager; - $this->service = $service; - $this->user = $user; - $this->preferences = $preferences; - $this->jobSchedulerFactory = $jobSchedulerFactory; - } + private Metadata $metadata, + private EntityManager $entityManager, + private Service $service, + private User $user, + private Preferences $preferences, + private JobSchedulerFactory $jobSchedulerFactory + ) {} /** - * @param array $options + * @param array $options */ public function afterSave(Entity $entity, array $options): void { @@ -150,7 +135,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function handleCreateRelated(Entity $entity, array $options = []): void { @@ -225,7 +210,7 @@ class HookProcessor /** * @param string[] $notifiedEntityTypeList - * @param array $options + * @param array $options */ private function handleCreateRelatedBelongsToParent( Entity $entity, @@ -263,7 +248,7 @@ class HookProcessor /** * @param string[] $notifiedEntityTypeList - * @param array $options + * @param array $options */ private function handleCreateRelatedHasMany( Entity $entity, @@ -338,7 +323,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function afterSaveStream(Entity $entity, array $options): void { @@ -356,7 +341,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function afterSaveStreamNew(CoreEntity $entity, array $options): void { @@ -372,8 +357,6 @@ class HookProcessor $assignedUserId = $entity->get('assignedUserId'); $createdById = $entity->get('createdById'); - - /** @var string[] $assignedUserIdList */ $assignedUserIdList = $hasAssignedUsersField ? $entity->getLinkMultipleIdList($multipleField) : []; @@ -430,7 +413,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function afterSaveStreamNotNew(CoreEntity $entity, array $options): void { @@ -439,7 +422,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function afterSaveStreamNotNew1(CoreEntity $entity, array $options): void { @@ -488,7 +471,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ private function afterSaveStreamNotNewAssignedUserIdChanged(Entity $entity, array $options): void { @@ -541,14 +524,14 @@ class HookProcessor } /** - * @return array + * @return array */ private function getStatusFields(): array { if (is_null($this->statusFields)) { $this->statusFields = []; - /** @var array> $scopes */ + /** @var array> $scopes */ $scopes = $this->metadata->get('scopes', []); foreach ($scopes as $scope => $data) { @@ -563,12 +546,12 @@ class HookProcessor } } - /** @var array */ + /** @var array */ return $this->statusFields; } /** - * @param array $options + * @param array $options */ public function afterRelate(Entity $entity, Entity $foreignEntity, string $link, array $options): void { @@ -602,7 +585,7 @@ class HookProcessor } /** - * @param array $options + * @param array $options */ public function afterUnrelate(Entity $entity, Entity $foreignEntity, string $link, array $options): void { @@ -640,21 +623,8 @@ class HookProcessor $this->entityManager->saveEntity($note1); - /** @todo Add time period (a few minutes). Don't create 'unrelate' if before. */ - /*$note1 = $this->entityManager - ->getRDBRepository(Note::ENTITY_TYPE) - ->where([ - 'type' => Note::TYPE_RELATE, - 'parentId' => $entity->getId(), - 'parentType' => $entityType, - 'relatedId' => $foreignEntity->getId(), - 'relatedType' => $foreignEntityType, - ]) - ->findOne(); - - if ($note1) { - $this->entityManager->removeEntity($note1); - }*/ + // @todo + // Add time period (a few minutes). If before, remove RELATE note, don't create 'unrelate' if before. } if ($auditedForeign) { @@ -672,21 +642,8 @@ class HookProcessor $this->entityManager->saveEntity($note2); - /** @todo Add time period (a few minutes). Don't create 'unrelate' if before. */ - /*$note2 = $this->entityManager - ->getRDBRepository(Note::ENTITY_TYPE) - ->where([ - 'type' => Note::TYPE_RELATE, - 'parentId' => $foreignEntity->getId(), - 'parentType' => $foreignEntityType, - 'relatedId' => $entity->getId(), - 'relatedType' => $entityType, - ]) - ->findOne(); - - if ($note2) { - $this->entityManager->removeEntity($note2); - }*/ + // @todo + // Add time period (a few minutes). If before, remove RELATE note, don't create 'unrelate' if before. } } }