EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov9f918295e17f
diff --git a/application/Espo/Core/Webhook/Manager.php b/application/Espo/Core/Webhook/Manager.phpindex 7da15eae0a..9654f75002 100644--- a/application/Espo/Core/Webhook/Manager.php+++ b/application/Espo/Core/Webhook/Manager.php@@ -42,6 +42,7 @@ use Espo\Entities\WebhookEventQueueItem;use Espo\ORM\Name\Attribute;use RuntimeException;+use stdClass;/*** Processes events. Holds an information about existing events.@@ -173,7 +174,7 @@ class Managerprivate function logDebugEvent(string $event, Entity $entity): void{- $this->log->debug("Webhook: {$event} on record {$entity->getId()}.");+ $this->log->debug("Webhook: $event on record {$entity->getId()}.");}/**@@ -187,12 +188,14 @@ class Managerreturn;}- $this->entityManager->createEntity(WebhookEventQueueItem::ENTITY_TYPE, [- 'event' => $event,- 'targetType' => $entity->getEntityType(),- 'targetId' => $entity->getId(),- 'data' => $entity->getValueMap(),- ]);+ $item = $this->entityManager->getRDBRepositoryByClass(WebhookEventQueueItem::class)->getNew();++ $item+ ->setEvent($event)+ ->setTarget($entity)+ ->setData($entity->getValueMap());++ $this->entityManager->saveEntity($item);$this->logDebugEvent($event, $entity);}@@ -208,14 +211,16 @@ class Managerreturn;}- $this->entityManager->createEntity(WebhookEventQueueItem::ENTITY_TYPE, [- 'event' => $event,- 'targetType' => $entity->getEntityType(),- 'targetId' => $entity->getId(),- 'data' => (object) [+ $item = $this->entityManager->getRDBRepositoryByClass(WebhookEventQueueItem::class)->getNew();++ $item+ ->setEvent($event)+ ->setTarget($entity)+ ->setData(['id' => $entity->getId(),- ],- ]);+ ]);++ $this->entityManager->saveEntity($item);$this->logDebugEvent($event, $entity);}@@ -246,63 +251,83 @@ class Manager$data->id = $entity->getId();if ($this->eventExists($event)) {- $this->entityManager->createEntity(WebhookEventQueueItem::ENTITY_TYPE, [- 'event' => $event,- 'targetType' => $entity->getEntityType(),- 'targetId' => $entity->getId(),- 'data' => $data,- ]);+ $item = $this->entityManager->getRDBRepositoryByClass(WebhookEventQueueItem::class)->getNew();++ $item+ ->setEvent($event)+ ->setTarget($entity)+ ->setData($data);++ $this->entityManager->saveEntity($item);$this->logDebugEvent($event, $entity);}+ $this->processUpdateFields($entity, $data);+ }++ private function processUpdateFields(Entity $entity, stdClass $data): void+ {foreach ($this->fieldUtil->getEntityTypeFieldList($entity->getEntityType()) as $field) {$itemEvent = "{$entity->getEntityType()}.fieldUpdate.$field";- if (!$this->eventExists($itemEvent)) {+ if (+ !$this->eventExists($itemEvent) ||+ !$this->isFieldChanged($entity, $field, $data)+ ) {continue;}- $attributeList = $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);-- $isChanged = false;+ $this->processUpdateField($entity, $field, $itemEvent);+ }+ }- foreach ($attributeList as $attribute) {- if (in_array($attribute, $this->skipAttributeList)) {- continue;- }+ private function isFieldChanged(Entity $entity, string $field, stdClass $data): bool+ {+ $attributes = $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);- if (property_exists($data, $attribute)) {- $isChanged = true;+ $isChanged = false;- break;- }+ foreach ($attributes as $attribute) {+ if (in_array($attribute, $this->skipAttributeList)) {+ continue;}- if ($isChanged) {- $itemData = (object) [];+ if (property_exists($data, $attribute)) {+ $isChanged = true;- $itemData->id = $entity->getId();+ break;+ }+ }- $attributeList = $this->fieldUtil->getAttributeList($entity->getEntityType(), $field);+ return $isChanged;+ }- foreach ($attributeList as $attribute) {- if (in_array($attribute, $this->skipAttributeList)) {- continue;- }+ private function processUpdateField(Entity $entity, string $field, string $itemEvent): void+ {+ $itemData = (object) [];- $itemData->$attribute = $entity->get($attribute);- }+ $itemData->id = $entity->getId();- $this->entityManager->createEntity(WebhookEventQueueItem::ENTITY_TYPE, [- 'event' => $itemEvent,- 'targetType' => $entity->getEntityType(),- 'targetId' => $entity->getId(),- 'data' => $itemData,- ]);+ $attributeList = $this->fieldUtil->getAttributeList($entity->getEntityType(), $field);- $this->logDebugEvent($itemEvent, $entity);+ foreach ($attributeList as $attribute) {+ if (in_array($attribute, $this->skipAttributeList)) {+ continue;}++ $itemData->$attribute = $entity->get($attribute);}++ $item = $this->entityManager->getRDBRepositoryByClass(WebhookEventQueueItem::class)->getNew();++ $item+ ->setEvent($itemEvent)+ ->setTarget($entity)+ ->setData($itemData);++ $this->entityManager->saveEntity($item);++ $this->logDebugEvent($itemEvent, $entity);}}diff --git a/application/Espo/Entities/WebhookEventQueueItem.php b/application/Espo/Entities/WebhookEventQueueItem.phpindex a953af3c16..9e067f5d5d 100644--- a/application/Espo/Entities/WebhookEventQueueItem.php+++ b/application/Espo/Entities/WebhookEventQueueItem.php@@ -29,6 +29,7 @@namespace Espo\Entities;+use Espo\Core\Field\LinkParent;use Espo\Core\ORM\Entity;use stdClass;@@ -62,4 +63,22 @@ class WebhookEventQueueItem extends Entity{return $this->get('data') ?? (object) [];}++ public function setEvent(string $event): self+ {+ return $this->set('event', $event);+ }++ public function setTarget(LinkParent|Entity $target): self+ {+ return $this->setRelatedLinkOrEntity('target', $target);+ }++ /**+ * @param stdClass|array<string, mixed> $data+ */+ public function setData(stdClass|array $data): self+ {+ return $this->set('data', $data);+ }}diff --git a/application/Espo/Resources/metadata/entityDefs/WebhookEventQueueItem.json b/application/Espo/Resources/metadata/entityDefs/WebhookEventQueueItem.jsonindex d4a92bdd54..6ce7e445e8 100644--- a/application/Espo/Resources/metadata/entityDefs/WebhookEventQueueItem.json+++ b/application/Espo/Resources/metadata/entityDefs/WebhookEventQueueItem.json@@ -25,6 +25,9 @@}},"links": {+ "target": {+ "type": "belongsToParent"+ }},"collection": {"orderBy": "number",