From 0a7fe37014223edd78815b54c679a400450bd2c1 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 30 Jun 2025 17:00:01 +0300 Subject: [PATCH] ref --- .../Espo/Core/MassAction/Jobs/Process.php | 3 +- application/Espo/Entities/Note.php | 2 +- .../Espo/Tools/Export/Jobs/Process.php | 29 ++++++++----------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/application/Espo/Core/MassAction/Jobs/Process.php b/application/Espo/Core/MassAction/Jobs/Process.php index 506acc2e01..5079850ce7 100644 --- a/application/Espo/Core/MassAction/Jobs/Process.php +++ b/application/Espo/Core/MassAction/Jobs/Process.php @@ -103,8 +103,7 @@ class Process implements Job private function notifyFinish(MassActionEntity $entity): void { - /** @var Notification $notification */ - $notification = $this->entityManager->getNewEntity(Notification::ENTITY_TYPE); + $notification = $this->entityManager->getRDBRepositoryByClass(Notification::class)->getNew(); $message = $this->language->translateLabel('massActionProcessed', 'messages'); diff --git a/application/Espo/Entities/Note.php b/application/Espo/Entities/Note.php index 20deabf7f3..ecfd895c1c 100644 --- a/application/Espo/Entities/Note.php +++ b/application/Espo/Entities/Note.php @@ -146,7 +146,7 @@ class Note extends Entity public function isAclProcessed(): bool { - return (bool) $this->aclIsProcessed; + return $this->aclIsProcessed; } public function loadAttachments(): void diff --git a/application/Espo/Tools/Export/Jobs/Process.php b/application/Espo/Tools/Export/Jobs/Process.php index 775b20f2c9..2b4ea08340 100644 --- a/application/Espo/Tools/Export/Jobs/Process.php +++ b/application/Espo/Tools/Export/Jobs/Process.php @@ -30,17 +30,13 @@ namespace Espo\Tools\Export\Jobs; use Espo\Core\Exceptions\Error; - use Espo\Core\Job\Job; use Espo\Core\Job\Job\Data as JobData; - use Espo\Tools\Export\Factory; use Espo\Tools\Export\Result; - use Espo\Core\Utils\Language; - use Espo\ORM\EntityManager; -use Espo\Entities\Export as ExportEntity; +use Espo\Entities\Export; use Espo\Entities\Notification; use Espo\Entities\User; @@ -51,7 +47,7 @@ class Process implements Job public function __construct( private EntityManager $entityManager, private Factory $factory, - private Language $language + private Language $language, ) {} /** @@ -65,8 +61,8 @@ class Process implements Job throw new Error("ID not passed to the mass action job."); } - /** @var ExportEntity|null $entity */ - $entity = $this->entityManager->getEntityById(ExportEntity::ENTITY_TYPE, $id); + /** @var Export|null $entity */ + $entity = $this->entityManager->getEntityById(Export::ENTITY_TYPE, $id); if ($entity === null) { throw new Error("Export '$id' not found."); @@ -102,10 +98,9 @@ class Process implements Job } } - private function notifyFinish(ExportEntity $entity): void + private function notifyFinish(Export $entity): void { - /** @var Notification $notification */ - $notification = $this->entityManager->getNewEntity(Notification::ENTITY_TYPE); + $notification = $this->entityManager->getRDBRepositoryByClass(Notification::class)->getNew(); $url = '?entryPoint=download&id=' . $entity->getAttachmentId(); @@ -123,24 +118,24 @@ class Process implements Job $this->entityManager->saveEntity($notification); } - private function setFailed(ExportEntity $entity): void + private function setFailed(Export $entity): void { - $entity->setStatus(ExportEntity::STATUS_FAILED); + $entity->setStatus(Export::STATUS_FAILED); $this->entityManager->saveEntity($entity); } - private function setRunning(ExportEntity $entity): void + private function setRunning(Export $entity): void { - $entity->setStatus(ExportEntity::STATUS_RUNNING); + $entity->setStatus(Export::STATUS_RUNNING); $this->entityManager->saveEntity($entity); } - private function setSuccess(ExportEntity $entity, Result $result): void + private function setSuccess(Export $entity, Result $result): void { $entity - ->setStatus(ExportEntity::STATUS_SUCCESS) + ->setStatus(Export::STATUS_SUCCESS) ->setAttachmentId($result->getAttachmentId()); $this->entityManager->saveEntity($entity);